Move test helper assertIsSubsetOf to `FileSystemValueCheckerInferri…

…ngAncestorsTestBase` PiperOrigin-RevId: 546280755 Change-Id: Ie2c79d34e1f94a003c4caf6d32f79be9a54101cc
bazelbuild · Jul 7, 2023 · 772cdde · 772cdde
1 parent 6ae9503
commit 772cdde
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.../com/google/devtools/build/lib/skyframe/FileSystemValueCheckerInferringAncestorsTest.java b/.../com/google/devtools/build/lib/skyframe/FileSystemValueCheckerInferringAncestorsTest.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.common.truth.Truth8.assertThat;
 import static com.google.devtools.build.lib.actions.FileStateValue.DIRECTORY_FILE_STATE_NODE;
 import static com.google.devtools.build.lib.actions.FileStateValue.NONEXISTENT_FILE_STATE_NODE;
@@ -717,13 +716,6 @@ public void getDiffWithInferredAncestors_statCrashes_fails() throws Exception {
                 skyValueDirtinessChecker));
   }
 
-  private static <T> void assertIsSubsetOf(Iterable<T> list, T... elements) {
-    ImmutableSet<T> set = ImmutableSet.copyOf(elements);
-    assertWithMessage("%s has elements from outside of %s", list, set)
-        .that(set)
-        .containsAtLeastElementsIn(list);
-  }
-
   private Delta fileStateValueDelta(String relativePath) throws IOException {
     return Delta.justNew(fileStateValue(relativePath));
   }

diff --git a/.../google/devtools/build/lib/skyframe/FileSystemValueCheckerInferringAncestorsTestBase.java b/.../google/devtools/build/lib/skyframe/FileSystemValueCheckerInferringAncestorsTestBase.java
@@ -14,10 +14,12 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.FileStateValue;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.vfs.DelegateFileSystem;
@@ -107,4 +109,11 @@ protected FileStateValue fileStateValue(String relativePath) throws IOException
   protected static DirectoryListingStateValue directoryListingStateValue(Dirent... dirents) {
     return DirectoryListingStateValue.create(ImmutableList.copyOf(dirents));
   }
+
+  protected static <T> void assertIsSubsetOf(Iterable<T> list, T... elements) {
+    ImmutableSet<T> set = ImmutableSet.copyOf(elements);
+    assertWithMessage("%s has elements from outside of %s", list, set)
+        .that(set)
+        .containsAtLeastElementsIn(list);
+  }
 }