diff options
author | 2017-12-18 13:24:11 -0800 | |
---|---|---|
committer | 2017-12-18 13:26:27 -0800 | |
commit | cdbaef24f47f859d8fd431a7844b08ed4e9d8461 (patch) | |
tree | 326e0975583f8dbb3e43dbcee5f5461014fa4fe6 /src | |
parent | ba14f67679235af1f261b422a8a0098dabe027f8 (diff) |
Make ObjectCodecTester more convenient
Add a safe varargs annotation. Use more precise type signature for ObjectCodecTester#verifyDeserialized and AbstractObjectCodecTest#verifyDeserialization.
RELNOTES: None
PiperOrigin-RevId: 179460437
Diffstat (limited to 'src')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java index 08f675c5dd..6be8562d4f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java @@ -86,7 +86,7 @@ public abstract class AbstractObjectCodecTest<T> { return TestUtils.toBytes(underTest, subject); } - protected void verifyDeserialization(Object deserialized, T subject) { + protected void verifyDeserialization(T deserialized, T subject) { assertThat(deserialized).isEqualTo(subject); } } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java index baa1f280d3..3251364461 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java @@ -37,7 +37,7 @@ public class ObjectCodecTester<T> { * * @throws Exception on verification failure */ - void verifyDeserialized(T original, Object deserialized) throws Exception; + void verifyDeserialized(T original, T deserialized) throws Exception; } /** @@ -77,7 +77,7 @@ public class ObjectCodecTester<T> { void testSerializeDeserialize() throws Exception { for (T subject : subjects) { byte[] serialized = toBytes(subject); - Object deserialized = fromBytes(serialized); + T deserialized = fromBytes(serialized); verificationFunction.verifyDeserialized(subject, deserialized); } } @@ -123,7 +123,8 @@ public class ObjectCodecTester<T> { } /** Add subjects to be tested for serialization/deserialization. */ - public Builder<T> addSubjects(@SuppressWarnings("unchecked") T... subjects) { + @SafeVarargs + public final Builder<T> addSubjects(@SuppressWarnings("unchecked") T... subjects) { return addSubjects(ImmutableList.copyOf(subjects)); } diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java index f459808bbe..cc71bee36a 100644 --- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java +++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java @@ -59,12 +59,11 @@ public class NestedSetCodecTest { .buildAndRunTests(); } - @SuppressWarnings("unchecked") - private static void verifyDeserialization(NestedSet<String> subject, Object deserialized) { - NestedSet<String> other = (NestedSet<String>) deserialized; - assertThat(subject.getOrder()).isEqualTo(other.getOrder()); - assertThat(subject.toSet()).isEqualTo(other.toSet()); - verifyStructure(subject.rawChildren(), other.rawChildren()); + private static void verifyDeserialization( + NestedSet<String> subject, NestedSet<String> deserialized) { + assertThat(subject.getOrder()).isEqualTo(deserialized.getOrder()); + assertThat(subject.toSet()).isEqualTo(deserialized.toSet()); + verifyStructure(subject.rawChildren(), deserialized.rawChildren()); } private static void verifyStructure(Object lhs, Object rhs) { |