rewrite some tests

Author: Martin7-1

embedding-stores/langchain4j-community-memfile/src/test/java/dev/langchain4j/community/store/embedding/memfile/MemFileEmbeddingStoreSerializationTest.java

@@ -10,15 +10,14 @@
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.embedding.onnx.allminilml6v2q.AllMiniLmL6V2QuantizedEmbeddingModel;
 import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-public class MemFileEmbeddingStoreSerializationTest {
+class MemFileEmbeddingStoreSerializationTest {
 
     @TempDir
     Path tempDir;
@@ -42,7 +41,7 @@ void tearDown() {
     }
 
     @Test
-    void should_serialize_deserialize_json_roundtrip() throws IOException {
+    void should_serialize_deserialize_json_roundtrip() throws Exception {
         // given - add some comprehensive test data
         String text1 = "Machine learning enables computers to learn patterns from data";
         String text2 = "Natural language processing helps understand human communication";
@@ -106,7 +105,7 @@ void should_serialize_deserialize_json_roundtrip() throws IOException {
     }
 
     @Test
-    void should_serialize_deserialize_file_roundtrip() throws IOException {
+    void should_serialize_deserialize_file_roundtrip() throws Exception {
         // given - add test data with different scenarios
         String text1 = "Artificial intelligence transforms various industries worldwide";
         String text2 = "Deep learning uses neural networks for complex pattern recognition";
@@ -127,10 +126,11 @@ void should_serialize_deserialize_file_roundtrip() throws IOException {
         // then - validate file was created and content preserved
         assertThat(Files.exists(file)).isTrue();
         String fileContent = Files.readString(file);
-        assertThat(fileContent).contains("custom-id-1");
-        assertThat(fileContent).contains("custom-id-2");
-        assertThat(fileContent).contains("entries");
-        assertThat(fileContent).contains("chunkStorageDirectory");
+        assertThat(fileContent)
+                .contains("custom-id-1")
+                .contains("custom-id-2")
+                .contains("entries")
+                .contains("chunkStorageDirectory");
 
         // Validate deserialized store has all data
         assertThat(deserializedStore).isNotNull();
@@ -171,23 +171,23 @@ void should_serialize_deserialize_file_roundtrip() throws IOException {
     }
 
     @Test
-    void should_handle_empty_store_serialization() throws IOException {
+    void should_handle_empty_store_serialization() throws Exception {
         // given - empty store
 
         // when - serialize and deserialize empty store
         String json = embeddingStore.serialize(strategy);
         MemFileEmbeddingStore<TextSegment> deserializedStore = embeddingStore.deserialize(strategy, json);
 
         // then - validate empty store structure and functionality
-        assertThat(json).isNotNull().isNotEmpty();
+        assertThat(json).isNotEmpty();
 
         ObjectMapper mapper = new ObjectMapper();
         JsonNode rootNode = mapper.readTree(json);
         assertThat(rootNode.has("entries")).isTrue();
         assertThat(rootNode.has("chunkStorageDirectory")).isTrue();
         assertThat(rootNode.has("cacheSize")).isTrue();
         assertThat(rootNode.get("entries").isArray()).isTrue();
-        assertThat(rootNode.get("entries").size()).isEqualTo(0);
+        assertThat(rootNode.get("entries").size()).isZero();
 
         // Validate deserialized empty store works
         assertThat(deserializedStore).isNotNull();

embedding-stores/langchain4j-community-neo4j/src/test/java/dev/langchain4j/community/store/embedding/neo4j/Neo4jEmbeddingStoreTest.java

@@ -35,7 +35,7 @@
 import org.neo4j.driver.Value;
 import org.neo4j.driver.types.Node;
 
-public class Neo4jEmbeddingStoreTest extends Neo4jEmbeddingStoreBaseTest {
+class Neo4jEmbeddingStoreTest extends Neo4jEmbeddingStoreBaseTest {
 
     @Test
     void should_add_embedding_and_check_entity_creation() {

embedding-stores/langchain4j-community-neo4j/src/test/java/dev/langchain4j/community/store/memory/chat/neo4j/Neo4jChatMemoryStoreIT.java

@@ -38,7 +38,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 @Testcontainers
-public class Neo4jChatMemoryStoreIT {
+class Neo4jChatMemoryStoreIT {
 
     protected static final String USERNAME = "neo4j";
     protected static final String ADMIN_PASSWORD = "adminPass";
@@ -88,8 +88,9 @@ void should_set_and_update_messages_into_neo4j() {
         List<ChatMessage> chatMessages = createChatMessages();
         memoryStore.updateMessages(messageId, chatMessages);
         messages = memoryStore.getMessages(messageId);
-        assertThat(messages).hasSize(3);
-        assertThat(messages).isEqualTo(chatMessages);
+        assertThat(messages)
+                .hasSize(3)
+                .isEqualTo(chatMessages);
 
         List<Content> userMsgContents = List.of(new ImageContent("someCatImageUrl"));
         final List<ChatMessage> chatNewMessages =
@@ -113,8 +114,9 @@ void should_init_memory_store_using_withBasicAuth() {
                 .build();
         memoryStore.updateMessages(messageId, chatMessages);
         List<ChatMessage> messages = memoryStore.getMessages(messageId);
-        assertThat(messages).hasSize(3);
-        assertThat(messages).isEqualTo(chatMessages);
+        assertThat(messages)
+                .hasSize(3)
+                .isEqualTo(chatMessages);
 
         // when
         memoryStore.deleteMessages(messageId);
@@ -130,8 +132,9 @@ void should_delete_messages_from_neo4j() {
         List<ChatMessage> chatMessages = createChatMessages();
         memoryStore.updateMessages(messageId, chatMessages);
         List<ChatMessage> messages = memoryStore.getMessages(messageId);
-        assertThat(messages).hasSize(3);
-        assertThat(messages).isEqualTo(chatMessages);
+        assertThat(messages)
+                .hasSize(3)
+                .isEqualTo(chatMessages);
         checkEntitiesCreated(
                 DEFAULT_ID_PROP,
                 DEFAULT_MESSAGE_PROP,
@@ -158,21 +161,24 @@ void should_only_delete_messages_with_correct_memory_id() {
         memoryStore.updateMessages(anotherMessageId, chatMessages2);
 
         List<ChatMessage> messagesBefore = memoryStore.getMessages(messageId);
-        assertThat(messagesBefore).hasSize(3);
-        assertThat(messagesBefore).isEqualTo(chatMessages1);
+        assertThat(messagesBefore)
+                .hasSize(3)
+                .isEqualTo(chatMessages1);
 
         List<ChatMessage> messages2Before = memoryStore.getMessages(anotherMessageId);
-        assertThat(messages2Before).hasSize(3);
-        assertThat(messages2Before).isEqualTo(chatMessages2);
+        assertThat(messages2Before)
+                .hasSize(3)
+                .isEqualTo(chatMessages2);
 
         memoryStore.deleteMessages(messageId);
 
         List<ChatMessage> messagesAfterDelete = memoryStore.getMessages(messageId);
         assertThat(messagesAfterDelete).isEmpty();
 
         List<ChatMessage> messages2AfterDelete = memoryStore.getMessages(anotherMessageId);
-        assertThat(messages2AfterDelete).hasSize(3);
-        assertThat(messages2AfterDelete).isEqualTo(chatMessages2);
+        assertThat(messages2AfterDelete)
+                .hasSize(3)
+                .isEqualTo(chatMessages2);
 
         memoryStore.deleteMessages(anotherMessageId);
         List<ChatMessage> messagesAfter2ndDelete = memoryStore.getMessages(anotherMessageId);
@@ -200,8 +206,9 @@ void should_only_delete_messages_with_custom_labels_and_rel_type() {
         memoryStore.updateMessages(messageId, chatMessages1);
 
         List<ChatMessage> messages = memoryStore.getMessages(messageId);
-        assertThat(messages).hasSize(3);
-        assertThat(messages).isEqualTo(chatMessages1);
+        assertThat(messages)
+                .hasSize(3)
+                .isEqualTo(chatMessages1);
         final List<Record> list =
                 driver.session().run("MATCH (n:Memory) RETURN n").list();
         assertThat(list).isEmpty();
@@ -248,7 +255,7 @@ private void checkEntitiesCreated(
         assertThat(actualProps).containsKey(msgPropToSanitize);
         assertThat(node.labels()).containsExactly(messageLabel);
 
-        assertThat(nodeIterator.hasNext()).isFalse();
+        assertThat(nodeIterator).isExhausted();
 
         final Iterator<Relationship> relIterator = path.relationships().iterator();
         String relType = relIterator.next().type();
@@ -260,7 +267,7 @@ private void checkEntitiesCreated(
         relType = relIterator.next().type();
         assertThat(relType).isEqualTo(nextMessageRel);
 
-        assertThat(relIterator.hasNext()).isFalse();
+        assertThat(relIterator).isExhausted();
     }
 
     @Test
@@ -322,8 +329,9 @@ void should_search_all_messages() {
         memoryStore.updateMessages(messageId, chatMessages1);
 
         List<ChatMessage> messages = memoryStore.getMessages(messageId);
-        assertThat(messages).hasSize(12);
-        assertThat(messages).isEqualTo(chatMessages1);
+        assertThat(messages)
+                .hasSize(12)
+                .isEqualTo(chatMessages1);
     }
 
     @Test

embedding-stores/langchain4j-community-redis/src/test/java/dev/langchain4j/community/store/embedding/redis/RedisEmbeddingStoreRemovalIT.java

@@ -16,7 +16,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import redis.clients.jedis.search.schemafields.TagField;
 
-public class RedisEmbeddingStoreRemovalIT extends EmbeddingStoreWithRemovalIT {
+class RedisEmbeddingStoreRemovalIT extends EmbeddingStoreWithRemovalIT {
 
     static RedisContainer redis = new RedisContainer(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
 

langchain4j-community-core/src/test/java/dev/langchain4j/community/rag/content/aggregator/MmrContentAggregatorTest.java

@@ -246,9 +246,11 @@ void should_filter_by_min_score() {
         // when
         List<Content> aggregated = aggregator.aggregate(queryToContents);
 
-        // then
-        assertThat(aggregated).hasSize(2); // content3 should be filtered out
-        assertThat(aggregated).containsExactly(content1, content2);
+        assertThat(aggregated)
+                // then
+                .hasSize(2)
+                // content3 should be filtered out
+                .containsExactly(content1, content2);
     }
 
     @Test
@@ -421,9 +423,10 @@ void should_use_existing_embeddings_strategy() {
             // when
             List<Content> aggregated = aggregator.aggregate(queryToContents);
 
-            // then
-            assertThat(aggregated).hasSize(2);
-            assertThat(aggregated).containsExactly(content1, content2);
+            assertThat(aggregated)
+                    // then
+                    .hasSize(2)
+                    .containsExactly(content1, content2);
         }
     }
 
@@ -476,9 +479,10 @@ void should_use_hybrid_embeddings_strategy() {
             // when
             List<Content> aggregated = aggregator.aggregate(queryToContents);
 
-            // then
-            assertThat(aggregated).hasSize(2);
-            assertThat(aggregated).containsExactlyInAnyOrder(contentWithEmbedding, contentWithoutEmbedding);
+            assertThat(aggregated)
+                    // then
+                    .hasSize(2)
+                    .containsExactlyInAnyOrder(contentWithEmbedding, contentWithoutEmbedding);
         }
     }
 

models/langchain4j-community-dashscope/src/test/java/dev/langchain4j/community/model/dashscope/QwenChatRequestParametersTest.java

@@ -6,9 +6,10 @@
 import dev.langchain4j.model.chat.request.ChatRequestParameters;
 import org.junit.jupiter.api.Test;
 
-public class QwenChatRequestParametersTest {
+class QwenChatRequestParametersTest {
+
     @Test
-    void test_override_with() {
+    void should_override_when_using_qwen_chat_request_parameters() {
         // given
         QwenChatRequestParameters original = QwenChatRequestParameters.builder()
                 .modelName(QWEN_MAX)

models/langchain4j-community-dashscope/src/test/java/dev/langchain4j/community/model/dashscope/QwenTokenCountEstimatorIT.java

@@ -48,14 +48,14 @@ static Stream<Arguments> should_count_tokens_in_messages() {
 
     @Test
     void should_count_tokens_in_short_texts() {
-        assertThat(tokenCountEstimator.estimateTokenCountInText("Hello")).isEqualTo(1);
+        assertThat(tokenCountEstimator.estimateTokenCountInText("Hello")).isOne();
         assertThat(tokenCountEstimator.estimateTokenCountInText("Hello!")).isEqualTo(2);
         assertThat(tokenCountEstimator.estimateTokenCountInText("Hello, how are you?"))
                 .isEqualTo(6);
 
-        assertThat(tokenCountEstimator.estimateTokenCountInText("")).isEqualTo(0);
-        assertThat(tokenCountEstimator.estimateTokenCountInText("\n")).isEqualTo(1);
-        assertThat(tokenCountEstimator.estimateTokenCountInText("\n\n")).isEqualTo(1);
+        assertThat(tokenCountEstimator.estimateTokenCountInText("")).isZero();
+        assertThat(tokenCountEstimator.estimateTokenCountInText("\n")).isOne();
+        assertThat(tokenCountEstimator.estimateTokenCountInText("\n\n")).isOne();
         assertThat(tokenCountEstimator.estimateTokenCountInText("\n \n\n")).isEqualTo(2);
     }