Remove BuildIntegrationTestCase base class from LocalDiffAwarenessTest. PiperOrigin-RevId: 917987305 Change-Id: Ia6666e30008b9c118ecd11b049106def30089d08
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index adec054..ffe3b66 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -177,7 +177,7 @@ "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment", "//src/main/java/com/google/devtools/common/options", - "//src/test/java/com/google/devtools/build/lib/buildtool/util", + "//src/test/java/com/google/devtools/build/lib/vfs/util", "//third_party:error_prone_annotations", "//third_party:guava", "//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessTest.java index 4c6f560..e62793c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessTest.java
@@ -20,17 +20,19 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase; import com.google.devtools.build.lib.cmdline.IgnoredSubdirectories; import com.google.devtools.build.lib.skyframe.DiffAwareness.View; import com.google.devtools.build.lib.skyframe.LocalDiffAwareness.SequentialView; import com.google.devtools.build.lib.testing.common.FakeOptions; import com.google.devtools.build.lib.util.OS; +import com.google.devtools.build.lib.vfs.DigestHashFunction; +import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; +import com.google.devtools.build.lib.vfs.util.FileSystems; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsProvider; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -42,13 +44,13 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Integration tests for LocalDiffAwareness. */ @RunWith(JUnit4.class) -public class LocalDiffAwarenessTest extends BuildIntegrationTestCase { +public class LocalDiffAwarenessTest { /** Try this many times to pick up file changes. Inotify needs some nanoseconds of patience. */ private static final int MAX_RETRY_COUNT = 20; @@ -59,16 +61,15 @@ private Path testCaseRoot; private Path testCaseIgnoredDir; - @Rule public TestName name = new TestName(); + @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @Before public final void initializeSettings() throws Exception { LocalDiffAwareness.Factory factory = new LocalDiffAwareness.Factory( ImmutableList.<String>of(), new FsEventsNativeDepsServiceImpl()); - // Make sure all test functions have their own directory to test - testCaseRoot = testRoot.getChild(name.getMethodName()); - testCaseRoot.createDirectoryAndParents(); + FileSystem fileSystem = FileSystems.getNativeFileSystem(DigestHashFunction.SHA256); + testCaseRoot = fileSystem.getPath(tmp.getRoot().getAbsolutePath()); testCaseIgnoredDir = testCaseRoot.getChild("ignored-dir"); testCaseIgnoredDir.createDirectoryAndParents();