conformance test updates for jar compat
diff --git a/WORKSPACE b/WORKSPACE
index 56080c4..3b75b72 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -204,6 +204,7 @@
name = "com_google_protobuf_v25.0",
strip_prefix = "protobuf-25.0",
url = "https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz",
+ sha256 = "7beed9c511d632cff7c22ac0094dd7720e550153039d5da7e059bcceb488474a",
)
# Needed as a dependency of @com_google_protobuf_v25.x, which was before
diff --git a/compatibility/BUILD.bazel b/compatibility/BUILD.bazel
index e62cb5b..37a1bf4 100644
--- a/compatibility/BUILD.bazel
+++ b/compatibility/BUILD.bazel
@@ -16,5 +16,28 @@
java_runtime_conformance(
name = "java_conformance_v3.25.0",
gencode_version = "3.25.0",
- tags = ["manual"],
+)
+
+java_test(
+ name = "java_conformance_unittest_v3.25.0_jar",
+ size = "small",
+ test_class = "com.google.protobuf.CompatibilityTest",
+ srcs = ["CompatibilityTest.java"],
+ deps = [
+ ":libconformance_v3.25.0_lib.jar",
+ "//java/core",
+ "@maven//:junit_junit",
+ ],
+)
+
+java_test(
+ name = "java_conformance_unittest_v3.25.0",
+ size = "small",
+ test_class = "com.google.protobuf.CompatibilityTest",
+ srcs = ["CompatibilityTest.java"],
+ deps = [
+ ":conformance_v3.25.0_lib",
+ "//java/core",
+ "@maven//:junit_junit",
+ ],
)
diff --git a/compatibility/CompatibilityTest.java b/compatibility/CompatibilityTest.java
new file mode 100644
index 0000000..364c909
--- /dev/null
+++ b/compatibility/CompatibilityTest.java
@@ -0,0 +1,27 @@
+package com.google.protobuf;
+
+import protobuf_unittest.UnittestProto.Int64ParseTester;
+import protobuf_unittest.UnittestProto.TestAllTypes;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class CompatibilityTest {
+ @Test
+ public void testFoo() throws Exception {
+ final TestAllTypes obj = TestAllTypes.newBuilder().setOptionalInt32(1).build();
+ final byte[] serialized = obj.toByteArray();
+ final TestAllTypes parsed = TestAllTypes.parseFrom(serialized);
+
+ obj.toString();
+ parsed.toString();
+
+ final Int64ParseTester obj2 = Int64ParseTester.newBuilder().setOptionalInt64Hifield(0).build();
+ final byte[] serialized2 = obj2.toByteArray();
+ final Int64ParseTester parsed2 = Int64ParseTester.parseFrom(serialized2);
+ obj2.toString();
+ parsed2.toString();
+ }
+}
diff --git a/compatibility/runtime_conformance.bzl b/compatibility/runtime_conformance.bzl
index 7f1d416..501c007 100644
--- a/compatibility/runtime_conformance.bzl
+++ b/compatibility/runtime_conformance.bzl
@@ -16,9 +16,11 @@
if gencode_version == "main":
protoc = "//:protoc"
+ runtime = "//java/core"
else:
minor = gencode_version[gencode_version.find(".") + 1:]
protoc = Label("@com_google_protobuf_v%s//:protoc" % minor)
+ runtime = "@com_google_protobuf_v%s//java/core" % minor
gencode = [
"v%s/protobuf_unittest/UnittestProto.java" % gencode_version,
@@ -42,7 +44,7 @@
native.java_library(
name = conformance_lib_name,
srcs = gencode,
- deps = ["//java/core"],
+ deps = [runtime],
tags = tags,
)
