2 files changed, 89 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index ae04d46f4c..b5305a2b93 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -184,8 +184,11 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/clock",
         "//src/main/java/com/google/devtools/build/lib/collect",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+        "//src/main/java/com/google/devtools/build/lib/collect/nestedset:serialization",
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/shell",
+        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
+        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
         "//src/main/java/com/google/devtools/common/options",
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
new file mode 100644
index 0000000000..b0f4f8e13a
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java
@@ -0,0 +1,86 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.collect.nestedset;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.lib.skyframe.serialization.strings.StringCodecs;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link NestedSetCodec}. */
+@RunWith(JUnit4.class)
+public class NestedSetCodecTest {
+
+  private static final NestedSet<String> SHARED_NESTED_SET =
+      NestedSetBuilder.<String>stableOrder().add("e").build();
+
+  @Test
+  public void testCodec() throws Exception {
+    ImmutableList<NestedSet<String>> subjects =
+        ImmutableList.of(
+            NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+            NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
+            NestedSetBuilder.create(Order.STABLE_ORDER, "a"),
+            NestedSetBuilder.create(Order.STABLE_ORDER, "a", "b", "c"),
+            NestedSetBuilder.<String>stableOrder()
+                .add("a")
+                .add("b")
+                .addTransitive(
+                    NestedSetBuilder.<String>stableOrder()
+                        .add("c")
+                        .addTransitive(SHARED_NESTED_SET)
+                        .build())
+                .addTransitive(
+                    NestedSetBuilder.<String>stableOrder()
+                        .add("d")
+                        .addTransitive(SHARED_NESTED_SET)
+                        .build())
+                .addTransitive(NestedSetBuilder.emptySet(Order.STABLE_ORDER))
+                .build());
+
+    ObjectCodecTester.newBuilder(new NestedSetCodec<>(StringCodecs.simple()))
+        .addSubjects(subjects)
+        .verificationFunction(NestedSetCodecTest::verifyDeserialization)
+        .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.children, other.children);
+  }
+
+  private static void verifyStructure(Object lhs, Object rhs) {
+    if (lhs == NestedSet.EMPTY_CHILDREN) {
+      assertThat(rhs).isSameAs(NestedSet.EMPTY_CHILDREN);
+    } else if (lhs instanceof Object[]) {
+      assertThat(rhs).isInstanceOf(Object[].class);
+      Object[] lhsArray = (Object[]) lhs;
+      Object[] rhsArray = (Object[]) rhs;
+      int n = lhsArray.length;
+      assertThat(rhsArray).hasLength(n);
+      for (int i = 0; i < n; ++i) {
+        verifyStructure(lhsArray[i], rhsArray[i]);
+      }
+    } else {
+      assertThat(lhs).isEqualTo(rhs);
+    }
+  }
+}