aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/skyframe
diff options
context:
space:
mode:
authorGravatar felly <felly@google.com>2018-01-29 14:49:04 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-01-29 14:50:53 -0800
commit016a42bc5e6368fb34a52394e93058348c4ef1a3 (patch)
tree418f20642a554a312f3c14ec1c7613fa795afeaf /src/test/java/com/google/devtools/build/lib/skyframe
parentac03ccfc4377d4de0385ef05702289c9fa285d69 (diff)
Remove unused "pattern" feature in RecursiveFilesystemTraversalFunction.
PiperOrigin-RevId: 183731563
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index 1368b54ebb..70022558ca 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -68,7 +68,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Pattern;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -228,12 +227,12 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe
private static TraversalRequest fileLikeRoot(Artifact file, PackageBoundaryMode pkgBoundaryMode) {
return new TraversalRequest(
- rootedPath(file), !file.isSourceArtifact(), pkgBoundaryMode, false, null, null);
+ rootedPath(file), !file.isSourceArtifact(), pkgBoundaryMode, false, null);
}
private static TraversalRequest pkgRoot(
RootedPath pkgDirectory, PackageBoundaryMode pkgBoundaryMode) {
- return new TraversalRequest(pkgDirectory, false, pkgBoundaryMode, true, null, null);
+ return new TraversalRequest(pkgDirectory, false, pkgBoundaryMode, true, null);
}
private <T extends SkyValue> EvaluationResult<T> eval(SkyKey key) throws Exception {
@@ -806,25 +805,6 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe
}
@Test
- public void testRegexp() throws Exception {
- Artifact wantedArtifact = sourceArtifact("foo/bar/baz.txt");
- Artifact unwantedArtifact = sourceArtifact("foo/boo/baztxt.bak");
- RootedPath wantedPath = rootedPath(wantedArtifact);
- createFile(wantedPath, "hello");
- createFile(unwantedArtifact, "nope");
- Artifact pkgDirArtifact = sourceArtifact("foo");
- RootedPath dir = rootedPath(pkgDirArtifact);
- scratch.dir(dir.asPath().getPathString());
-
- TraversalRequest traversalRoot =
- new TraversalRequest(
- dir, false, PackageBoundaryMode.REPORT_ERROR, true, null, Pattern.compile(".*\\.txt"));
-
- ResolvedFile expected = regularFileForTesting(wantedPath);
- traverseAndAssertFiles(traversalRoot, expected);
- }
-
- @Test
public void testGeneratedDirectoryConflictsWithPackage() throws Exception {
Artifact genDir = derivedArtifact("a/b");
createFile(rootedPath(sourceArtifact("a/b/c/file.real")));