Remove redundant createTemporaryDirectory method from FileUtilities

Author: ahornace

test/org/opensolaris/opengrok/configuration/RuntimeEnvironmentTest.java

@@ -18,7 +18,7 @@
  */
 
  /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.configuration;
@@ -32,7 +32,7 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -43,7 +43,6 @@
 import java.util.regex.PatternSyntaxException;
 import org.apache.tools.ant.filters.StringInputStream;
 import org.json.simple.parser.ParseException;
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -65,7 +64,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.opensolaris.opengrok.util.FileUtilities;
 import org.opensolaris.opengrok.util.ForbiddenSymlinkException;
 import org.opensolaris.opengrok.util.IOUtils;
 
@@ -97,16 +95,12 @@ public static void tearDownClass() throws Exception {
     }
 
     @Before
-    public void setUp() throws IOException {
+    public void setUp() {
         // Create a default configuration
         Configuration config = new Configuration();
         RuntimeEnvironment.getInstance().setConfiguration(config);
     }
 
-    @After
-    public void tearDown() throws IOException {
-    }
-
     @Test
     public void testDataRoot() throws IOException {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
@@ -160,7 +154,7 @@ public void testProjects() throws IOException {
     }
 
     @Test
-    public void testGroups() throws IOException {
+    public void testGroups() {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
         assertFalse(instance.hasGroups());
         assertNotNull(instance.getGroups());
@@ -178,18 +172,14 @@ public void testGroups() throws IOException {
     }
 
     @Test
-    public void testRegister() throws InterruptedException, IOException {
+    public void testRegister() throws InterruptedException {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
         String path = "/tmp/dataroot";
         instance.setDataRoot(path);
         instance.register();
-        Thread t = new Thread(new Runnable() {
-
-            public void run() {
-                Configuration c = new Configuration();
-                RuntimeEnvironment.getInstance().setConfiguration(c);
-
-            }
+        Thread t = new Thread(() -> {
+            Configuration c = new Configuration();
+            RuntimeEnvironment.getInstance().setConfiguration(c);
         });
         t.start();
         t.join();
@@ -232,17 +222,17 @@ public void testHistoryReaderTimeLimit() {
     @Test
     public void testFetchHistoryWhenNotInCache() {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
-        assertEquals(true, instance.isFetchHistoryWhenNotInCache());
+        assertTrue(instance.isFetchHistoryWhenNotInCache());
         instance.setFetchHistoryWhenNotInCache(false);
-        assertEquals(false, instance.isFetchHistoryWhenNotInCache());
+        assertFalse(instance.isFetchHistoryWhenNotInCache());
     }
 
     @Test
     public void testUseHistoryCache() {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
-        assertEquals(true, instance.useHistoryCache());
+        assertTrue(instance.useHistoryCache());
         instance.setUseHistoryCache(false);
-        assertEquals(false, instance.useHistoryCache());
+        assertFalse(instance.useHistoryCache());
     }
 
     @Test
@@ -1052,13 +1042,13 @@ public void testSaveStatistics() throws IOException {
     }
 
     @Test(expected = IOException.class)
-    public void testSaveNullStatistics() throws IOException, ParseException {
+    public void testSaveNullStatistics() throws IOException {
         RuntimeEnvironment.getInstance().getConfiguration().setStatisticsFilePath(null);
         RuntimeEnvironment.getInstance().saveStatistics();
     }
 
     @Test(expected = IOException.class)
-    public void testSaveNullStatisticsFile() throws IOException, ParseException {
+    public void testSaveNullStatisticsFile() throws IOException {
         RuntimeEnvironment.getInstance().saveStatistics((File) null);
     }
 
@@ -1085,7 +1075,7 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
         // Create and set source root.
-        File sourceRoot = FileUtilities.createTemporaryDirectory("src");
+        File sourceRoot = Files.createTempDirectory("src").toFile();
         assertTrue(sourceRoot.exists());
         assertTrue(sourceRoot.isDirectory());
         env.setSourceRoot(sourceRoot.getPath());
@@ -1100,11 +1090,9 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
 
         // Create symlink underneath source root.
         String symlinkName = "symlink";
-        File realDir = FileUtilities.createTemporaryDirectory("realdir");
+        Path realDir = Files.createTempDirectory("realdir");
         File symlink = new File(sourceRoot, symlinkName);
-        Files.createSymbolicLink(
-                Paths.get(symlink.getPath()),
-                Paths.get(realDir.getPath()));
+        Files.createSymbolicLink(symlink.toPath(), realDir);
         assertTrue(symlink.exists());
         env.setAllowedSymlinks(new HashSet<>());
         ForbiddenSymlinkException expex = null;
@@ -1113,8 +1101,8 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
         } catch (ForbiddenSymlinkException e) {
             expex = e;
         }
-        assertTrue("getPathRelativeToSourceRoot() should have thrown " +
-            "IOexception for symlink that is not allowed", expex != null);
+        assertNotNull("getPathRelativeToSourceRoot() should have thrown " +
+                "IOexception for symlink that is not allowed", expex);
 
         // Allow the symlink and retest.
         env.setAllowedSymlinks(new HashSet<>(Arrays.asList(symlink.getPath())));
@@ -1123,6 +1111,6 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
 
         // cleanup
         IOUtils.removeRecursive(sourceRoot.toPath());
-        IOUtils.removeRecursive(realDir.toPath());
+        IOUtils.removeRecursive(realDir);
     }
 }

test/org/opensolaris/opengrok/index/IgnoredNamesTest.java

@@ -18,25 +18,24 @@
  */
 
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.index;
 
 import java.beans.ExceptionListener;
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
 import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
 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 java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -55,7 +54,8 @@
  * @author Trond Norbye
  */
 public class IgnoredNamesTest {
-    RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+
+    private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
     private static TestRepository repository;
 
     @BeforeClass
@@ -155,27 +155,20 @@ public void testIgnoredPatterns() {
 
     /**
      * Make sure that encoding and decoding IgnoredNames object is 1:1 operation.
-     * @throws FileNotFoundException
-     * @throws IOException 
      */
     @Test
-    public void testEncodeDecode() throws FileNotFoundException, IOException {
+    public void testEncodeDecode() throws IOException {
         IgnoredNames in = new IgnoredNames();
         // Add file and directory to list of ignored items.
         in.add("f:foo.txt");
         in.add("d:bar");
 
         // Create an exception listener to detect errors while encoding and decoding
-        final LinkedList<Exception> exceptions = new LinkedList<Exception>();
-        ExceptionListener listener = new ExceptionListener() {
-            @Override
-            public void exceptionThrown(Exception e) {
-                exceptions.addLast(e);
-            }
-        };
+        final LinkedList<Exception> exceptions = new LinkedList<>();
+        ExceptionListener listener = exceptions::addLast;
 
         // Actually create the file and directory for much better test coverage.
-        File tmpdir = FileUtilities.createTemporaryDirectory("ignoredNames");
+        File tmpdir = Files.createTempDirectory("ignoredNames").toFile();
         File foo = new File(tmpdir, "foo.txt");
         foo.createNewFile();
         assertTrue(foo.isFile());

test/org/opensolaris/opengrok/index/IndexVersionTest.java

@@ -27,7 +27,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import org.junit.After;
 import static org.junit.Assert.assertNotNull;
@@ -55,9 +54,9 @@ public class IndexVersionTest {
     @Rule
     public ConditionalRunRule rule = new ConditionalRunRule();
 
-    TestRepository repository;
-    RuntimeEnvironment env = RuntimeEnvironment.getInstance();
-    private File oldIndexDataDir;
+    private TestRepository repository;
+    private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+    private Path oldIndexDataDir;
 
     @BeforeClass
     public static void setUpClass() {
@@ -78,7 +77,7 @@ public void tearDown() throws IOException {
         repository.destroy();
 
         if (oldIndexDataDir != null) {
-            IOUtils.removeRecursive(Paths.get(oldIndexDataDir.getPath()));
+            IOUtils.removeRecursive(oldIndexDataDir);
         }
     }
 
@@ -117,8 +116,8 @@ public void testIndexVersionProjects() throws Exception {
     @Test(expected = IndexVersion.IndexVersionException.class)
     public void testIndexVersionOldIndex() throws Exception {
         Configuration cfg = new Configuration();
-        oldIndexDataDir = FileUtilities.createTemporaryDirectory("data");
-        Path indexPath = Paths.get(oldIndexDataDir.getPath(), "index");
+        oldIndexDataDir = Files.createTempDirectory("data");
+        Path indexPath = oldIndexDataDir.resolve("index");
         Files.createDirectory(indexPath);
         File indexDir = new File(indexPath.toString());
         assertTrue("index directory check", indexDir.isDirectory());
@@ -127,7 +126,7 @@ public void testIndexVersionOldIndex() throws Exception {
         File archive = new File(oldindex.getPath());
         assertTrue("archive exists", archive.isFile());
         FileUtilities.extractArchive(archive, indexDir);
-        cfg.setDataRoot(oldIndexDataDir.getPath());
+        cfg.setDataRoot(oldIndexDataDir.toString());
         cfg.setProjectsEnabled(false);
         IndexVersion.check(cfg);
     }

test/org/opensolaris/opengrok/index/IndexerRepoTest.java

@@ -28,13 +28,16 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
 import org.junit.After;
+
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -51,7 +54,6 @@
 import org.opensolaris.opengrok.history.HistoryGuru;
 import org.opensolaris.opengrok.history.MercurialRepositoryTest;
 import org.opensolaris.opengrok.history.RepositoryInfo;
-import org.opensolaris.opengrok.util.FileUtilities;
 import org.opensolaris.opengrok.util.TestRepository;
 import org.opensolaris.opengrok.util.IOUtils;
 
@@ -66,7 +68,7 @@ public class IndexerRepoTest {
     @Rule
     public ConditionalRunRule rule = new ConditionalRunRule();
 
-    TestRepository repository;
+    private TestRepository repository;
 
     @Before
     public void setUp() throws IOException {
@@ -94,15 +96,12 @@ private void checkNumberOfThreads() {
             if (threads[i] == null || threads[i].getName() == null) {
                 continue;
             }
-            assertEquals(false, threads[i].getName().contains("renamed-handling"));
+            assertFalse(threads[i].getName().contains("renamed-handling"));
         }
     }
 
     /**
      * Test it is possible to disable history per project.
-     * @throws IndexerException
-     * @throws IOException 
-     * @throws org.opensolaris.opengrok.history.HistoryException 
      */
     @ConditionalRun(RepositoryInstalled.MercurialInstalled.class)
     @ConditionalRun(RepositoryInstalled.GitInstalled.class)
@@ -113,9 +112,6 @@ public void testPerProjectHistoryGlobalOn() throws IndexerException, IOException
 
     /**
      * Test it is possible to enable history per project.
-     * @throws IndexerException
-     * @throws IOException 
-     * @throws org.opensolaris.opengrok.history.HistoryException 
      */
     @ConditionalRun(RepositoryInstalled.MercurialInstalled.class)
     @ConditionalRun(RepositoryInstalled.GitInstalled.class)
@@ -128,7 +124,7 @@ private void testPerProjectHistory(boolean globalOn) throws IndexerException, IO
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
         // Make sure we start from scratch.
-        File dataRoot = FileUtilities.createTemporaryDirectory("dataForPerProjectHistoryTest");
+        File dataRoot = Files.createTempDirectory("dataForPerProjectHistoryTest").toFile();
         env.setDataRoot(dataRoot.getName());
         env.setProjectsEnabled(true);
         env.setHistoryEnabled(globalOn);
@@ -185,22 +181,22 @@ public void testSymlinks() throws IndexerException, IOException {
         // Set source root to pristine directory so that there is only one
         // repository to deal with (which makes this faster and easier to write)
         // and clone the mercurial repository outside of the source root.
-        File realSource = FileUtilities.createTemporaryDirectory("real");
-        File sourceRoot = FileUtilities.createTemporaryDirectory("src");
-        MercurialRepositoryTest.runHgCommand(sourceRoot,
+        Path realSource = Files.createTempDirectory("real");
+        Path sourceRoot = Files.createTempDirectory("src");
+        MercurialRepositoryTest.runHgCommand(sourceRoot.toFile(),
                 "clone", repository.getSourceRoot() + File.separator + "mercurial",
-                realSource.getPath());
+                realSource.toString());
 
         // Create symlink from source root to the real repository.
         String symlinkPath = sourceRoot.toString() + File.separator + SYMLINK;
-        Files.createSymbolicLink(Paths.get(symlinkPath), Paths.get(realSource.getPath()));
+        Files.createSymbolicLink(Paths.get(symlinkPath), realSource);
 
         // Use alternative source root.
         env.setSourceRoot(sourceRoot.toString());
         // Need to have history cache enabled in order to perform scan of repositories.
         env.setHistoryEnabled(true);
         // Normally the Indexer would add the symlink automatically.
-        env.setAllowedSymlinks(new HashSet<String>(Arrays.asList(symlinkPath)));
+        env.setAllowedSymlinks(new HashSet<>(Arrays.asList(symlinkPath)));
 
         // Do a rescan of the projects, and only that (we don't care about
         // the other aspects of indexing in this test case).
@@ -234,8 +230,8 @@ public void testSymlinks() throws IndexerException, IOException {
         assertTrue(HistoryGuru.getInstance().hasCacheForFile(fileInRepo));
 
         // cleanup
-        IOUtils.removeRecursive(realSource.toPath());
-        IOUtils.removeRecursive(sourceRoot.toPath());
+        IOUtils.removeRecursive(realSource);
+        IOUtils.removeRecursive(sourceRoot);
     }
 
     /**