Changeset 5099

Timestamp:

04/30/14 08:16:55 (10 years ago)

Author:

Twan Goosen

Message:

Using TemporaryFolder? rule in importer tests

File:

• vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) (5 diffs)

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

@@ -9 +9 @@
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 public abstract class ImporterTestcase {
@@ -14 +16 @@
     private final VloConfigFactory configFactory = new DefaultVloConfigFactory();
     protected VloConfig config;
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
     private File testDir;
 
@@ -24 +29 @@
     @After
     public void cleanup() {
-        FileUtils.deleteQuietly(testDir);
         MetadataImporter.config = null;
     }
@@ -30 +34 @@
     @Before
     public void setup() throws Exception {
-        final String baseTempPath = System.getProperty("java.io.tmpdir");
-        testDir = new File(baseTempPath + File.separator + "testRegistry_" + System.currentTimeMillis());
-        testDir.mkdir();
-        testDir.deleteOnExit();
+        testDir = folder.newFolder(String.format("vlo_%s_%d", getClass().getCanonicalName(), System.currentTimeMillis()));
 
         // read the configuration defined in the packaged configuration file
@@ -40 +41 @@
         // optionally, modify the configuration here
         MetadataImporter.config.setComponentRegistryRESTURL("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/");
-        config = MetadataImporter.config;        
+        config = MetadataImporter.config;
     }