Skip to content

Add test cases around map type parameter propagation #1214

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add test cases around map type parameter propagation #1214

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
60 changes: 60 additions & 0 deletions checker/src/test/java/dev/cel/checker/TypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,66 @@ public void isAssignable_typeType_occursCheck_failsOnTransitiveCycle() {
assertThat(result).isNull();
}

@Test
public void isAssignable_typeType_occursCheck_mapTypeParam_to_typeParam() {
Map<CelType, CelType> subs = new HashMap<>();
TypeParamType typeParamT = TypeParamType.create("T");
CelType fromType = TypeType.create(MapType.create(SimpleType.STRING, typeParamT));
CelType toType = TypeType.create(typeParamT);

Map<CelType, CelType> result = Types.isAssignable(subs, fromType, toType);

assertThat(result).isNull();
}

@Test
public void isAssignable_typeType_occursCheck_typeParam_to_mapTypeParam() {
Map<CelType, CelType> subs = new HashMap<>();
TypeParamType typeParamT = TypeParamType.create("T");
CelType fromType = TypeType.create(typeParamT);
CelType toType = TypeType.create(MapType.create(SimpleType.STRING, typeParamT));

Map<CelType, CelType> result = Types.isAssignable(subs, fromType, toType);

assertThat(result).isNull();
}

@Test
public void isAssignable_typeType_occursCheck_mapTypeParamInKey_to_typeParam() {
Map<CelType, CelType> subs = new HashMap<>();
TypeParamType typeParamT = TypeParamType.create("T");
CelType fromType = TypeType.create(MapType.create(typeParamT, SimpleType.STRING));
CelType toType = TypeType.create(typeParamT);

Map<CelType, CelType> result = Types.isAssignable(subs, fromType, toType);

assertThat(result).isNull();
}

@Test
public void isAssignable_typeType_occursCheck_listTypeParam_to_typeParam() {
Map<CelType, CelType> subs = new HashMap<>();
TypeParamType typeParamT = TypeParamType.create("T");
CelType fromType = TypeType.create(ListType.create(typeParamT));
CelType toType = TypeType.create(typeParamT);

Map<CelType, CelType> result = Types.isAssignable(subs, fromType, toType);

assertThat(result).isNull();
}

@Test
public void isAssignable_typeType_occursCheck_optionalTypeParam_to_typeParam() {
Map<CelType, CelType> subs = new HashMap<>();
TypeParamType typeParamT = TypeParamType.create("T");
CelType fromType = TypeType.create(OptionalType.create(typeParamT));
CelType toType = TypeType.create(typeParamT);

Map<CelType, CelType> result = Types.isAssignable(subs, fromType, toType);

assertThat(result).isNull();
}

@Test
public void compiler_typeParamInTypeType_resolvesReturnTypeInt() throws Exception {
TypeParamType typeParamT = TypeParamType.create("T");
Expand Down
30 changes: 30 additions & 0 deletions extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

package dev.cel.extensions;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeFalse;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All @@ -35,6 +37,8 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand Down Expand Up @@ -1799,6 +1803,32 @@ public void optionalMessageCreation_fieldKeySetOnNonOptional_throws() {
"Cannot initialize optional entry 'single_double_wrapper' from non-optional value foo");
}

@Test
@TestParameters("{expression: '[type([]), int, type(optional.none())]'}")
@TestParameters("{expression: '[type([]), type(optional.none()), int]'}")
@TestParameters("{expression: '[int, type([]), type(optional.none())]'}")
@TestParameters("{expression: '[int, type(optional.none()), type([])]'}")
@TestParameters("{expression: '[type(optional.none()), type([]), int]'}")
@TestParameters("{expression: '[type(optional.none()), int, type([])]'}")
public void listType_heterogeneousTypePermutations_resolvesToListDyn(String expression)
throws Exception {
assumeFalse(testMode.equals(TestMode.PLANNER_PARSE_ONLY));

Cel cel = newCelBuilder().build();

CelAbstractSyntaxTree ast = compile(cel, expression);
CelList list = ast.getExpr().listOrDefault();

assertThat(ast.getResultType()).isEqualTo(ListType.create(SimpleType.DYN));
assertThat(
list.elements().stream()
.map(elem -> ast.getType(elem.id()).map(CelType::kind))
.collect(toImmutableList()))
.containsExactly(
Optional.of(CelKind.TYPE), Optional.of(CelKind.TYPE), Optional.of(CelKind.TYPE));
assertThat((List<?>) cel.createProgram(ast).eval()).hasSize(3);
}

private CelAbstractSyntaxTree compile(CelCompiler compiler, String expression)
throws CelValidationException {
CelAbstractSyntaxTree ast = compiler.parse(expression).getAst();
Expand Down
Loading