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
commit 99900daa9e7f24e57f929620eaed1867da59dee5 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Fri Sep 12 16:23:24 2025 +0200 (chores) camel-ai: do not use deprecated test methods --- .../chat/LangChain4jRagAggregatorTest.java | 40 +++++++++-------- ...angChain4jEmbeddingsComponentNeo4jTargetIT.java | 51 +++++++++++----------- ...ngChain4jEmbeddingsComponentQdrantTargetIT.java | 4 +- ...Chain4jEmbeddingsComponentWeaviateTargetIT.java | 5 +-- 4 files changed, 51 insertions(+), 49 deletions(-) diff --git a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java index c15cd72f4dd..efddb3f5443 100644 --- a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java +++ b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java @@ -25,6 +25,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.langchain4j.chat.rag.LangChain4jRagAggregatorStrategy; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +50,7 @@ public class LangChain4jRagAggregatorTest { @Test void testAggregateWithNoNewData() { Exchange result = aggregator.aggregate(oldExchange, newExchange); - assertEquals(oldExchange, result); + Assertions.assertEquals(oldExchange, result); } @Test @@ -67,16 +68,16 @@ public class LangChain4jRagAggregatorTest { List<Content> contents = result.getIn().getHeader(AUGMENTED_DATA, List.class); String prompt = result.getIn().getBody(String.class); - assertNotNull("The body should contain the old body", prompt); - assertEquals("Prompt Test", prompt); + Assertions.assertNotNull(prompt, "The body should contain the old body"); + Assertions.assertEquals("Prompt Test", prompt); - assertNotNull("The old exchange should contain now the enriched data in type of List of Content", contents); - assertEquals(2, contents.size()); + Assertions.assertNotNull(contents, "The old exchange should contain now the enriched data in type of List of Content"); + Assertions.assertEquals(2, contents.size()); - assertTrue("The first content item should match one of the new data entries.", - newData.contains(contents.get(0).textSegment().text())); - assertTrue("The second content item should match one of the new data entries.", - newData.contains(contents.get(1).textSegment().text())); + Assertions.assertTrue(newData.contains(contents.get(0).textSegment().text()), + "The first content item should match one of the new data entries."); + Assertions.assertTrue(newData.contains(contents.get(1).textSegment().text()), + "The second content item should match one of the new data entries."); } @Test @@ -100,23 +101,24 @@ public class LangChain4jRagAggregatorTest { contents = result.getIn().getHeader(AUGMENTED_DATA, List.class); String prompt = result.getIn().getBody(String.class); - assertNotNull("The body should contain the old body", prompt); - assertEquals("Prompt Test", prompt); + Assertions.assertNotNull(prompt, "The body should contain the old body"); + Assertions.assertEquals("Prompt Test", prompt); - assertNotNull("The old exchange should contain now the enriched data in type of List of Content", contents); - assertEquals(3, contents.size()); + Assertions.assertNotNull(contents, "The old exchange should contain now the enriched data in type of List of Content"); + Assertions.assertEquals(3, contents.size()); - assertEquals("The first content item should match the old content", "Old data", contents.get(0).textSegment().text()); - assertTrue("The second content item should match one of the new data entries.", - newData.contains(contents.get(1).textSegment().text())); - assertTrue("The third content item should match one of the new data entries.", - newData.contains(contents.get(2).textSegment().text())); + Assertions.assertEquals("Old data", contents.get(0).textSegment().text(), + "The first content item should match the old content"); + Assertions.assertTrue(newData.contains(contents.get(1).textSegment().text()), + "The second content item should match one of the new data entries."); + Assertions.assertTrue(newData.contains(contents.get(2).textSegment().text()), + "The third content item should match one of the new data entries."); } @Test void testOldExchangeIsNull() { newExchange.getMessage().setHeader(AUGMENTED_DATA, "Additional data"); Exchange result = aggregator.aggregate(null, newExchange); - assertEquals(newExchange, result); + Assertions.assertEquals(newExchange, result); } } diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java index b6d29f463d5..4f80c30fe5d 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java @@ -33,6 +33,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.neo4j.services.Neo4jService; import org.apache.camel.test.infra.neo4j.services.Neo4jServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -41,9 +42,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @@ -75,15 +73,15 @@ public class LangChain4jEmbeddingsComponentNeo4jTargetIT extends CamelTestSuppor .withHeader(Neo4jConstants.Headers.OPERATION, Neo4Operation.CREATE_VECTOR_INDEX) .request(Exchange.class); - assertNotNull(result); + Assertions.assertNotNull(result); Message in = result.getMessage(); - assertNotNull(in); + Assertions.assertNotNull(in); - assertEquals(Neo4Operation.CREATE_VECTOR_INDEX, in.getHeader(Neo4jConstants.Headers.OPERATION)); - assertTrue("The executed request should contain the create vector index", - in.getHeader(Neo4jConstants.Headers.QUERY_RESULT, String.class) - .contains("CREATE VECTOR INDEX myIndex IF NOT EXISTS")); + Assertions.assertEquals(Neo4Operation.CREATE_VECTOR_INDEX, in.getHeader(Neo4jConstants.Headers.OPERATION)); + Assertions.assertTrue(in.getHeader(Neo4jConstants.Headers.QUERY_RESULT, String.class) + .contains("CREATE VECTOR INDEX myIndex IF NOT EXISTS"), + "The executed request should contain the create vector index"); } @@ -98,10 +96,12 @@ public class LangChain4jEmbeddingsComponentNeo4jTargetIT extends CamelTestSuppor assertThat(result).isNotNull(); Message in = result.getMessage(); - assertNotNull(in); + Assertions.assertNotNull(in); - assertEquals("Operation is create Vector", Neo4Operation.CREATE_VECTOR, in.getHeader(Neo4jConstants.Headers.OPERATION)); - assertEquals("A node creation is expected ", 1, in.getHeader(Neo4jConstants.Headers.QUERY_RESULT_NODES_CREATED)); + Assertions.assertEquals(Neo4Operation.CREATE_VECTOR, in.getHeader(Neo4jConstants.Headers.OPERATION), + "Operation is create Vector"); + Assertions.assertEquals(1, in.getHeader(Neo4jConstants.Headers.QUERY_RESULT_NODES_CREATED), + "A node creation is expected "); } @@ -117,26 +117,27 @@ public class LangChain4jEmbeddingsComponentNeo4jTargetIT extends CamelTestSuppor .withHeader(Neo4jConstants.Headers.OPERATION, Neo4Operation.RETRIEVE_NODES_AND_UPDATE_WITH_CYPHER_QUERY) .request(Exchange.class); - assertNotNull(result); + Assertions.assertNotNull(result); Message in = result.getMessage(); - assertNotNull(in); - assertEquals(Neo4Operation.RETRIEVE_NODES_AND_UPDATE_WITH_CYPHER_QUERY, in.getHeader(Neo4jConstants.Headers.OPERATION)); - assertEquals("The database should retrieve the node with id =1 that was created by previous test", 1, - in.getHeader(Neo4jConstants.Headers.QUERY_RETRIEVE_SIZE)); + Assertions.assertNotNull(in); + Assertions.assertEquals(Neo4Operation.RETRIEVE_NODES_AND_UPDATE_WITH_CYPHER_QUERY, + in.getHeader(Neo4jConstants.Headers.OPERATION)); + Assertions.assertEquals(1, in.getHeader(Neo4jConstants.Headers.QUERY_RETRIEVE_SIZE), + "The database should retrieve the node with id =1 that was created by previous test"); List resultList = in.getBody(List.class); - assertNotNull("Body should be a list", resultList); + Assertions.assertNotNull(resultList, "Body should be a list"); - assertEquals("The list of result should contain a unique embedding", 1, resultList.size()); + Assertions.assertEquals(1, resultList.size(), "The list of result should contain a unique embedding"); Map<String, Object> map = (Map<String, Object>) resultList.get(0); - assertNotNull("getting the single result that shouldn't be null", map); - assertTrue("The map should contain an id", map.containsKey("id")); - assertEquals("The id should be equal to 1", "1", map.get("id")); - assertTrue("The map should contain an embedding", map.containsKey("embedding")); + Assertions.assertNotNull(map, "getting the single result that shouldn't be null"); + Assertions.assertTrue(map.containsKey("id"), "The map should contain an id"); + Assertions.assertEquals("1", map.get("id"), "The id should be equal to 1"); + Assertions.assertTrue(map.containsKey("embedding"), "The map should contain an embedding"); List<Float> embedding = (List) map.get("embedding"); - assertTrue("The list of embeddings should be a list of float. if no erreor, this assert is valid", true); + Assertions.assertTrue(true, "The list of embeddings should be a list of float. if no erreor, this assert is valid"); } @@ -151,7 +152,7 @@ public class LangChain4jEmbeddingsComponentNeo4jTargetIT extends CamelTestSuppor assertThat(result.getException()).isNull(); assertThat(result.getIn().getBody()).isInstanceOfSatisfying(Collection.class, c -> assertThat(c).hasSize(1)); - assertTrue(result.getIn().getBody(List.class).contains("hi")); + Assertions.assertTrue(result.getIn().getBody(List.class).contains("hi")); } @Override diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java index 370464aa910..1e8d5f7b863 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java @@ -33,6 +33,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.qdrant.services.QdrantService; import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -41,7 +42,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @@ -117,7 +117,7 @@ public class LangChain4jEmbeddingsComponentQdrantTargetIT extends CamelTestSuppo assertThat(result.getException()).isNull(); assertThat(result.getIn().getBody()).isInstanceOfSatisfying(Collection.class, c -> assertThat(c).hasSize(1)); - assertTrue(result.getIn().getBody(List.class).contains("hi")); + Assertions.assertTrue(result.getIn().getBody(List.class).contains("hi")); } @Override diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java index d89cd9253ac..c89d9884b47 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java @@ -36,6 +36,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.weaviate.services.WeaviateService; import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -44,8 +45,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @@ -154,7 +153,7 @@ public class LangChain4jEmbeddingsComponentWeaviateTargetIT extends CamelTestSup assertThat(result).isNotNull(); assertThat(result.getException()).isNull(); - assertNotNull(result.getIn().getBody()); + Assertions.assertNotNull(result.getIn().getBody()); } @Override
