Skip to content

[Fix #786] Refining test #788

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
merged 1 commit into from
Sep 19, 2025
Merged

[Fix #786] Refining test #788

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions impl/core/src/main/java/io/serverlessworkflow/impl/expressions/ObjectExpressionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private Object buildExpressionObject(Object obj, ExpressionFactory factory) {
} else if (obj instanceof Map map) {
return buildExpressionMap(map, factory);
} else if (obj instanceof Collection col) {
return buildExpressionList(col, factory);
return buildExpressionCollection(col, factory);
} else {
return obj;
}
Expand Down Expand Up @@ -84,7 +84,7 @@ private Map<String, Object> buildExpressionMap(
: buildExpressionObject(o, factory));
}

private Collection<Object> buildExpressionList(
private Collection<Object> buildExpressionCollection(
Collection<Object> col, ExpressionFactory factory) {
return new ProxyCollection(
col,
Expand Down
60 changes: 27 additions & 33 deletions ...kson/src/test/java/io/serverlessworkflow/impl/expressions/jq/JQExpressionFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,41 +25,23 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

class JQExpressionFactoryTest {

@Test
void testNestedMap() {
WorkflowContext workflowContext = Mockito.mock(WorkflowContext.class);
JQExpressionFactory factory = new JQExpressionFactory();
WorkflowValueResolver<Map<String, Object>> expr =
factory.resolveMap(
ExpressionDescriptor.object(
Map.of(
"name",
"${.name}",
"surname",
"Doe",
"nested",
Map.of("name", "${.name}", "surname", "Doe"))));
Map<String, Object> result =
expr.apply(
workflowContext,
null,
new JacksonModel(JsonUtils.mapper().createObjectNode().put("name", "John")));
assertThat(result.get("name")).isEqualTo("John");
assertThat(result.get("surname")).isEqualTo("Doe");
Map<String, Object> nested = (Map<String, Object>) result.get("nested");
assertThat(result.get("name")).isEqualTo("John");
assertThat(result.get("surname")).isEqualTo("Doe");
private WorkflowContext workflowContext;
private JQExpressionFactory factory;

@BeforeEach
void setup() {
workflowContext = Mockito.mock(WorkflowContext.class);
factory = new JQExpressionFactory();
}

@Test
void testNestedArray() {
WorkflowContext workflowContext = Mockito.mock(WorkflowContext.class);
JQExpressionFactory factory = new JQExpressionFactory();
void testArrayExpression() {
WorkflowValueResolver<Map<String, Object>> expr =
factory.resolveMap(
ExpressionDescriptor.object(
Expand All @@ -78,20 +60,32 @@ void testNestedArray() {
}

@Test
void testList() {
WorkflowContext workflowContext = Mockito.mock(WorkflowContext.class);
JQExpressionFactory factory = new JQExpressionFactory();
void testNesterMapAndArrayTogether() {
WorkflowValueResolver<Map<String, Object>> expr =
factory.resolveMap(
ExpressionDescriptor.object(Map.of("array", List.of("item1", "item2", "${.name}"))));
ExpressionDescriptor.object(
Map.of(
"name",
"${.name}",
"surname",
"Doe",
"nested",
Map.of("name", "${.name}", "surname", "Doe"),
"array",
List.of("item1", "item2", "${.name}"))));
Map<String, Object> result =
expr.apply(
workflowContext,
null,
new JacksonModel(JsonUtils.mapper().createObjectNode().put("name", "item3")));
new JacksonModel(JsonUtils.mapper().createObjectNode().put("name", "John")));
Iterator<Object> iter = ((Collection<Object>) result.get("array")).iterator();
assertThat(iter.next()).isEqualTo("item1");
assertThat(iter.next()).isEqualTo("item2");
assertThat(iter.next()).isEqualTo("item3");
assertThat(iter.next()).isEqualTo("John");
assertThat(result.get("name")).isEqualTo("John");
assertThat(result.get("surname")).isEqualTo("Doe");
Map<String, Object> nested = (Map<String, Object>) result.get("nested");
assertThat(result.get("name")).isEqualTo("John");
assertThat(result.get("surname")).isEqualTo("Doe");
}
}