diff --git a/core/pom.xml b/core/pom.xml index fe65715f3..7d2032c7e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 - com.google.adk google-adk-parent - 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + - google-adk Agent Development Kit Agent Development Kit: an open-source, code-first toolkit designed to simplify building, evaluating, and deploying advanced AI agents anywhere. - - - com.anthropic @@ -201,6 +197,15 @@ maven-compiler-plugin + + io.spring.javaformat + spring-javaformat-maven-plugin + 0.0.40 + + + + + - + \ No newline at end of file diff --git a/core/src/test/java/com/google/adk/memory/InMemoryMemoryServiceAddSessionToMemoryTest.java b/core/src/test/java/com/google/adk/memory/InMemoryMemoryServiceAddSessionToMemoryTest.java new file mode 100644 index 000000000..8a8645317 --- /dev/null +++ b/core/src/test/java/com/google/adk/memory/InMemoryMemoryServiceAddSessionToMemoryTest.java @@ -0,0 +1,177 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// ********RoostGPT******** +/* +Test generated by RoostGPT for test unit-java-adk using AI Type Azure Open AI and AI Model gpt-5 + +ROOST_METHOD_HASH=addSessionToMemory_8a630adf5c +ROOST_METHOD_SIG_HASH=addSessionToMemory_3e3003d0a0 + +Scenario 1: Successfully stores a session with events that have non-empty parts + +Details: + TestName: storesSessionWithEventsHavingNonEmptyParts + Description: Verifies that addSessionToMemory stores a session whose events include content with present, non-empty parts. Confirms that the returned Completable completes without errors and that the stored events are discoverable via searchMemory. + +Execution: + Arrange: Create a Session with appName "appA", userId "user1", session id "s1", and events where at least one event has content().isPresent() and parts().isPresent() with a non-empty list containing a Part with non-empty text like "hello world". + Act: Invoke addSessionToMemory(session) and await the Completable to complete. Then call searchMemory("appA", "user1", "hello") to retrieve memories. + Assert: Assert the Completable completes successfully. Assert that searchMemory returns at least one MemoryEntry with content containing the word "hello". + +Validation: + Confirms that events meeting the filter (content present, parts present and non-empty) are retained and can be retrieved through searchMemory. Ensures the Completable signals completion, indicating the write to memory occurred. + +*/ + +// ********RoostGPT******** + +package com.google.adk.memory; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import com.google.adk.events.Event; +import com.google.adk.sessions.Session; +import com.google.common.collect.ImmutableList; +import com.google.genai.types.Part; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Single; +import java.time.Instant; +import java.util.List; +import java.util.Locale; +import java.util.Optional; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +public class InMemoryMemoryServiceAddSessionToMemoryTest { + + private InMemoryMemoryService service; + + @BeforeEach + public void setup() { + service = new InMemoryMemoryService(); + } + + @Test + @Tag("valid") + public void testStoresSessionWithEventsHavingNonEmptyParts() { + // Arrange + String appName = "appA"; // TODO: adjust appName if needed + String userId = "user1"; // TODO: adjust userId if needed + String sessionId = "s1"; // TODO: adjust session id if needed + // Create a Part with non-empty text "hello world" + Part partWithHello = Mockito.mock(Part.class); + Mockito.when(partWithHello.text()).thenReturn(Optional.of("hello world")); + // Content containing a non-empty list of parts + com.google.genai.types.Content contentWithPart = + Mockito.mock(com.google.genai.types.Content.class); + Mockito.when(contentWithPart.parts()).thenReturn(Optional.of(ImmutableList.of(partWithHello))); + // Event with content present and non-empty parts + Event eventWithContent = Mockito.mock(Event.class); + Mockito.when(eventWithContent.content()).thenReturn(Optional.of(contentWithPart)); + Mockito.when(eventWithContent.author()).thenReturn("author"); + Mockito.when(eventWithContent.timestamp()).thenReturn(Instant.now().getEpochSecond()); + // Event with empty parts to ensure filtering works + com.google.genai.types.Content contentEmptyParts = + Mockito.mock(com.google.genai.types.Content.class); + Mockito.when(contentEmptyParts.parts()).thenReturn(Optional.of(ImmutableList.of())); + Event eventEmptyParts = Mockito.mock(Event.class); + Mockito.when(eventEmptyParts.content()).thenReturn(Optional.of(contentEmptyParts)); + Mockito.when(eventEmptyParts.author()).thenReturn("author"); + Mockito.when(eventEmptyParts.timestamp()).thenReturn(Instant.now().getEpochSecond()); + // Event with no content to ensure filtering works + Event eventNoContent = Mockito.mock(Event.class); + Mockito.when(eventNoContent.content()).thenReturn(Optional.empty()); + Mockito.when(eventNoContent.author()).thenReturn("author"); + Mockito.when(eventNoContent.timestamp()).thenReturn(Instant.now().getEpochSecond()); + // Session with a mix of events + Session session = Mockito.mock(Session.class); + Mockito.when(session.appName()).thenReturn(appName); + Mockito.when(session.userId()).thenReturn(userId); + Mockito.when(session.id()).thenReturn(sessionId); + Mockito.when(session.events()) + .thenReturn(ImmutableList.of(eventWithContent, eventEmptyParts, eventNoContent)); + // Act + Completable completable = service.addSessionToMemory(session); + // Assert - Completable completes successfully + assertDoesNotThrow(() -> completable.blockingAwait()); + // And the stored events are discoverable via searchMemory + Single responseSingle = service.searchMemory(appName, userId, "hello"); + SearchMemoryResponse response = responseSingle.blockingGet(); + // Assert at least one MemoryEntry with content containing the word "hello" + List memories = response.memories(); + boolean foundHello = false; + for (MemoryEntry memory : memories) { + Optional> maybeParts = memory.content().parts(); + if (maybeParts.isPresent()) { + for (Part p : maybeParts.get()) { + Optional text = p.text(); + if (text.isPresent() && text.get().toLowerCase(Locale.ROOT).contains("hello")) { + foundHello = true; + break; + } + } + } + if (foundHello) { + break; + } + } + assertFalse( + (boolean) Boolean.valueOf(!foundHello), + "Expected to find at least one memory containing the word 'hello'"); + } + + @Test + @Tag("invalid") + public void testIgnoresEventsWithEmptyOrMissingParts() { + // Arrange + String appName = "appB"; // TODO: adjust appName if needed + String userId = "user2"; // TODO: adjust userId if needed + String sessionId = "s2"; // TODO: adjust session id if needed + // Event with empty parts + com.google.genai.types.Content contentEmptyParts = + Mockito.mock(com.google.genai.types.Content.class); + Mockito.when(contentEmptyParts.parts()).thenReturn(Optional.of(ImmutableList.of())); + Event eventEmptyParts = Mockito.mock(Event.class); + Mockito.when(eventEmptyParts.content()).thenReturn(Optional.of(contentEmptyParts)); + Mockito.when(eventEmptyParts.author()).thenReturn("author"); + Mockito.when(eventEmptyParts.timestamp()).thenReturn(Instant.now().getEpochSecond()); + // Event with no content + Event eventNoContent = Mockito.mock(Event.class); + Mockito.when(eventNoContent.content()).thenReturn(Optional.empty()); + Mockito.when(eventNoContent.author()).thenReturn("author"); + Mockito.when(eventNoContent.timestamp()).thenReturn(Instant.now().getEpochSecond()); + // Session containing only events that should be filtered out + Session session = Mockito.mock(Session.class); + Mockito.when(session.appName()).thenReturn(appName); + Mockito.when(session.userId()).thenReturn(userId); + Mockito.when(session.id()).thenReturn(sessionId); + Mockito.when(session.events()).thenReturn(ImmutableList.of(eventEmptyParts, eventNoContent)); + // Act + Completable completable = service.addSessionToMemory(session); + // Assert - Completable completes successfully + assertDoesNotThrow(() -> completable.blockingAwait()); + // Then search should not return any memories for any queried word + SearchMemoryResponse r1 = service.searchMemory(appName, userId, "anything").blockingGet(); + List memories1 = r1.memories(); + assertFalse( + (boolean) Boolean.valueOf(!memories1.isEmpty()), + "Expected no memories to be returned for sessions with only empty/missing parts"); + } +} diff --git a/pom.xml b/pom.xml index 6009c7316..24fd6ece6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 - com.google.adk google-adk-parent - 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + pom - Google Agent Development Kit Maven Parent POM https://github.com/google/adk-java Google Agent Development Kit (ADK) for Java - core dev @@ -39,12 +35,10 @@ a2a a2a/webservice - 17 ${java.version} UTF-8 - 1.11.0 3.4.1 1.49.0 @@ -73,7 +67,6 @@ 3.9.0 5.4.3 - @@ -112,7 +105,6 @@ pom import - com.anthropic @@ -274,9 +266,21 @@ assertj-core ${assertj.version} + + org.mockito + mockito-junit-jupiter + 2.23.4 + test + + + + io.spring.javaformat + spring-javaformat-formatter + 0.0.40 + + - @@ -324,8 +328,7 @@ plain - + **/*Test.java @@ -469,6 +472,36 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.2.5 + + testReport + + + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + + testReport + + + + + io.spring.javaformat + spring-javaformat-maven-plugin + 0.0.40 + + @@ -528,7 +561,6 @@ - The Apache License, Version 2.0 @@ -558,4 +590,19 @@ https://central.sonatype.com/repository/maven-snapshots/ + + + org.mockito + mockito-junit-jupiter + 2.23.4 + test + + + + io.spring.javaformat + spring-javaformat-formatter + 0.0.40 + + + \ No newline at end of file