();
+ listeners = new ArrayList<>();
}
listeners.add(listener);
}
diff --git a/integ-kinesis/.gitignore b/integ-kinesis/.gitignore
new file mode 100644
index 0000000..63e2211
--- /dev/null
+++ b/integ-kinesis/.gitignore
@@ -0,0 +1,4 @@
+/target
+/target/
+/target/
+/dependency-reduced-pom.xml
diff --git a/integ-kinesis/pom.xml b/integ-kinesis/pom.xml
new file mode 100644
index 0000000..37d125e
--- /dev/null
+++ b/integ-kinesis/pom.xml
@@ -0,0 +1,41 @@
+
+
+ 4.0.0
+ integ-kinesis
+
+ il.co.topq.integframework
+ integ-parent
+ 1.0.5-SNAPSHOT
+ ../integ-parent
+
+
+
+ com.amazonaws
+ amazon-kinesis-client
+ 1.2.0
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.3
+
+
+ package
+ shade
+
+
+
+ org.apache.http
+ org.xapachex.http
+
+
+
+
+
+
+
+
+
diff --git a/integ-parent/pom.xml b/integ-parent/pom.xml
index 137c17a..4a70076 100644
--- a/integ-parent/pom.xml
+++ b/integ-parent/pom.xml
@@ -1,9 +1,9 @@
-
+
+
4.0.0
il.co.topq.integframework
integ-parent
- 1.0.1-SNAPSHOT
+ 1.0.5-SNAPSHOT
pom
UTF-8
@@ -11,14 +11,23 @@
http://maven.top-q.co.il
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.18
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
2.5.1
- 1.6
- 1.6
+ 1.7
+ 1.7
@@ -80,5 +89,11 @@
../integ-hdfs
../integ-support
../integ-rest
+ ../integ-wget
+ ../integ-archetype
+ ../integ-kinesis
-
\ No newline at end of file
+
+ scm:git:https://github.com/aharonha/integ-framework
+
+
diff --git a/integ-rest/.gitignore b/integ-rest/.gitignore
new file mode 100644
index 0000000..d2d9c31
--- /dev/null
+++ b/integ-rest/.gitignore
@@ -0,0 +1,3 @@
+/target
+/target/
+/target/
diff --git a/integ-rest/pom.xml b/integ-rest/pom.xml
index 06af590..dfe76f1 100644
--- a/integ-rest/pom.xml
+++ b/integ-rest/pom.xml
@@ -1,17 +1,18 @@
+
4.0.0
il.co.topq.integframework
integ-parent
- 1.0.1-SNAPSHOT
- ../../integ/integ-parent
+ 1.0.5-SNAPSHOT
+ ../integ-parent
integ-rest
il.co.topq.integframework
integ-testng
- ${project.version}
+ 1.0.5-SNAPSHOT
org.codehaus.jettison
@@ -26,4 +27,4 @@
provided
-
\ No newline at end of file
+
diff --git a/integ-rest/src/main/java/il/co/topq/integframework/rest/RESTClientModule.java b/integ-rest/src/main/java/il/co/topq/integframework/rest/RESTClientModule.java
index bbc01c9..4619c89 100644
--- a/integ-rest/src/main/java/il/co/topq/integframework/rest/RESTClientModule.java
+++ b/integ-rest/src/main/java/il/co/topq/integframework/rest/RESTClientModule.java
@@ -1,10 +1,15 @@
package il.co.topq.integframework.rest;
import static com.sun.jersey.api.client.Client.create;
+
+import javax.ws.rs.core.MediaType;
+
import il.co.topq.integframework.AbstractModuleImpl;
import il.co.topq.integframework.reporting.Reporter;
import il.co.topq.integframework.reporting.Reporter.Color;
+import il.co.topq.integframework.reporting.Reporter.Style;
+import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import com.sun.jersey.api.client.ClientResponse;
@@ -13,8 +18,7 @@ public class RESTClientModule extends AbstractModuleImpl {
String uri;
public ClientResponse post(JSONObject input, String action) throws Exception {
- Reporter.log("Request", Color.BLUE);
- Reporter.log("\n" + input.toString() + "
\n");
+ Reporter.log("Request", action + "\nBody:" + input.toString(3), Style.PLAINTEXT);
StringBuilder builder = new StringBuilder(uri);
if (!uri.endsWith("/")) {
builder.append("/");
@@ -24,8 +28,61 @@ public ClientResponse post(JSONObject input, String action) throws Exception {
.accept("application/json").post(ClientResponse.class, input);
setActual(clientResponse.getEntity(String.class));
- Reporter.log("Response", Color.BLUE);
- Reporter.log("\n" + getActual(String.class) + "
\n");
+ try {
+ JSONObject response = new JSONObject(getActual(String.class));
+ Reporter.log("Response", response.toString(3), Style.PLAINTEXT);
+ } catch (JSONException e) {
+ Reporter.log("Response", getActual(String.class), Style.PLAINTEXT);// should
+ // never
+ // happen!!
+ }
+
+ return clientResponse;
+ }
+
+ public ClientResponse post(String postData,MediaType postDataMediaType, String action) throws Exception {
+ Reporter.log("Request", action + "\nBody:" + postData, Style.PLAINTEXT);
+ StringBuilder builder = new StringBuilder(uri);
+ if (!uri.endsWith("/")) {
+ builder.append("/");
+ }
+ builder.append(action);
+ ClientResponse clientResponse = create().resource(builder.toString()).type(postDataMediaType)
+ .accept("application/json").post(ClientResponse.class, postData);
+
+ setActual(clientResponse.getEntity(String.class));
+ try {
+ JSONObject response = new JSONObject(getActual(String.class));
+ Reporter.log("Response", response.toString(3), Style.PLAINTEXT);
+ } catch (JSONException e) {
+ Reporter.log("Response", getActual(String.class), Style.PLAINTEXT);
+ // should never happen!!
+ }
+
+ return clientResponse;
+ }
+
+
+ public ClientResponse get(String action) throws Exception {
+ Reporter.log("Request", action, Style.PLAINTEXT);
+ StringBuilder builder = new StringBuilder(uri);
+ if (!uri.endsWith("/")) {
+ builder.append("/");
+ }
+ builder.append(action);
+ ClientResponse clientResponse = create().resource(builder.toString()).accept("application/json")
+ .get(ClientResponse.class);
+
+ setActual(clientResponse.getEntity(String.class));
+ try {
+ JSONObject response = new JSONObject(getActual(String.class));
+ Reporter.log("Response", response.toString(3), Style.PLAINTEXT);
+ } catch (JSONException e) {
+ Reporter.log("Response", getActual(String.class), Style.PLAINTEXT);// should
+ // never
+ // happen!!
+ }
+
return clientResponse;
}
@@ -39,7 +96,7 @@ public void setUri(String uri) {
public ClientResponse put(JSONObject input, String action) {
Reporter.log("Request", Color.BLUE);
- Reporter.log("\n" + input.toString() + "
\n");
+ Reporter.log(input.toString(), Style.PLAINTEXT);
StringBuilder builder = new StringBuilder(uri);
if (!uri.endsWith("/")) {
builder.append("/");
@@ -50,7 +107,7 @@ public ClientResponse put(JSONObject input, String action) {
setActual(clientResponse.getEntity(String.class));
Reporter.log("Response", Color.BLUE);
- Reporter.log("\n" + getActual(String.class) + "
\n");
+ Reporter.log(getActual(String.class), Style.PLAINTEXT);
return clientResponse;
}
diff --git a/integ-rest/src/main/java/il/co/topq/integframework/rest/TomcatRESTApplicationContainer.java b/integ-rest/src/main/java/il/co/topq/integframework/rest/TomcatRESTApplicationContainer.java
index 5da7e56..2d4b27d 100644
--- a/integ-rest/src/main/java/il/co/topq/integframework/rest/TomcatRESTApplicationContainer.java
+++ b/integ-rest/src/main/java/il/co/topq/integframework/rest/TomcatRESTApplicationContainer.java
@@ -4,6 +4,7 @@
import static il.co.topq.integframework.utils.StringUtils.isEmpty;
import il.co.topq.integframework.reporting.Reporter;
import il.co.topq.integframework.reporting.Reporter.Color;
+import il.co.topq.integframework.reporting.Reporter.Style;
import il.co.topq.integframework.utils.StringUtils;
import java.net.URI;
@@ -70,7 +71,7 @@ public ClientResponse reload() throws URISyntaxException {
setActual(clientResponse.getEntity(String.class));
Reporter.log("Response", Color.BLUE);
- Reporter.log("\n" + getActual(String.class) + "
\n");
+ Reporter.log(getActual(String.class), Style.PLAINTEXT);
return clientResponse;
}
diff --git a/integ-support/.gitignore b/integ-support/.gitignore
new file mode 100644
index 0000000..d2d9c31
--- /dev/null
+++ b/integ-support/.gitignore
@@ -0,0 +1,3 @@
+/target
+/target/
+/target/
diff --git a/integ-support/pom.xml b/integ-support/pom.xml
index c72a92a..d9eee9a 100644
--- a/integ-support/pom.xml
+++ b/integ-support/pom.xml
@@ -1,9 +1,10 @@
+
4.0.0
il.co.topq.integframework
integ-parent
- 1.0.1-SNAPSHOT
+ 1.0.5-SNAPSHOT
../integ-parent
integ-support
@@ -11,7 +12,7 @@
org.seleniumhq.selenium
selenium-support
- [2.0.0,)
+ 2.48.2
-
\ No newline at end of file
+
diff --git a/integ-support/src/main/java/il/co/topq/integframework/support/FluentWait.java b/integ-support/src/main/java/il/co/topq/integframework/support/FluentWait.java
index 358c1a7..1c16bbb 100644
--- a/integ-support/src/main/java/il/co/topq/integframework/support/FluentWait.java
+++ b/integ-support/src/main/java/il/co/topq/integframework/support/FluentWait.java
@@ -40,7 +40,8 @@ public String toString() {
* on a function.
* @return Nothing will ever be returned; this return type is only specified as a convenience.
*/
- protected RuntimeException timeoutException(String message, Throwable lastException) {
+ @Override
+ protected RuntimeException timeoutException(String message, Throwable lastException) {
throw new TimeoutException(message, lastException);
}
}
diff --git a/integ-support/src/main/java/il/co/topq/integframework/support/guava/Utils.java b/integ-support/src/main/java/il/co/topq/integframework/support/guava/Utils.java
new file mode 100644
index 0000000..ba42883
--- /dev/null
+++ b/integ-support/src/main/java/il/co/topq/integframework/support/guava/Utils.java
@@ -0,0 +1,126 @@
+package il.co.topq.integframework.support.guava;
+
+import static com.google.common.base.Optional.fromNullable;
+import static com.google.common.base.Suppliers.compose;
+import static com.google.common.base.Verify.verifyNotNull;
+
+import java.lang.reflect.Constructor;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Function;
+import com.google.common.base.Supplier;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+public abstract class Utils {
+ @SuppressWarnings("unused")
+ private final int _;
+
+ private Utils() {
+ _ = 0;
+ }
+
+ public static Supplier> newHashMap() {
+ return new Supplier>() {
+ @Override
+ public Map get() {
+ return Maps. newHashMap();
+ }
+ };
+ }
+
+ public static Supplier> newBiHashMap() {
+ return new Supplier>() {
+ @Override
+ public HashBiMap get() {
+ return HashBiMap. create();
+ }
+ };
+ }
+
+ public static Supplier> newArrayList() {
+ return new Supplier>() {
+ @Override
+ public List get() {
+ return Lists.newArrayList();
+ }
+ };
+ }
+
+ public static Supplier forConstructor(final Constructor constructor) {
+ return new Supplier() {
+ @Override
+ public T get() {
+ try {
+ return constructor.newInstance();
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+ }
+
+ /**
+ * Get an item from a map, for the given key.
+ * If the item does not exist, putting the result of {@link Supplier#get()}
+ * to the map for this key.
+ *
+ * @param map
+ * the map to get the item from
+ * @param key
+ * the key to search in the map using {@link Map#get}
+ * @param supplier
+ * a {@link Supplier} that provides a default value if the item
+ * does not exist
+ * @return the value in the map.
+ */
+ public static V getOrAdd(Map map, K key, Supplier supplier) {
+ return fromNullable(verifyNotNull(map).get(key)).or(fromNullable(compose(addToMap(map, key), supplier)).orNull());
+ }
+
+ /**
+ *
+ * @param map
+ * @param key
+ * @return a function that puts an item to the map to the given key
+ */
+ public static Function addToMap(final Map map, final K key) {
+ return new Function() {
+ @Override
+ public V apply(V input) {
+ map.put(key, input);
+ return map.get(key);
+ }
+ };
+ };
+
+ public static Function getSimpleClassName() {
+ return new Function() {
+ @Override
+ public String apply(T t) {
+ return t.getClass().getSimpleName();
+ }
+ };
+ }
+
+
+ public static Function getClassName() {
+ return new Function() {
+ @Override
+ public String apply(T t) {
+ return t.getClass().getName();
+ }
+ };
+ }
+
+ public static Function getCanonicalClassName() {
+ return new Function() {
+ @Override
+ public String apply(T t) {
+ return t.getClass().getCanonicalName();
+ }
+ };
+ }
+}
diff --git a/integ-support/src/main/java/il/co/topq/integframework/support/threads/ExecutionTerminatorService.java b/integ-support/src/main/java/il/co/topq/integframework/support/threads/ExecutionTerminatorService.java
new file mode 100644
index 0000000..36db8b8
--- /dev/null
+++ b/integ-support/src/main/java/il/co/topq/integframework/support/threads/ExecutionTerminatorService.java
@@ -0,0 +1,117 @@
+package il.co.topq.integframework.support.threads;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.*;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+public class ExecutionTerminatorService implements ExecutorService {
+
+ private ExecutorService realTerminator;
+
+ private final static class Terminator implements Runnable {
+ private final ExecutorService toTerminate;
+ final int timeout;
+ final TimeUnit unit;
+
+ public Terminator(ExecutorService toTerminate, int timeoutForAll, final TimeUnit unit) {
+ this.toTerminate = toTerminate;
+ this.timeout = timeoutForAll;
+ this.unit = unit;
+ }
+
+ @Override
+ public void run() {
+ try {
+ toTerminate.awaitTermination(timeout, unit);
+ } catch (InterruptedException e) {
+ Thread t = Thread.currentThread();
+ t.getUncaughtExceptionHandler().uncaughtException(t, e);
+ }
+ }
+ };
+
+ final int timeout;
+ final TimeUnit unit;
+
+ public ExecutionTerminatorService(Collection executorServicesToWaitFor, final int timeoutForAll,
+ final TimeUnit unit) {
+ this.timeout = timeoutForAll;
+ this.unit = unit;
+
+ realTerminator = Executors.newFixedThreadPool(executorServicesToWaitFor.size(),
+ new ThreadFactoryBuilder().setNameFormat("Terminator %d").build());
+ for (final ExecutorService executorService : executorServicesToWaitFor) {
+ realTerminator.execute(new Terminator(executorService, timeoutForAll, unit));
+ }
+ realTerminator.shutdown();
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public void shutdown() {
+ // already done in c'Tor
+ }
+
+ @Override
+ public List shutdownNow() {
+ return realTerminator.shutdownNow();
+ }
+
+ @Override
+ public boolean isShutdown() {
+ return realTerminator.isShutdown();
+ }
+
+ @Override
+ public boolean isTerminated() {
+ return realTerminator.isTerminated();
+ }
+
+ @Override
+ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+ return realTerminator.awaitTermination(timeout, unit);
+ }
+
+ @Override
+ public Future submit(Callable task) {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public Future submit(Runnable task, T result) {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public Future submit(Runnable task) {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public List> invokeAll(Collection> tasks) throws InterruptedException {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit)
+ throws InterruptedException {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException,
+ ExecutionException, TimeoutException {
+ throw new IllegalArgumentException();
+ }
+}
diff --git a/integ-support/src/main/java/il/co/topq/integframework/support/threads/NamedThreadFactory.java b/integ-support/src/main/java/il/co/topq/integframework/support/threads/NamedThreadFactory.java
new file mode 100644
index 0000000..b5dc80e
--- /dev/null
+++ b/integ-support/src/main/java/il/co/topq/integframework/support/threads/NamedThreadFactory.java
@@ -0,0 +1,28 @@
+package il.co.topq.integframework.support.threads;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NamedThreadFactory implements ThreadFactory {
+ private final String name;
+ private static Map names = new ConcurrentHashMap<>();
+
+ public NamedThreadFactory(String name) {
+ synchronized (names) {
+ if (!names.containsKey(name)) {
+ names.put(name, new AtomicInteger());
+ }
+ }
+ this.name = name;
+ }
+
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread thread = Executors.defaultThreadFactory().newThread(r);
+ thread.setName(name + "#" + names.get(name).incrementAndGet());
+ return thread;
+ }
+}
\ No newline at end of file
diff --git a/integ-support/src/main/java/il/co/topq/integframework/support/threads/SingleHashThreadFactory.java b/integ-support/src/main/java/il/co/topq/integframework/support/threads/SingleHashThreadFactory.java
new file mode 100644
index 0000000..09d7c20
--- /dev/null
+++ b/integ-support/src/main/java/il/co/topq/integframework/support/threads/SingleHashThreadFactory.java
@@ -0,0 +1,67 @@
+package il.co.topq.integframework.support.threads;
+
+import static java.util.Collections.synchronizedMap;
+import static java.util.concurrent.Executors.defaultThreadFactory;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * This {@link ThreadFactory} constructs a new thread only for newly added
+ * {@link Runnable}s
+ *
+ *
+ * @author Aharon
+ *
+ */
+public final class SingleHashThreadFactory implements ThreadFactory {
+ final ThreadFactory bakingThreadFactory;
+
+ /**
+ * Create a new instance
+ *
+ * @param bakedThreadFactory
+ * a factory to delegate creations to
+ *
+ */
+ public SingleHashThreadFactory(ThreadFactory bakedThreadFactory) {
+ this.bakingThreadFactory = bakedThreadFactory;
+ }
+
+ /**
+ * Create a new instance, delegate {@link #newThread(Runnable)} to
+ * {@link Executors#defaultThreadFactory()} if needed
+ */
+ public SingleHashThreadFactory() {
+ this(defaultThreadFactory());
+ }
+
+ private final Map allThreads = synchronizedMap(new WeakHashMap());
+
+ /**
+ * Constructs a new {@link Thread} for the given {@link Runnable}, if it is
+ * the first time for it.
+ * On next invocations of this method, the returned thread is the one that
+ * provided for the first one.
+ * Note that the given runnable {@code (r1)} is regarded as old if
+ * another runnable {@code (r2)} was invoked on, and which
+ * {@code r1.hashCode() == r2.hashCode() && r1.equals(r2)}.
+ *
+ * @see Object#hashCode()
+ * @see Object#equals(Object)
+ * @see java.util.HashMap#get(Object)
+ * @see java.util.HashMap#put(Object, Object)
+ */
+ @Override
+ public Thread newThread(Runnable r) {
+ synchronized (allThreads) {
+ Thread targetThread = allThreads.get(r);
+ if (targetThread == null) {
+ allThreads.put(r, targetThread = bakingThreadFactory.newThread(r));
+ }
+ return targetThread;
+ }
+ }
+
+}
diff --git a/integ-testng/.gitignore b/integ-testng/.gitignore
new file mode 100644
index 0000000..29546b5
--- /dev/null
+++ b/integ-testng/.gitignore
@@ -0,0 +1,2 @@
+/target
+/target/
diff --git a/integ-testng/pom.xml b/integ-testng/pom.xml
index 3a4a705..408fe9a 100644
--- a/integ-testng/pom.xml
+++ b/integ-testng/pom.xml
@@ -1,12 +1,12 @@
-
+
+
4.0.0
integ-testng
- org.uncommons
+ il.co.topq.integframework
reportng
- 1.1.2
+ 1.1.41
org.testng
@@ -18,7 +18,6 @@
com.google.inject
guice
3.0
- test
org.testng
@@ -44,18 +43,38 @@
maven-compiler-plugin
2.3.2
- 1.6
- 1.6
+ 1.7
+ 1.7
-
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ target/surefire/reportng
+
+
+ usedefaultlisteners
+ true
+
+
+ listener
+ org.uncommons.reportng.HTMLReporter
+
+
+
+ **/*Tests.java
+
+
+
+
il.co.topq.integframework
integ-parent
- 1.0.1-SNAPSHOT
+ 1.0.5-SNAPSHOT
../integ-parent
-
\ No newline at end of file
+
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/AbstractModule.java b/integ-testng/src/main/java/il/co/topq/integframework/AbstractModule.java
index 9638e0e..f70c33a 100644
--- a/integ-testng/src/main/java/il/co/topq/integframework/AbstractModule.java
+++ b/integ-testng/src/main/java/il/co/topq/integframework/AbstractModule.java
@@ -12,33 +12,40 @@ public abstract class AbstractModule implements Module {
* @see il.co.topq.integframework.Module#getActual()
*/
@Override
- public Object getActual() {
+ public final Object getActual() {
return actual;
}
- @SuppressWarnings("unchecked")
- public T getActual(Class clazz) {
- if (clazz.isInstance(actual)) {
- return (T) getActual();
- }
- throw new ClassCastException(actual.toString() + " is not castable to " + clazz.getName());
+ /**
+ * Casts the actual object to the class or interface represented by the
+ * given {@code Class} object.
+ *
+ * @return the object after casting, or null if obj is null
+ *
+ * @throws ClassCastException
+ * if the object is not null and is not assignable to the type
+ * T.
+ */
+ public final T getActual(Class clazz) {
+ return clazz.cast(getActual());
+
}
/* (non-Javadoc)
* @see il.co.topq.integframework.Module#setActual(java.lang.Object)
*/
@Override
- public void setActual(Object actual) {
+ public final void setActual(Object actual) {
this.actual = actual;
}
@PostConstruct
- public void initializeObject() throws Exception{
+ public final void initializeObject() throws Exception {
init();
}
@PreDestroy
- public void closeObject() throws Exception{
+ public final void closeObject() throws Exception {
close();
}
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/AbstractModuleImpl.java b/integ-testng/src/main/java/il/co/topq/integframework/AbstractModuleImpl.java
index 3f52f10..7ef9c4e 100644
--- a/integ-testng/src/main/java/il/co/topq/integframework/AbstractModuleImpl.java
+++ b/integ-testng/src/main/java/il/co/topq/integframework/AbstractModuleImpl.java
@@ -1,12 +1,23 @@
package il.co.topq.integframework;
-public class AbstractModuleImpl extends AbstractModule {
+public class AbstractModuleImpl extends AbstractModule implements Namefull {
@Override
public void init() throws Exception {
}
+
@Override
public void close() throws Exception {
}
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public void setName(String name) {
+ this.name = name;
+ }
+
}
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/Named.java b/integ-testng/src/main/java/il/co/topq/integframework/Named.java
new file mode 100644
index 0000000..3b555ed
--- /dev/null
+++ b/integ-testng/src/main/java/il/co/topq/integframework/Named.java
@@ -0,0 +1,5 @@
+package il.co.topq.integframework;
+
+public interface Named {
+ public String getName();
+}
\ No newline at end of file
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/Namefull.java b/integ-testng/src/main/java/il/co/topq/integframework/Namefull.java
new file mode 100644
index 0000000..63d0990
--- /dev/null
+++ b/integ-testng/src/main/java/il/co/topq/integframework/Namefull.java
@@ -0,0 +1,5 @@
+package il.co.topq.integframework;
+
+public interface Namefull extends Named {
+ public void setName(String name);
+}
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/NamingFunctions.java b/integ-testng/src/main/java/il/co/topq/integframework/NamingFunctions.java
new file mode 100644
index 0000000..5189858
--- /dev/null
+++ b/integ-testng/src/main/java/il/co/topq/integframework/NamingFunctions.java
@@ -0,0 +1,12 @@
+package il.co.topq.integframework;
+
+import com.google.common.base.Function;
+
+public enum NamingFunctions implements Function {
+ getName {
+ @Override
+ public String apply(Named input) {
+ return input.getName();
+ }
+ };
+}
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/assertion/AllItemsAre.java b/integ-testng/src/main/java/il/co/topq/integframework/assertion/AllItemsAre.java
new file mode 100644
index 0000000..f4cdc3e
--- /dev/null
+++ b/integ-testng/src/main/java/il/co/topq/integframework/assertion/AllItemsAre.java
@@ -0,0 +1,22 @@
+package il.co.topq.integframework.assertion;
+
+import com.google.common.base.Predicate;
+
+public class AllItemsAre extends AbstractAssertionLogic> {
+
+ private final Predicate isTrue;
+
+ public AllItemsAre(Predicate isTrue) {
+ this.isTrue = isTrue;
+ }
+
+ @Override
+ public void doAssertion() {
+ boolean all = true;
+ for (T actualItem : actual) {
+ all = all && isTrue.apply(actualItem);
+ }
+ status = all;
+ }
+
+}
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/assertion/Assert.java b/integ-testng/src/main/java/il/co/topq/integframework/assertion/Assert.java
index a41b7f9..57f1e50 100644
--- a/integ-testng/src/main/java/il/co/topq/integframework/assertion/Assert.java
+++ b/integ-testng/src/main/java/il/co/topq/integframework/assertion/Assert.java
@@ -3,8 +3,11 @@
import il.co.topq.integframework.reporting.Reporter;
import il.co.topq.integframework.reporting.Reporter.Color;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import com.google.common.base.Function;
+
/**
* Class for comparing between actual and expected states
*
@@ -18,7 +21,7 @@ static public void assertStringContains(final String actual, final String expect
throw new IllegalArgumentException("Actual can't be null");
}
if (null == expected) {
- throw new IllegalArgumentException("logic can't be null");
+ throw new IllegalArgumentException("expected can't be null");
}
if (!actual.contains(expected)) {
fail(expected + " is not contained in " + actual);
@@ -41,11 +44,17 @@ static public void assertStringContains(final String actual, final String expect
* If exception occurced during assertion
* @throws AssertionError
* If assertion fails
+ * @deprecated actual value is set only once, loop has no meaning!
+ * use
+ * {@link #assertLogic(Object, Function, AbstractAssertionLogic, long, TimeUnit, long, TimeUnit)}
+ * instead
*/
- static public void assertLogic(final T actual, final AbstractAssertionLogic logic, final long timeout) throws TimeoutException {
+ @Deprecated
+ static public void assertLogic(final T actual, final AbstractAssertionLogic logic, final long timeout)
+ throws TimeoutException {
long timeUp = System.currentTimeMillis() + timeout;
do {
- assertLogic(actual, logic,null);
+ assertLogic(actual, logic, null);
if (!logic.status) {
try {
Thread.sleep(3000);
@@ -53,12 +62,12 @@ static public void assertLogic(final T actual, final AbstractAssertionLogic<
throw new TimeoutException("Assertion interrupted");
}
}
- } while (timeUp < System.currentTimeMillis() || !logic.status);
+ } while (timeUp < System.currentTimeMillis() && !logic.status);
if (!logic.status) {
throw new TimeoutException("Assertion failed");
}
}
-
+
/**
* Execute the logic on the the actual object.
*
@@ -69,11 +78,9 @@ static public void assertLogic(final T actual, final AbstractAssertionLogic<
* @throws AssertionError
* If assertion fails
*/
- static public void assertLogic(final T actual,
- final AbstractAssertionLogic logic) {
+ static public void assertLogic(final T actual, final AbstractAssertionLogic logic) {
assertLogic(actual, logic, null);
}
-
/**
* Execute the logic on the the actual object.
@@ -96,7 +103,7 @@ static public void assertLogic(final T actual, final AbstractAssertionLogic<
throw new IllegalArgumentException("logic can't be null");
}
if (null == listener) {
- listener = new DefaultAssertionListener();
+ listener = new DefaultAssertionListener<>();
}
logic.setActual(actual);
@@ -105,18 +112,124 @@ static public void assertLogic(final T actual, final AbstractAssertionLogic<
if (logic.isStatus()) {
listener.assertionPassed(actual, logic);
} else {
- Reporter.log("Assertion failed: " + logic.getTitle(),
- logic.getMessage(), false);
+ // Reporter.log("Assertion failed: " + logic.getTitle(),
+ // logic.getMessage(), false);
listener.assertionFailed(actual, logic);
}
} catch (Throwable t) {
- Reporter.log("Assertion process failed: ", t);
+ // Reporter.log("Assertion process failed: ", t);
listener.assertionFailed(actual, logic, t);
}
}
- static public void assertLogicHappens(final T actual,
- final AbstractAssertionLogic logic, final long timeout,
+ /**
+ * Execute the logic and repeating on the the
+ * actual object, as gained from the actualValueGenerator
+ * stop when either one of the following occurs:
+ *
+ * - the actual object is null
+ * - the thread was interrupted while sleeping
+ * - timeout expires
+ *
+ *
+ * @param
+ * the type of actual to examine
+ * @param
+ * the type of the resource to gain the actual value from
+ * @param resource
+ * a {@link il.co.topq.integframework.Module} or another kind of
+ * external {@link Object}, from which the actual value is
+ * gained.
+ * @param actualValueGenerator
+ * a function from the resource above to the actual value- on
+ * which to perform assertion on
+ * @param logic
+ * Logic to operate on the actual object
+ * @param timeout
+ * maximum time for this operation
+ * @param timeoutUnit
+ * time unit for the parameter above
+ * @param interval
+ * time to sleep between assertions
+ * @param intervalUnit
+ * time unit for the parameter above
+ * @throws AssertionError
+ * If assertion fails
+ * @return true if assertion finished due to timeout i.e. the assertion
+ * passed on all invocations of
+ * {@link AbstractAssertionLogic#doAssertion()}
+ */
+ static public void assertLogic(R resource, final Function actualValueGenerator, AbstractAssertionLogic logic,
+ long timeout, TimeUnit timeoutUnit, long interval, TimeUnit intervalUnit) {
+ assertLogic(resource, actualValueGenerator, logic, new DefaultAssertionListener(), timeout, timeoutUnit, interval,
+ intervalUnit);
+ }
+
+ /**
+ * Execute the logic and repeating on the the
+ * actual object, as gained from the actualValueGenerator
+ * stop when either one of the following occurs:
+ *
+ * - the actual object is null
+ * - the thread was interrupted while sleeping
+ * - timeout expires
+ *
+ *
+ * @param
+ * the type of actual to examine
+ * @param
+ * the type of the resource to gain the actual value from
+ * @param resource
+ * a {@link il.co.topq.integframework.Module} or another kind of
+ * external {@link Object}, from which the actual value is
+ * gained.
+ * @param actualValueGenerator
+ * a function from the resource above to the actual value- on
+ * which to perform assertion on
+ * @param logic
+ * Logic to operate on the actual object
+ * @param listener
+ * an {@link AssertionListener} for ssertion events.
+ * @param timeout
+ * maximum time for this operation
+ * @param timeoutUnit
+ * time unit for the parameter above
+ * @param interval
+ * time to sleep between assertions
+ * @param intervalUnit
+ * time unit for the parameter above
+ * @throws AssertionError
+ * If assertion fails
+ * @return true if assertion finished due to timeout i.e. the assertion
+ * passed on all invocations of
+ * {@link AbstractAssertionLogic#doAssertion()}
+ */
+ static public void assertLogic(R resource, final Function actualValueGenerator, AbstractAssertionLogic logic,
+ AssertionListener listener, long timeout, TimeUnit timeoutUnit, long interval, TimeUnit intervalUnit) {
+ long end = System.currentTimeMillis() + timeoutUnit.toMillis(timeout);
+ A actual;
+ do {
+ actual = actualValueGenerator.apply(resource);
+ if (actual == null) {
+ listener.assertionFailed(actual, logic, new NullPointerException(logic.getMessage()));
+ }
+ Assert.assertLogic(actual, logic, listener);
+ try {
+ Thread.sleep(intervalUnit.toMillis(interval));
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ listener.assertionFailed(actual, logic);
+ }
+ } while (end < System.currentTimeMillis());
+ listener.assertionPassed(actual, logic);
+ }
+
+ /**
+ * @deprecated use
+ * {@link Assert#assertLogic(Object, Function, AbstractAssertionLogic, long, TimeUnit, long, TimeUnit)
+ */
+ @Deprecated
+ static public void assertLogicHappens(final T actual, final AbstractAssertionLogic logic, final long timeout,
boolean silent) throws TimeoutException {
assertLogic(actual, logic, timeout);
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/assertion/AssertionListener.java b/integ-testng/src/main/java/il/co/topq/integframework/assertion/AssertionListener.java
index 2a3fa5f..deff26b 100644
--- a/integ-testng/src/main/java/il/co/topq/integframework/assertion/AssertionListener.java
+++ b/integ-testng/src/main/java/il/co/topq/integframework/assertion/AssertionListener.java
@@ -1,7 +1,23 @@
package il.co.topq.integframework.assertion;
+/**
+ *
+ * Listen to assertion pseodo-events:
+ *
+ * - pass
+ * - fail
+ * - exception thrown
+ *
+ *
+ * @author Aharon Hacmon
+ *
+ * @param
+ * the type of actual. you may get it's value
+ */
public interface AssertionListener {
public void assertionPassed(final T actual, final AbstractAssertionLogic logic);
+
public void assertionFailed(final T actual, final AbstractAssertionLogic logic);
+
public void assertionFailed(final T actual, final AbstractAssertionLogic logic, Throwable t);
}
\ No newline at end of file
diff --git a/integ-testng/src/main/java/il/co/topq/integframework/assertion/CollectionAssertion.java b/integ-testng/src/main/java/il/co/topq/integframework/assertion/CollectionAssertion.java
index 7c245c9..84e9f60 100644
--- a/integ-testng/src/main/java/il/co/topq/integframework/assertion/CollectionAssertion.java
+++ b/integ-testng/src/main/java/il/co/topq/integframework/assertion/CollectionAssertion.java
@@ -1,21 +1,26 @@
package il.co.topq.integframework.assertion;
+import static il.co.topq.integframework.utils.StringUtils.either;
+import static il.co.topq.integframework.utils.StringUtils.isEmpty;
+import il.co.topq.integframework.Named;
import il.co.topq.integframework.reporting.Reporter;
-import il.co.topq.integframework.utils.StringUtils;
+import il.co.topq.integframework.reporting.Reporter.Color;
+import il.co.topq.integframework.utils.Formatter;
+import il.co.topq.integframework.utils.FormattingComparator;
+import il.co.topq.integframework.utils.FormattingComparatorDecorator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
import org.testng.xml.XmlSuite;
+import com.google.common.base.Optional;
+
public class CollectionAssertion extends AbstractAssertionLogic