Assert relative ordering of log messages in samples

astefanutti · Jan 12, 2016 · 4e4049f · 4e4049f
1 parent 3d2636f
commit 4e4049f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/samples/hello/src/test/java/org/apache/camel/cdi/sample/hello/HelloSampleTest.java b/samples/hello/src/test/java/org/apache/camel/cdi/sample/hello/HelloSampleTest.java
@@ -29,9 +29,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
+import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertThat;
 
 @RunWith(Arquillian.class)
@@ -53,7 +53,7 @@ public static Archive<?> deployment() {
         @Override
         protected void verify() throws Throwable {
             assertThat("Log messages not found!", getMessages(),
-                hasItems(
+                containsInRelativeOrder(
                     containsString("(CamelContext: camel-1) is starting"),
                     equalTo("Hello from CamelContext(camel-1)"),
                     containsString("(CamelContext: camel-1) is shutdown"))

diff --git a/...properties/src/test/java/org/apache/camel/cdi/sample/properties/PropertiesSampleTest.java b/...properties/src/test/java/org/apache/camel/cdi/sample/properties/PropertiesSampleTest.java
@@ -32,9 +32,9 @@
 
 import java.util.Locale;
 
+import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertThat;
 
 @RunWith(Arquillian.class)
@@ -72,7 +72,7 @@ protected void after() {
         @Override
         protected void verify() throws Throwable {
             assertThat("Log messages not found!", getMessages(),
-                hasItems(
+                containsInRelativeOrder(
                     containsString("(CamelContext: camel-1) is starting"),
                     equalTo("Bonjour de CamelContext(camel-1)"),
                     containsString("(CamelContext: camel-1) is shutdown"))

diff --git a/samples/sjms/src/test/java/org/apache/camel/cdi/sample/sjms/SjmsSampleTest.java b/samples/sjms/src/test/java/org/apache/camel/cdi/sample/sjms/SjmsSampleTest.java
@@ -29,9 +29,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
+import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertThat;
 
 @RunWith(Arquillian.class)
@@ -53,7 +53,7 @@ public static Archive<?> deployment() {
         @Override
         protected void verify() throws Throwable {
             assertThat("Log messages not found!", getMessages(),
-                hasItems(
+                containsInRelativeOrder(
                     containsString("(CamelContext: camel-1) is starting"),
                     equalTo("Received message [Sample Message] from [Producer]"),
                     containsString("(CamelContext: camel-1) is shutdown"))

diff --git a/samples/xml/src/test/java/org/apache/camel/cdi/sample/xml/XmlSampleTest.java b/samples/xml/src/test/java/org/apache/camel/cdi/sample/xml/XmlSampleTest.java
@@ -31,9 +31,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
+import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThat;
@@ -57,7 +57,7 @@ public static Archive<?> deployment() {
         @Override
         protected void verify() throws Throwable {
             assertThat("Log messages not found!", getMessages(),
-                hasItems(
+                containsInRelativeOrder(
                     containsString("(CamelContext: camel-1) is starting"),
                     startsWith("Date is"),
                     containsString("(CamelContext: camel-1) is shutdown"))