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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading
, '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
14 changes: 13 additions & 1 deletion testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":test_runner_library",
Expand All@@ -55,11 +56,11 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":cel_test_context",
":cel_test_suite",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
"//bundle:environment",
"//bundle:environment_yaml_parser",
Expand DownExpand Up@@ -129,6 +130,7 @@ java_library(
tags = [
],
deps = [
":cel_expression_source",
":default_result_matcher",
":result_matcher",
"//:auto_value",
Expand DownExpand Up@@ -207,6 +209,16 @@ java_library(
],
)

java_library(
name = "cel_expression_source",
srcs = ["CelExpressionSource.java"],
tags = [
],
deps = [
"//:auto_value",
],
)

filegroup(
name = "test_runner_binary",
srcs = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// 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.
package dev.cel.testing.testrunner;

import com.google.auto.value.AutoValue;

/**
* CelExpressionSource is an encapsulation around cel_expr file format argument accepted in
* cel_java_test/cel_test bzl macro. It either holds a {@link CheckedExpr} in binarypb/textproto
* format, a serialized {@link CelPolicy} file in yaml/celpolicy format or a raw cel expression in
* cel file format or string format.
*/
@AutoValue
public abstract class CelExpressionSource {

/** Returns the value of the expression source. This can be a file path or a raw expression. */
public abstract String value();

/** Returns the type of the expression source. */
public abstract ExpressionSourceType type();

/**
* Creates a {@link CelExpressionSource} from a file path. The type of the expression source is
* inferred from the file extension.
*/
public static CelExpressionSource fromSource(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.fromSource(value));
}

/** Creates a {@link CelExpressionSource} from a raw CEL expression string. */
public static CelExpressionSource fromRawExpr(String value) {
return new AutoValue_CelExpressionSource(value, ExpressionSourceType.RAW_EXPR);
}

/**
* ExpressionSourceType is an enumeration of the supported expression file types.
*
* <p>This enumeration is used to determine the type of the expression file based on the file
* extension.
*/
public enum ExpressionSourceType {
BINARYPB,
TEXTPROTO,
POLICY,
CEL,
RAW_EXPR;

private static ExpressionSourceType fromSource(String filePath) {
if (filePath.endsWith(".binarypb")) {
return BINARYPB;
}
if (filePath.endsWith(".textproto")) {
return TEXTPROTO;
}
if (filePath.endsWith(".yaml") || filePath.endsWith(".celpolicy")) {
return POLICY;
}
if (filePath.endsWith(".cel")) {
return CEL;
}
throw new IllegalArgumentException("Unsupported expression file type: " + filePath);
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,26 @@ public abstract class CelTestContext {
*/
public abstract ResultMatcher resultMatcher();

/**
* The CEL expression to be tested. Could be a expression string or a policy/cel file path. This
* should only be used when invoking the runner library directly.
*/
public abstract Optional<CelExpressionSource> celExpression();

/**
* The config file for the CEL test.
*
* <p>The config file is used to provide a custom environment for the CEL test.
*/
public abstract Optional<String> configFile();

/**
* The file descriptor set path for the CEL test.
*
* <p>The file descriptor set path is used to provide proto descriptors for the CEL test.
*/
public abstract Optional<String> fileDescriptorSetPath();

/** Returns a builder for {@link CelTestContext} with the current instance's values. */
public abstract Builder toBuilder();

Expand DownExpand Up@@ -107,6 +127,12 @@ public abstract Builder setCelLateFunctionBindings(

public abstract Builder setResultMatcher(ResultMatcher resultMatcher);

public abstract Builder setCelExpression(CelExpressionSource celExpression);

public abstract Builder setConfigFile(String configFile);

public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);

public abstract CelTestContext build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ private TestSuite parseTestSuite(String textProto) throws IOException {
TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
ExtensionRegistry extensionRegistry = ExtensionRegistry.getEmptyRegistry();
if (fileDescriptorSetPath != null) {
extensionRegistry = RegistryUtils.getExtensionRegistry();
typeRegistry = RegistryUtils.getTypeRegistry();
extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
}
TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
TestSuite.Builder builder = TestSuite.newBuilder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,38 @@ public CelUserTestTemplate(CelTestContext celTestContext) {

@Test
public void test() throws Exception {
TestRunnerLibrary.runTest(testCase, celTestContext);
TestRunnerLibrary.runTest(testCase, updateCelTestContext(celTestContext));
}

/**
* Updates the CEL test context based on the system properties.
*
* <p>This method is used to update the CEL test context based on the system properties. It checks
* if the runner library is triggered via blaze macro or via JUnit and assigns values accordingly.
*
* @param celTestContext The CEL test context to update.
* @return The updated CEL test context.
*/
private CelTestContext updateCelTestContext(CelTestContext celTestContext) {
String celExpr = System.getProperty("cel_expr");
String configPath = System.getProperty("config_path");
String fileDescriptorSetPath = System.getProperty("file_descriptor_set_path");
String isRawExpr = System.getProperty("is_raw_expr");

CelTestContext.Builder celTestContextBuilder = celTestContext.toBuilder();
if (celExpr != null) {
if (isRawExpr.equals("True")) {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromRawExpr(celExpr));
} else {
celTestContextBuilder.setCelExpression(CelExpressionSource.fromSource(celExpr));
}
}
if (configPath != null) {
celTestContextBuilder.setConfigFile(configPath);
}
if (fileDescriptorSetPath != null) {
celTestContextBuilder.setFileDescriptorSetPath(fileDescriptorSetPath);
}
return celTestContextBuilder.build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,9 @@ private static void assertExprValue(ExprValue exprValue, ExprValue expectedExprV
assertThat(exprValue)
.ignoringRepeatedFieldOrderOfFieldDescriptors(
MapValue.getDescriptor().findFieldByName("entries"))
.unpackingAnyUsing(RegistryUtils.getTypeRegistry(), RegistryUtils.getExtensionRegistry())
.unpackingAnyUsing(
RegistryUtils.getTypeRegistry(fileDescriptorSetPath),
RegistryUtils.getExtensionRegistry(fileDescriptorSetPath))
.isEqualTo(expectedExprValue);
} else {
assertThat(exprValue)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,17 +27,18 @@
public final class RegistryUtils {

/** Returns the {@link TypeRegistry} for the given file descriptor set. */
public static TypeRegistry getTypeRegistry() throws IOException {
public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
return TypeRegistry.newBuilder()
.add(getAllDescriptorsFromJvm().messageTypeDescriptors())
.add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
.build();
}

/** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
public static ExtensionRegistry getExtensionRegistry() throws IOException {
public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
throws IOException {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();

getAllDescriptorsFromJvm()
getAllDescriptorsFromJvm(fileDescriptorSetPath)
.extensionDescriptors()
.forEach(
(descriptorName, descriptor) -> {
Expand Down
Loading