This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new a21d4a761c9 (chores) camel-paho-mqtt5: fix integration/unit test mismatch a21d4a761c9 is described below commit a21d4a761c9bc09bb72728114d624f6c734e7ea6 Author: Otavio R. Piske <angusyo...@gmail.com> AuthorDate: Sat Jan 6 12:12:01 2024 +0100 (chores) camel-paho-mqtt5: fix integration/unit test mismatch - should ensure ITs are properly skipped on s390x - ensure the ITs run with failsafe - ensure consistency with other components Signed-off-by: Otavio R. Piske <angusyo...@gmail.com> --- .../PahoMqtt5ComponentMqtt5IT.java} | 12 +++++++++--- .../PahoMqtt5ITSupport.java} | 4 ++-- .../PahoMqtt5OverrideTopicMqtt5IT.java} | 6 ++++-- .../PahoMqtt5ToDIT.java} | 5 +++-- .../PahoMqtt5ToDSendDynamicIT.java} | 5 +++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ComponentMqtt5IT.java similarity index 91% rename from components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java rename to components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ComponentMqtt5IT.java index c2f62bd2b31..3940d785951 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ComponentMqtt5IT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.paho.mqtt5; +package org.apache.camel.component.paho.mqtt5.integration; import java.nio.charset.StandardCharsets; @@ -22,13 +22,19 @@ import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Component; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Endpoint; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Message; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Persistence; import org.eclipse.paho.mqttv5.common.MqttMessage; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class PahoMqtt5ComponentMqtt5Test extends PahoMqtt5TestSupport { +public class PahoMqtt5ComponentMqtt5IT extends PahoMqtt5ITSupport { @EndpointInject("mock:test") MockEndpoint mock; @@ -72,7 +78,7 @@ public class PahoMqtt5ComponentMqtt5Test extends PahoMqtt5TestSupport { assertEquals("sampleClient", endpoint.getConfiguration().getClientId()); assertEquals("tcp://localhost:" + mqttPort, endpoint.getConfiguration().getBrokerUrl()); assertEquals(2, endpoint.getConfiguration().getQos()); - assertEquals(PahoMqtt5Persistence.FILE, endpoint.getConfiguration().getPersistence()); + Assertions.assertEquals(PahoMqtt5Persistence.FILE, endpoint.getConfiguration().getPersistence()); } @Test diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5TestSupport.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java similarity index 91% rename from components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5TestSupport.java rename to components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java index 9ac7b84297c..32b9d8d37c4 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5TestSupport.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.paho.mqtt5; +package org.apache.camel.component.paho.mqtt5.integration; import org.apache.camel.test.infra.mosquitto.services.MosquittoService; import org.apache.camel.test.infra.mosquitto.services.MosquittoServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; -public abstract class PahoMqtt5TestSupport extends CamelTestSupport { +public abstract class PahoMqtt5ITSupport extends CamelTestSupport { @RegisterExtension public static MosquittoService service = MosquittoServiceFactory.createService(); diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5OverrideTopicMqtt5Test.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5OverrideTopicMqtt5IT.java similarity index 87% rename from components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5OverrideTopicMqtt5Test.java rename to components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5OverrideTopicMqtt5IT.java index 95bdb7e3f3e..394d554d5ad 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5OverrideTopicMqtt5Test.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5OverrideTopicMqtt5IT.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.paho.mqtt5; +package org.apache.camel.component.paho.mqtt5.integration; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Component; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants; import org.junit.jupiter.api.Test; -public class PahoMqtt5OverrideTopicMqtt5Test extends PahoMqtt5TestSupport { +public class PahoMqtt5OverrideTopicMqtt5IT extends PahoMqtt5ITSupport { @Override protected RouteBuilder createRouteBuilder() { diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDTest.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDIT.java similarity index 91% rename from components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDTest.java rename to components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDIT.java index 079ab68b320..f53c0d375c1 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDTest.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDIT.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.paho.mqtt5; +package org.apache.camel.component.paho.mqtt5.integration; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Component; import org.junit.jupiter.api.Test; -public class PahoMqtt5ToDTest extends PahoMqtt5TestSupport { +public class PahoMqtt5ToDIT extends PahoMqtt5ITSupport { @Test public void testToD() throws Exception { diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDSendDynamicTest.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDSendDynamicIT.java similarity index 92% rename from components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDSendDynamicTest.java rename to components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDSendDynamicIT.java index 41b81c47cfb..c18fa239037 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ToDSendDynamicTest.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ToDSendDynamicIT.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.paho.mqtt5; +package org.apache.camel.component.paho.mqtt5.integration; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.paho.mqtt5.PahoMqtt5Component; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class PahoMqtt5ToDSendDynamicTest extends PahoMqtt5TestSupport { +public class PahoMqtt5ToDSendDynamicIT extends PahoMqtt5ITSupport { @Test public void testToD() {