commit 8e804ef03fa6871eb7bd4d3a57feff678101e70c
author Googler <jingwen@google.com> Thu Aug 15 05:44:11 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Aug 15 05:45:39 2024 -0700
tree 30a7c3ee326a17cb67aed770e316b5a4afd5ce10
parent d1769e419d467a4db6ba2fdb79a3a239b2533c03

Use @TestParameter for Label/PackageIdentifier shared value codec tests.

PiperOrigin-RevId: 663275268
Change-Id: Ia833a57adc4149ac87441673e54a33a4b9c3ee16

src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
index 8c183ca..a117509 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
@@ -16,24 +16,24 @@
 
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /** Basic tests for {@link Label}'s codec. */
-@RunWith(JUnit4.class)
+@RunWith(TestParameterInjector.class)
 public class LabelCodecTest {
 
   @Test
-  public void testCodec() throws Exception {
-    new SerializationTester(Label.parseCanonical("//foo/bar:baz")).runTests();
+  public void testCodec(@TestParameter boolean useSharedValues) throws Exception {
+    var tester = new SerializationTester(Label.parseCanonical("//foo/bar:baz"));
+
+    if (useSharedValues) {
+      tester.addCodec(Label.valueSharingCodec()).makeMemoizingAndAllowFutureBlocking(true);
+    }
+
+    tester.runTests();
   }
 
-  @Test
-  public void sharedValueCodec_works() throws Exception {
-    new SerializationTester(Label.parseCanonical("//foo/bar:baz"))
-        .addCodec(Label.valueSharingCodec())
-        .makeMemoizingAndAllowFutureBlocking(true)
-        .runTests();
-  }
 }

src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
index cc8a7a2..7d1dfb6 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
@@ -17,25 +17,27 @@
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /** Basic tests for {@link PackageIdentifier}'s codec. */
-@RunWith(JUnit4.class)
+@RunWith(TestParameterInjector.class)
 public class PackageIdentifierCodecTest {
 
   @Test
-  public void testCodec() throws Exception {
-    new SerializationTester(PackageIdentifier.create("foo", PathFragment.create("bar/baz")))
-        .runTests();
+  public void testCodec(@TestParameter boolean useSharedValues) throws Exception {
+    var tester =
+        new SerializationTester(PackageIdentifier.create("foo", PathFragment.create("bar/baz")));
+
+    if (useSharedValues) {
+      tester
+          .addCodec(PackageIdentifier.valueSharingCodec())
+          .makeMemoizingAndAllowFutureBlocking(true);
+    }
+
+    tester.runTests();
   }
 
-  @Test
-  public void sharedValueCodec_works() throws Exception {
-    new SerializationTester(PackageIdentifier.create("foo", PathFragment.create("bar/baz")))
-        .addCodec(PackageIdentifier.valueSharingCodec())
-        .makeMemoizingAndAllowFutureBlocking(true)
-        .runTests();
-  }
 }