fix junit tests to not depend on sequence

Author: Lubos Kosco

test/org/opensolaris/opengrok/history/HistoryGuruTest.java

@@ -18,8 +18,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -46,7 +45,7 @@
 public class HistoryGuruTest {
 
     private static TestRepository repository = new TestRepository();
-    private static List<File> files = new ArrayList<File>();
+    private static List<File> files = new ArrayList<>();
 
     public HistoryGuruTest() {
     }
@@ -59,6 +58,19 @@ public static void setUpClass() throws Exception {
         FileUtilities.getAllFiles(new File(repository.getSourceRoot()),
             files, true);
         RuntimeEnvironment.getInstance().setVerbose(true);
+        
+        HistoryGuru instance = HistoryGuru.getInstance();
+        instance.addRepositories(repository.getSourceRoot());
+                
+        instance.createCache();
+        Collection<String> repos = new ArrayList<>();
+        repos.add("git");
+        repos.add("bazaar");
+        repos.add("mercurial");
+        repos.add("teamware");
+        repos.add("rcs_test");
+        repos.add("nonexistent");
+        instance.createCache(repos);
     }
 
     @AfterClass
@@ -79,26 +91,6 @@ public void testGetInstance() {
         assertNotNull(HistoryGuru.getInstance());
     }
 
-    @Test
-    public void testAddRepositories() throws IOException {
-        HistoryGuru instance = HistoryGuru.getInstance();
-        instance.addRepositories(repository.getSourceRoot());
-    }
-
-    @Test
-    public void testCreateCache() {
-        HistoryGuru instance = HistoryGuru.getInstance();
-        instance.createCache();
-        Collection<String> repos = new ArrayList<String>();
-        repos.add("git");
-        repos.add("bazaar");
-        repos.add("mercurial");
-        repos.add("teamware");
-        repos.add("rcs_test");
-        repos.add("nonexistent");
-        instance.createCache(repos);
-    }
-
     @Test
     public void testUpdateRepositories() {
         HistoryGuru instance = HistoryGuru.getInstance();

test/org/opensolaris/opengrok/web/EftarFileTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.web;
 
@@ -65,6 +65,13 @@ public static void setUpClass() throws Exception {
         } finally {
             try { out.close(); } catch (Exception e) { }
         }
+        //create eftar files
+        String[] args = new String[2];
+        args[0] = tsv.getAbsolutePath();
+        args[1] = eftar.getAbsolutePath();
+
+        EftarFile ef = new EftarFile();
+        ef.create(args);
     }
 
     @AfterClass
@@ -86,21 +93,6 @@ public void setUp() throws Exception {
     public void tearDown() throws Exception {
     }
 
-    /**
-     * Test creation of an EftarFile
-     * @throws java.lang.Exception if an error occurs while creating the
-     *                             eftar file
-     */
-    @Test
-    public void createEftarFile() throws Exception {
-        String[] args = new String[2];
-        args[0] = tsv.getAbsolutePath();
-        args[1] = eftar.getAbsolutePath();
-
-        EftarFile ef = new EftarFile();
-        ef.create(args);
-    }
-
     /**
      * Test usage of an EftarFile
      * @throws IOException if an error occurs while accessing the eftar file