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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
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
1 change: 0 additions & 1 deletion .bazelrc
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
common --enable_bzlmod
common --enable_workspace
build --java_runtime_version=remotejdk_11
build --java_language_version=11

Expand Down
38 changes: 36 additions & 2 deletions .github/workflows/workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,44 @@ jobs:
- name: Bazel Output Version
run: bazelisk --version
- name: Java 8 Build
run: bazel build ... --java_language_version=8 --java_runtime_version=8
run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
- name: Bazel Test
# Exclude codelab exercises as they are intentionally made to fail
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
# Exclude maven conformance tests. They are only executed when there's version change.
run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven

# -- Start of Maven Conformance Tests (Ran only when there's version changes) --
- name: Get changed file
id: changed_file
uses: tj-actions/changed-files@v44
with:
files: publish/cel_version.bzl
- name: Verify Version Consistency
if: steps.changed_file.outputs.any_changed == 'true'
run: |
CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)

MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)

if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
echo "❌ Error: Could not extract one or both version strings."
exit 1
fi

echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
echo "Version in MODULE.bazel: ${MODULE_VERSION}"

if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
echo "❌ Error: Version mismatch between files!"
exit 1
fi

echo "✅ Versions match."
- name: Run Conformance Maven Test on Version Change
if: steps.changed_file.outputs.any_changed == 'true'
run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
# -- End of Maven Conformance Tests --

- name: Unwanted Dependencies
run: .github/workflows/unwanted_deps.sh
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 17 additions & 6 deletions MODULE.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,16 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(java = True)
Expand All@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

GUAVA_VERSION = "33.4.8"

TRUTH_VERSION = "1.4.4"

# Compile only artifacts
[
maven.artifact(
neverlink = True,
artifact = artifact,
group = group,
neverlink = True,
version = version,
)
for group, artifact, version in [coord.split(":") for coord in [
Expand All@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
"com.google.truth:truth:" + TRUTH_VERSION,

]]
]

Expand All@@ -94,7 +95,6 @@ maven.install(
"https://repo1.maven.org/maven2",
],
)

maven.install(
name = "maven_android",
# keep sorted
Expand All@@ -108,7 +108,18 @@ maven.install(
],
)

use_repo(maven, "maven", "maven_android")
# Conformance test only

maven.install(
name = "maven_conformance",
artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
"https://central.sonatype.com/repository/maven-snapshots/",
],
)
use_repo(maven, "maven", "maven_android", "maven_conformance")

non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
use_repo(non_module_dependencies, "antlr4_jar")
Expand Down
33 changes: 30 additions & 3 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")

package(default_applicable_licenses = [
"//:license",
Expand DownExpand Up@@ -40,6 +40,27 @@ java_library(
],
)

MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]

java_library(
name = "run_maven_jar",
testonly = True,
srcs = glob(["*.java"]),
tags = ["conformance_maven"],
deps = MAVEN_JAR_DEPS + [
"//:java_truth",
"//testing:expr_value_utils",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
],
)

_ALL_TESTS = [
"@cel_spec//tests/simple:testdata/basic.textproto",
"@cel_spec//tests/simple:testdata/bindings_ext.textproto",
Expand DownExpand Up@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [

conformance_test(
name = "conformance",
dashboard = False,
data = _ALL_TESTS,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_maven",
data = _ALL_TESTS,
mode = MODE.MAVEN_TEST,
skip_tests = _TESTS_TO_SKIP,
)

conformance_test(
name = "conformance_dashboard",
dashboard = True,
data = _ALL_TESTS,
mode = MODE.DASHBOARD,
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,20 +61,6 @@ public final class ConformanceTest extends Statement {
.enableQuotedIdentifierSyntax(true)
.build();

private static final CelParser PARSER_WITH_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
.addLibraries(
CelExtensions.bindings(),
CelExtensions.encoders(),
CelExtensions.math(OPTIONS),
CelExtensions.protos(),
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();

private static final CelParser PARSER_WITHOUT_MACROS =
CelParserFactory.standardCelParserBuilder()
.setOptions(OPTIONS)
Expand All@@ -86,11 +72,15 @@ public final class ConformanceTest extends Statement {
CelExtensions.sets(OPTIONS),
CelExtensions.strings(),
CelOptionalLibrary.INSTANCE)
.setStandardMacros()
.build();

private static CelParser getParser(SimpleTest test) {
return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
return test.getDisableMacros()
? PARSER_WITHOUT_MACROS
: PARSER_WITHOUT_MACROS
.toParserBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.build();
}

private static CelChecker getChecker(SimpleTest test) throws Exception {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
return args

def conformance_test(name, data, dashboard, skip_tests = []):
if dashboard:
MODE = struct(
# Standard test execution against HEAD
TEST = "test",
# Executes conformance test against published jar in maven central
MAVEN_TEST = "maven_test",
# Dashboard mode
DASHBOARD = "dashboard",
)

def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
"""Executes conformance tests

Args:
name: unique label for the java_test
data: A list of test data files
mode: An enum that determines the test configuration.
- `MODE.TEST` (default): Runs the conformance tests
- `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
- `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
skip_tests: A list of strings, where each string is the name of a test file to
exclude from the run.
"""
if mode == MODE.DASHBOARD:
java_test(
name = "_" + name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)

native.sh_test(
name = name,
size = "small",
Expand All@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
"notap",
],
)
else:
elif mode == MODE.TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
Expand All@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
test_class = "dev.cel.conformance.ConformanceTests",
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
)
elif mode == MODE.MAVEN_TEST:
java_test(
name = name,
jvm_flags = _conformance_test_args(data, skip_tests),
data = data,
size = "small",
test_class = "dev.cel.conformance.ConformanceTests",
tags = ["conformance_maven"],
runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
)
else:
fail("Unknown mode specified: %s." % mode)
Loading