Migrated tests in devtools/build/lib/vfs to JUnit 4.
--
MOS_MIGRATED_REVID=109081842
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
index abd500d..0ae1a25 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
@@ -35,7 +35,7 @@
Path workingDir;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
FileSystem testFS = FileSystems.initDefaultAsNative();
// Resolve symbolic links in the temp dir:
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index db20108..d335b86 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -60,7 +60,8 @@
protected Path xEmptyDirectory;
@Before
- public void setUp() throws Exception {
+ public final void createDirectories() throws Exception {
+ executeBeforeCreatingDirectories();
testFS = getFreshFileSystem();
workingDir = testFS.getPath(getTestTmpDir());
cleanUpWorkingDirectory(workingDir);
@@ -85,8 +86,13 @@
xEmptyDirectory.createDirectory();
}
+ protected void executeBeforeCreatingDirectories() throws Exception {
+ // This method exists because LazyDigestFileSystemTest requires some code to be run before
+ // createDirectories().
+ }
+
@After
- public void tearDown() throws Exception {
+ public final void destroyFileSystem() throws Exception {
destroyFileSystem(testFS);
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
index 16c38a7..6a1ae45 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.devtools.build.lib.vfs;
-
import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.vfs.FileSystemUtils.appendWithoutExtension;
import static com.google.devtools.build.lib.vfs.FileSystemUtils.commonAncestor;
@@ -68,7 +67,7 @@
private Path workingDir;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
clock = new ManualClock();
fileSystem = new InMemoryFileSystem(clock);
workingDir = fileSystem.getPath("/workingDir");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
index e99895c..1416ca5 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
@@ -56,8 +56,9 @@
private Path tmpPath;
private FileSystem fs;
private Path throwOnReaddir = null;
+
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
fs = new InMemoryFileSystem() {
@Override
public Collection<Dirent> readdir(Path path, boolean followSymlinks) throws IOException {
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
index 61f8c0f..482ef8a 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
@@ -48,7 +48,7 @@
private Path root;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
filesystem = new InMemoryFileSystem(BlazeClock.instance());
root = filesystem.getRootDirectory();
Path first = root.getChild("first");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathWindowsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathWindowsTest.java
index a78eff8..e447d67 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathWindowsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathWindowsTest.java
@@ -33,7 +33,7 @@
private Path root;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
filesystem = new InMemoryFileSystem(BlazeClock.instance());
root = filesystem.getRootDirectory();
Path first = root.getChild("first");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
index ef03d69..acbc2ad 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
@@ -43,7 +43,7 @@
private FileSystem fileSystem;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
fileSystem = new InMemoryFileSystem(BlazeClock.instance());
tmpPath = fileSystem.getPath("/rglobtmp");
for (String dir : ImmutableList.of("foo/bar/wiz",
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RootedPathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RootedPathTest.java
index ccf9432..83a7211 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RootedPathTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RootedPathTest.java
@@ -31,7 +31,7 @@
private Path root;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
filesystem = new InMemoryFileSystem(BlazeClock.instance());
root = filesystem.getRootDirectory();
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/ScopeEscapableFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/ScopeEscapableFileSystemTest.java
index 87c4cce..9d365e8 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/ScopeEscapableFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/ScopeEscapableFileSystemTest.java
@@ -121,11 +121,8 @@
private Path dirLink;
private PathFragment dirLinkTarget;
- @Override
@Before
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void createLinks() throws Exception {
Preconditions.checkState(
testFS instanceof ScopeEscapableFileSystem, "Not ScopeEscapable: %s", testFS);
((ScopeEscapableFileSystem) testFS).enableScopeChecking(false);
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
index f8145e0..9f9480c 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
@@ -14,7 +14,12 @@
package com.google.devtools.build.lib.vfs;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import com.google.devtools.build.lib.vfs.FileSystem.NotASymlinkException;
@@ -38,11 +43,8 @@
protected Path xLinkToDirectory;
protected Path xDanglingLink;
- @Override
@Before
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void createSymbolicLinks() throws Exception {
// % ls -lR
// -rw-rw-r-- xFile
// drwxrwxr-x xNonEmptyDirectory
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathEqualityTest.java b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathEqualityTest.java
index 9421706..fc4b253 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathEqualityTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathEqualityTest.java
@@ -37,7 +37,7 @@
private FileSystem unixFs;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystem() throws Exception {
unixFs = new UnixFileSystem();
otherUnixFs = new UnixFileSystem();
assertTrue(unixFs != otherUnixFs);
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathGetParentTest.java b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathGetParentTest.java
index fa83624..db0cad3 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathGetParentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathGetParentTest.java
@@ -37,14 +37,14 @@
private Path testRoot;
@Before
- public void setUp() throws Exception {
+ public final void createTestRoot() throws Exception {
unixFs = FileSystems.initDefaultAsNative();
testRoot = unixFs.getPath(TestUtils.tmpDir()).getRelative("UnixPathGetParentTest");
FileSystemUtils.createDirectoryAndParents(testRoot);
}
@After
- public void tearDown() throws Exception {
+ public final void deleteTestRoot() throws Exception {
FileSystemUtils.deleteTree(testRoot); // (comment out during debugging)
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathTest.java
index a7db067..cd174c6 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/UnixPathTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/UnixPathTest.java
@@ -57,7 +57,7 @@
}
@Before
- public void setUp() throws Exception {
+ public final void createFiles() throws Exception {
unixFs = getUnixFileSystem();
tmpDir = new File(TestUtils.tmpDir(), "tmpDir");
tmpDir.mkdirs();
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/ZipFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/ZipFileSystemTest.java
index 345b2ba..8ff07bc 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/ZipFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/ZipFileSystemTest.java
@@ -59,7 +59,7 @@
private FileSystem zipFS2;
@Before
- public void setUp() throws Exception {
+ public final void initializeFileSystems() throws Exception {
FileSystem unixFs = FileSystems.initDefaultAsNative();
Path testdataDir = unixFs.getPath(BlazeTestUtils.runfilesDir()).getRelative(
TestConstants.JAVATESTS_ROOT + "/com/google/devtools/build/lib/vfs");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryContentInfoTest.java b/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryContentInfoTest.java
index 5abe996..9a3fd53 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryContentInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryContentInfoTest.java
@@ -29,7 +29,7 @@
private Clock clock;
@Before
- public void setUp() throws Exception {
+ public final void createClock() throws Exception {
clock = BlazeClock.instance();
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/util/FsApparatus.java b/src/test/java/com/google/devtools/build/lib/vfs/util/FsApparatus.java
index 83f5980..101061f 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/util/FsApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/util/FsApparatus.java
@@ -21,8 +21,6 @@
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
-import junit.framework.AssertionFailedError;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -64,7 +62,7 @@
try {
FileSystemUtils.deleteTree(wd);
} catch (IOException e) {
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return new FsApparatus(fs, wd);
