Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,7 @@ java_library(
"//common/types:type_providers",
"//runtime",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_guava_guava",
],
)

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ public enum Kind {
RESULT_VALUE,
RESULT_EXPR,
EVAL_ERROR,
UNKNOWN_SET,
NO_OUTPUT
}

Expand All@@ -189,6 +190,8 @@ public enum Kind {

public abstract ImmutableList<Object> evalError();

public abstract ImmutableList<Long> unknownSet();

public static Output ofResultValue(Object resultValue) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.resultValue(resultValue);
}
Expand All@@ -201,6 +204,10 @@ public static Output ofEvalError(ImmutableList<Object> errors) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.evalError(errors);
}

public static Output ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.unknownSet(unknownSet);
}

public static Output ofNoOutput() {
return AutoOneOf_CelTestSuite_CelTestSection_CelTestCase_Output.noOutput();
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,22 @@ private ImmutableList<Object> parseList(ParserContext<Node> ctx, Node node) {
return listBuilder.build();
}

private ImmutableList<Long> parseUnknown(ParserContext<Node> ctx, Node node) {
ImmutableList<Object> unknown = parseList(ctx, node);
ImmutableList.Builder<Long> unknownBuilder = ImmutableList.builder();
for (Object object : unknown) {
if (object instanceof Integer) {
unknownBuilder.add(Long.valueOf((Integer) object));
} else {
ctx.reportError(
ctx.collectMetadata(node),
"Only integer ids are supported in unknown list. Found: "
+ object.getClass().getName());
}
}
return unknownBuilder.build();
}

private CelTestCase.Input parseContextExpr(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, valueId, node, YamlNodeType.STRING)) {
Expand DownExpand Up@@ -348,6 +364,8 @@ private CelTestCase.Output parseOutput(ParserContext<Node> ctx, Node node) {
return CelTestCase.Output.ofResultExpr(newString(ctx, valueNode));
case "error_set":
return CelTestCase.Output.ofEvalError(parseList(ctx, valueNode));
case "unknown":
return CelTestCase.Output.ofUnknownSet(parseUnknown(ctx, valueNode));
default:
ctx.reportError(keyId, "Unknown output tag: " + fieldName);
break;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,10 @@ public void match(ResultMatcherParams params, Cel cel) throws Exception {
assertThat(params.computedOutput().error().toString())
.contains(result.evalError().get(0).toString());
break;
case UNKNOWN_SET:
assertThat(params.computedOutput().unknownSet())
.containsExactlyElementsIn(result.unknownSet());
break;
default:
throw new IllegalArgumentException("Unexpected output type: " + result.kind());
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import dev.cel.bundle.Cel;
import dev.cel.common.types.CelType;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -38,7 +39,8 @@ public abstract static class ComputedOutput {
/** Kind of the computed output. */
public enum Kind {
EXPR_VALUE,
ERROR
ERROR,
UNKNOWN_SET,
}

public abstract Kind kind();
Expand All@@ -47,13 +49,19 @@ public enum Kind {

public abstract CelEvaluationException error();

public abstract ImmutableList<Long> unknownSet();

public static ComputedOutput ofExprValue(ExprValue exprValue) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.exprValue(exprValue);
}

public static ComputedOutput ofError(CelEvaluationException error) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.error(error);
}

public static ComputedOutput ofUnknownSet(ImmutableList<Long> unknownSet) {
return AutoOneOf_ResultMatcher_ResultMatcherParams_ComputedOutput.unknownSet(unknownSet);
}
}

public abstract CelType resultType();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.protobuf.Any;
Expand DownExpand Up@@ -264,10 +265,23 @@ private static void evaluate(
.setExpectedOutput(Optional.ofNullable(testCase.output()))
.setResultType(ast.getResultType());

if (exprValue != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
} else {
if (error != null) {
paramsBuilder.setComputedOutput(ResultMatcherParams.ComputedOutput.ofError(error));
} else {
switch (exprValue.getKindCase()) {
case VALUE:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofExprValue(exprValue));
break;
case UNKNOWN:
paramsBuilder.setComputedOutput(
ResultMatcherParams.ComputedOutput.ofUnknownSet(
ImmutableList.copyOf(exprValue.getUnknown().getExprsList())));
break;
default:
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", exprValue.getKindCase()));
}
}

celTestContext.resultMatcher().match(paramsBuilder.build(), cel);
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ java_library(
"//common/internal:default_message_factory",
"//common/types",
"//common/types:type_providers",
"//runtime:unknown_attributes",
"//testing/testrunner:registry_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.ListValue;
import dev.cel.expr.MapValue;
import dev.cel.expr.UnknownSet;
import dev.cel.expr.Value;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -41,6 +42,7 @@
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeType;
import dev.cel.runtime.CelUnknownSet;
import dev.cel.testing.testrunner.RegistryUtils;
import java.io.IOException;
import java.util.List;
Expand DownExpand Up@@ -151,9 +153,16 @@ public static ExprValue toExprValue(Object object, CelType type) throws Exceptio
if (object instanceof ExprValue) {
return (ExprValue) object;
}
if (object instanceof CelUnknownSet) {
return ExprValue.newBuilder().setUnknown(toUnknownSet((CelUnknownSet) object)).build();
}
return ExprValue.newBuilder().setValue(toValue(object, type)).build();
}

public static UnknownSet toUnknownSet(CelUnknownSet unknownSet) {
return UnknownSet.newBuilder().addAllExprs(unknownSet.unknownExprIds()).build();
}

/**
* Converts a Java object to an {@link Value}.
*
Expand Down
12 changes: 12 additions & 0 deletions testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,18 @@ cel_java_test(
test_suite = "nested_rule/testrunner_tests.yaml",
)

cel_java_test(
name = "unknown_set_yaml",
cel_expr = "nested_rule/policy.yaml",
proto_deps = [
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto",
],
test_data_path = "//testing/src/test/resources/policy",
test_src = ":user_test",
test_suite = "nested_rule/testrunner_unknown_output_tests.yaml",
)

cel_java_test(
name = "test_runner_yaml_sample_with_eval_error",
cel_expr = "nested_rule/eval_error_policy.yaml",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -457,6 +457,25 @@ private enum TestSuiteYamlParsingErrorTestCase {
+ " [tag:yaml.org,2002:str !txt]\n"
+ " | 1:\n"
+ " | ^"),
TEST_CASE_WITH_ILLEGAL_UNKNOWN_OUTPUT_TYPE(
"name: 'test_suite_name'\n"
+ "description: 'test_suite_description'\n"
+ "sections:\n"
+ "- name: 'test_section_name'\n"
+ " description: 'test_section_description'\n"
+ " tests:\n"
+ " - name: 'test_case_name'\n"
+ " description: 'test_case_description'\n"
+ " input:\n"
+ " test_key:\n"
+ " value: 'test_value'\n"
+ " output:\n"
+ " unknown:\n"
+ " - 'test_result_value'\n",
"ERROR: <input>:14:9: Only integer ids are supported in unknown list. Found:"
+ " java.lang.String\n"
+ " | - 'test_result_value'\n"
+ " | ........^"),
;

private final String testSuiteYamlContent;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Copyright 2024 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
#
# https://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.

name: "nested_rule"
description: Nested rule conformance tests
sections:
- name: "banned"
description: "Tests for the banned section."
tests:
- name: "restricted_origin"
description: "Tests that the ir origin is restricted."
output:
unknown:
- 28
- 33