Skip to content

refactor: Simplifying TestUtils #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 24, 2025
Merged

refactor: Simplifying TestUtils #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 34 additions & 55 deletions core/src/test/java/com/google/adk/testing/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,64 +88,43 @@ public static Event createEscalateEvent(String id) {

public static ImmutableList<Object> simplifyEvents(List<Event> events) {
return events.stream()
.map(event -> event.author() + ": " + formatEventContent(event))
.collect(toImmutableList());
}

private static String formatEventContent(Event event) {
return event
.content()
.flatMap(content -> content.parts())
.map(
event -> {
if (event.content().isPresent() && event.content().get().parts().isPresent()) {
List<Part> parts = event.content().get().parts().get();
if (parts.size() == 1) {
Part part = parts.get(0);
if (part.text().isPresent()) {
return event.author() + ": " + part.text().get();
} else if (part.functionCall().isPresent()) {
// Custom formatting for FunctionCall
FunctionCall fc = part.functionCall().get();
String argsString =
fc.args().map(Object::toString).orElse("{}"); // Handle optional args
return String.format(
"%s: FunctionCall(name=%s, args=%s)",
event.author(), fc.name().orElse(""), argsString);
} else if (part.functionResponse().isPresent()) {
// Custom formatting for FunctionResponse
FunctionResponse fr = part.functionResponse().get();
String responseString =
fr.response()
.map(Object::toString)
.orElse("{}"); // Handle optional response
return String.format(
"%s: FunctionResponse(name=%s, response=%s)",
event.author(), fr.name().orElse(""), responseString);
}
} else { // Multiple parts, return the list of parts for simplicity
// Apply custom formatting to parts within the list if needed
String partsString =
parts.stream()
.map(
part -> {
if (part.text().isPresent()) {
return part.text().get();
} else if (part.functionCall().isPresent()) {
FunctionCall fc = part.functionCall().get();
String argsString = fc.args().map(Object::toString).orElse("{}");
return String.format(
"FunctionCall(name=%s, args=%s)",
fc.name().orElse(""), argsString);
} else if (part.functionResponse().isPresent()) {
FunctionResponse fr = part.functionResponse().get();
String responseString =
fr.response().map(Object::toString).orElse("{}");
return String.format(
"FunctionResponse(name=%s, response=%s)",
fr.name().orElse(""), responseString);
}
return part.toString(); // Fallback
})
.collect(joining(", "));
return event.author() + ": [" + partsString + "]";
}
parts -> {
if (parts.size() == 1) {
return formatPart(parts.get(0));
} else {
String contentString =
parts.stream().map(TestUtils::formatPart).collect(joining(", "));
return "[" + contentString + "]";
}
return event.author() + ": [NO_CONTENT]"; // Fallback if no content/parts
})
.collect(toImmutableList());
.orElse("[NO_CONTENT]");
}

private static String formatPart(Part part) {
if (part.text().isPresent()) {
return part.text().get();
}
if (part.functionCall().isPresent()) {
FunctionCall fc = part.functionCall().get();
String argsString = fc.args().map(Object::toString).orElse("{}");
return String.format("FunctionCall(name=%s, args=%s)", fc.name().orElse(""), argsString);
}
if (part.functionResponse().isPresent()) {
FunctionResponse fr = part.functionResponse().get();
String responseString = fr.response().map(Object::toString).orElse("{}");
return String.format(
"FunctionResponse(name=%s, response=%s)", fr.name().orElse(""), responseString);
}
return part.toString(); // Fallback
}

public static void assertEqualIgnoringFunctionIds(
Expand Down