commit 1e1a775d58a9e92268b55f83d059d7da924b4cc4
author ulfjack <ulfjack@google.com> Tue Dec 10 21:17:58 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Dec 10 21:18:59 2019 -0800
tree 644d93e3827b8a31f856a667783add1c69aebe7a
parent 4e2b4958d508ef2ed65db7b681c3be5939e7f147

Update actions to use NestedSet for inputs (part 2; tests)

This is in preparation for making NestedSet not implement Iterable. Unfortunately, doing so means that there is no longer a common super-type for NestedSet and Collection, which means that we have to use NestedSet for all action inputs.

PiperOrigin-RevId: 284911679

src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index a823807..3814bff 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -41,6 +41,8 @@
 import com.google.devtools.build.lib.analysis.ServerDirectories;
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.events.NullEventHandler;
 import com.google.devtools.build.lib.packages.WorkspaceFileValue;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -414,12 +416,14 @@
             actionKey1,
                 actionValue(
                     new TestAction(
-                        Runnables.doNothing(), ImmutableSet.<Artifact>of(), ImmutableSet.of(out1))),
+                        Runnables.doNothing(),
+                        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+                        ImmutableSet.of(out1))),
             actionKey2,
                 actionValue(
                     new TestAction(
                         Runnables.doNothing(),
-                        ImmutableSet.<Artifact>of(),
+                        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
                         ImmutableSet.of(out2)))));
     assertThat(driver.evaluate(ImmutableList.<SkyKey>of(), evaluationContext).hasError()).isFalse();
     assertThat(