diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/serialization/MultimapCodecTest.java (renamed from src/test/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableMultimapCodecTest.java) | 12 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java | 9 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableMultimapCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/MultimapCodecTest.java index dbcf4aa618..9209c93476 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableMultimapCodecTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/MultimapCodecTest.java @@ -19,21 +19,25 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSetMultimap; +import com.google.common.collect.LinkedHashMultimap; import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester.VerificationFunction; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** Tests for {@link ImmutableMultimapCodec}. */ +/** Tests for {@link MultimapCodec}. */ @RunWith(JUnit4.class) -public class ImmutableMultimapCodecTest { +public class MultimapCodecTest { @Test - public void testImmutableMultimap() throws Exception { + public void testMultimap() throws Exception { + LinkedHashMultimap<String, String> linkedHashMultimap = LinkedHashMultimap.create(); + linkedHashMultimap.put("A", "//foo:B"); new SerializationTester( ImmutableMultimap.of(), ImmutableMultimap.of("A", "//foo:A"), - ImmutableMultimap.builder().putAll("B", "//foo:B1", "//foo:B2").build()) + ImmutableMultimap.builder().putAll("B", "//foo:B1", "//foo:B2").build(), + linkedHashMultimap) .runTests(); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java index 36f93a1265..4976a2869e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java @@ -141,17 +141,17 @@ public class SerializationContextTest { } @Test - public void explicitlyAllowedClassCheck() { + public void explicitlyAllowedClassCheck() throws SerializationException { SerializationContext underTest = new SerializationContext(ObjectCodecRegistry.newBuilder().build(), ImmutableMap.of()) .getMemoizingContext(); underTest.addExplicitlyAllowedClass(String.class); underTest.checkClassExplicitlyAllowed(String.class); assertThrows( - RuntimeException.class, () -> underTest.checkClassExplicitlyAllowed(Integer.class)); + SerializationException.class, () -> underTest.checkClassExplicitlyAllowed(Integer.class)); // Explicitly registered classes do not carry over to a new context. assertThrows( - RuntimeException.class, + SerializationException.class, () -> underTest.getNewMemoizingContext().checkClassExplicitlyAllowed(String.class)); } @@ -159,7 +159,8 @@ public class SerializationContextTest { public void explicitlyAllowedClassCheckFailsIfNotMemoizing() { SerializationContext underTest = new SerializationContext(ObjectCodecRegistry.newBuilder().build(), ImmutableMap.of()); - assertThrows(RuntimeException.class, () -> underTest.addExplicitlyAllowedClass(String.class)); + assertThrows( + SerializationException.class, () -> underTest.addExplicitlyAllowedClass(String.class)); } private static class CodecMemoizing implements ObjectCodec<ImmutableList<Object>> { |