This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new bcce34db Ref #445: Fix atom and flatpack integration tests (#446)
bcce34db is described below
commit bcce34dbb0a1fa912e8a68da4ea89b0a97af3251
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Fri Jul 19 15:50:23 2024 +0200
Ref #445: Fix atom and flatpack integration tests (#446)
---
.../itests/CamelSingleFeatureResultMockBasedRoute.java | 2 +-
.../org/apache/karaf/camel/itest/CamelAtomITest.java | 16 +++++++++-------
.../karaf/camel/test/CamelFlatpackRouteSupplier.java | 2 ++
.../org/apache/karaf/camel/itest/CamelFlatpackITest.java | 13 +++++++------
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
index cfbffd82..29acd3ee 100644
---
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
@@ -29,4 +29,4 @@ public interface CamelSingleFeatureResultMockBasedRoute
extends CamelSingleFeatu
default void assertMockEndpointsSatisfied() throws InterruptedException {
MockEndpoint.assertIsSatisfied(getContext());
}
-}
\ No newline at end of file
+}
diff --git
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
index 1ad01eb1..54d536e6 100644
---
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
+++
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
-import org.apache.karaf.camel.itests.CamelKarafTestHint;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -37,6 +36,13 @@ public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRou
@Override
public void configureMock(MockEndpoint mock) {
mock.expectedMessageCount(7);
+ }
+
+ @Test
+ public void testResultMock() throws Exception {
+ assertMockEndpointsSatisfied();
+ MockEndpoint mock = getMockEndpoint();
+ assertNotNull(mock);
List<Exchange> list = mock.getReceivedExchanges();
String[] expectedTitles = {
"Speaking at the Irish Java Technology Conference on Thursday
and Friday",
@@ -53,14 +59,10 @@ public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRou
String expectedTitle = expectedTitles[counter];
String title = entry.getTitle().get();
- assertEquals(expectedTitle, title, "Title of message " + counter);
+ assertEquals("Title of message " + counter, expectedTitle, title);
counter++;
}
- }
-
- @Test
- public void testResultMock() throws Exception {
- assertMockEndpointsSatisfied();
+ assertEquals(expectedTitles.length, counter);
}
}
\ No newline at end of file
diff --git
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
index 0174a9a6..7114bbc8 100644
---
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
+++
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
@@ -15,6 +15,7 @@
*/
package org.apache.karaf.camel.test;
+import java.util.Map;
import java.util.function.Function;
import org.apache.camel.builder.RouteBuilder;
@@ -34,6 +35,7 @@ public class CamelFlatpackRouteSupplier extends
AbstractCamelSingleFeatureResult
return builder ->
builder.fromF("flatpack:delim:file:%s/test-classes/INVENTORY-Delimited.pzmap.xml",
System.getProperty("project.target"))
+ .convertBodyTo(Map.class)
.log("received message ${body}");
}
diff --git
a/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
b/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
index b6b7fd6e..90d1304d 100644
---
a/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
+++
b/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
@@ -46,20 +46,21 @@ public class CamelFlatpackITest extends
AbstractCamelSingleFeatureResultMockBase
@Override
public void configureMock(MockEndpoint mock) {
mock.expectedMessageCount(4);
+ }
+
+ @Test
+ public void testResultMock() throws Exception {
+ MockEndpoint mock = getMockEndpoint();
List<Exchange> list = mock.getReceivedExchanges();
int counter = 0;
for (Exchange exchange : list) {
Message in = exchange.getIn();
Map<?, ?> body = in.getBody(Map.class);
assertNotNull(body);
- assertEquals(EXPECTED_ITEM_DESCRIPTIONS[counter], "ITEM_DESC",
body.get("ITEM_DESC"));
+ assertEquals("ITEM_DESC", EXPECTED_ITEM_DESCRIPTIONS[counter],
body.get("ITEM_DESC"));
counter++;
}
- }
-
- @Test
- public void testResultMock() throws Exception {
- assertMockEndpointsSatisfied();
+ assertEquals(4, counter);
}
@Override
