diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
4 files changed, 26 insertions, 23 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java index d5174c53ba..eb62a85133 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.skyframe.serialization.testutils.FsUtils; -import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester; +import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; @@ -32,8 +32,7 @@ public class GlobDescriptorTest { @Test public void testSerialization() throws Exception { - ObjectCodecTester.newBuilder(GlobDescriptor.CODEC) - .addSubjects( + new SerializationTester( GlobDescriptor.create( PackageIdentifier.create("@foo", PathFragment.create("//bar")), Root.fromPath(FsUtils.TEST_FILESYSTEM.getPath("/packageRoot")), @@ -47,8 +46,12 @@ public class GlobDescriptorTest { "pattern", /*excludeDirs=*/ true)) .addDependency(FileSystem.class, FsUtils.TEST_FILESYSTEM) - .verificationFunction((orig, deserialized) -> assertThat(deserialized).isSameAs(orig)) - .buildAndRunTests(); + .setVerificationFunction(GlobDescriptorTest::verifyEquivalent) + .runTests(); + } + + private static void verifyEquivalent(GlobDescriptor orig, GlobDescriptor deserialized) { + assertThat(deserialized).isSameAs(orig); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java index b15782c030..a7b460261d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java @@ -50,7 +50,7 @@ import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.events.StoredEventHandler; -import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester; +import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.vfs.FileStatus; import com.google.devtools.build.lib.vfs.FileSystem; @@ -115,10 +115,9 @@ public class TreeArtifactBuildTest extends TimestampBuilderTestCase { @Test public void testCodec() throws Exception { - ObjectCodecTester.newBuilder(Artifact.CODEC) - .addSubjects(outOne, outOneFileOne) + new SerializationTester(outOne, outOneFileOne) .addDependency(FileSystem.class, scratch.getFileSystem()) - .buildAndRunTests(); + .runTests(); } /** Simple smoke test. If this isn't passing, something is very wrong... */ 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 b2a2d49619..745ad95edc 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 @@ -15,17 +15,17 @@ package com.google.devtools.build.lib.skyframe.serialization; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.cmdline.LabelCodec; -import com.google.devtools.build.lib.cmdline.LabelSyntaxException; -import com.google.devtools.build.lib.skyframe.serialization.testutils.AbstractObjectCodecTest; +import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** Basic tests for {@link LabelCodec}. */ +/** Basic tests for {@link Label}'s codec. */ @RunWith(JUnit4.class) -public class LabelCodecTest extends AbstractObjectCodecTest<Label> { +public class LabelCodecTest { - public LabelCodecTest() throws LabelSyntaxException { - super(new LabelCodec(), Label.parseAbsolute("//foo/bar:baz")); + @Test + public void testCodec() throws Exception { + new SerializationTester(Label.parseAbsolute("//foo/bar:baz")).runTests(); } } 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 a9c9ff7449..7556177cf3 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 @@ -15,18 +15,19 @@ package com.google.devtools.build.lib.skyframe.serialization; import com.google.devtools.build.lib.cmdline.PackageIdentifier; -import com.google.devtools.build.lib.cmdline.PackageIdentifierCodec; -import com.google.devtools.build.lib.skyframe.serialization.testutils.AbstractObjectCodecTest; +import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; import com.google.devtools.build.lib.vfs.PathFragment; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** Basic tests for {@link PackageIdentifierCodec}. */ +/** Basic tests for {@link PackageIdentifier}'s codec. */ @RunWith(JUnit4.class) -public class PackageIdentifierCodecTest extends AbstractObjectCodecTest<PackageIdentifier> { +public class PackageIdentifierCodecTest { - public PackageIdentifierCodecTest() throws Exception { - super( - new PackageIdentifierCodec(), PackageIdentifier.create("@foo", PathFragment.create("bar"))); + @Test + public void testCodec() throws Exception { + new SerializationTester(PackageIdentifier.create("@foo", PathFragment.create("bar"))) + .runTests(); } } |