Merge pull request microprofile#59 from Azquelt/tck-fix-config-resource

Fix TCK tests which rely on a config resource
lamtrhieu · Jul 2, 2019 · 7bea841 · 7bea841
2 parents 6daa610 + 1b3d8a2
commit 7bea841
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...rc/main/java/org/eclipse/microprofile/reactive/messaging/tck/connector/ConnectorTest.java b/...rc/main/java/org/eclipse/microprofile/reactive/messaging/tck/connector/ConnectorTest.java
@@ -18,6 +18,7 @@
  */
 package org.eclipse.microprofile.reactive.messaging.tck.connector;
 
+import org.eclipse.microprofile.reactive.messaging.spi.ConnectorFactory;
 import org.eclipse.microprofile.reactive.messaging.spi.ConnectorLiteral;
 import org.eclipse.microprofile.reactive.messaging.tck.ArchiveExtender;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -63,10 +64,16 @@ public void checkConnector() {
         await().until(() -> connector.elements().size() == 10);
         assertThat(connector.elements()).containsExactly("A", "B", "C", "D", "E", "F", "G", "H", "I", "J");
 
-        assertThat(connector.getReceivedConfigurations()).hasSize(3).allSatisfy(config -> {
+        // We expect configurations for dummy-source and dummy-sink.
+        // We may also get a configuration for dummy-source-2 which is configured but not connected to anything
+        assertThat(connector.getReceivedConfigurations()).hasSizeBetween(2, 3).allSatisfy(config -> {
             assertThat(config.getValue("common-A", String.class)).isEqualTo("Value-A");
             assertThat(config.getValue("common-B", String.class)).isEqualTo("Value-B");
         });
+
+        assertThat(connector.getReceivedConfigurations())
+            .extracting(c -> c.getValue(ConnectorFactory.CHANNEL_NAME_ATTRIBUTE, String.class))
+            .contains("dummy-source", "dummy-sink");
     }
 
 }
diff --git a/...tck/connector/connector-config.properties → ...tck/connector/connector-config.properties b/...tck/connector/connector-config.properties → ...tck/connector/connector-config.properties
@@ -26,7 +26,7 @@ mp.messaging.incoming.dummy-source.items=a,b,c,d,e,f,g,h,i,j
 
 mp.messaging.incoming.dummy-source-2.connector=Dummy
 mp.messaging.incoming.dummy-source-2.attribute=value-2
-mp.messaging.incoming.dummy-source-2.items=
+mp.messaging.incoming.dummy-source-2.items=x,y,z
 
 mp.messaging.outgoing.dummy-sink.connector=Dummy
 mp.messaging.outgoing.dummy-sink.attribute=value