From 8cb1dc05f8d00486a39aa0f629c4ac9e378b70d4 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Sun, 23 Jun 2013 14:42:05 -0400 Subject: [PATCH] Really restore Java 6 compatibilty --- .../tests/expr/functions/FunctionTests.java | 8 +++--- .../google/refine/tests/model/CacheTests.java | 8 +++--- .../google/refine/tests/util/TestUtils.java | 25 +++++++++++++++++++ 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 main/tests/server/src/com/google/refine/tests/util/TestUtils.java diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java index 7576ad02f..3811f8d4a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java +++ b/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java @@ -60,8 +60,7 @@ import com.google.refine.model.ModelException; import com.google.refine.model.Project; import com.google.refine.model.Row; import com.google.refine.tests.RefineTest; -//import java.nio.file.Files; -//import java.nio.file.Path; +import com.google.refine.tests.util.TestUtils; public class FunctionTests extends RefineTest { @@ -83,9 +82,7 @@ public class FunctionTests extends RefineTest { public void SetUp() throws IOException, ModelException { bindings = new Properties(); - File dir = File.createTempFile("openrefine-test-workspace-dir", ""); - dir.delete(); - dir.mkdir(); + File dir = TestUtils.createTempDirectory("openrefine-test-workspace-dir"); FileProjectManager.initialize(dir); project = new Project(); ProjectMetadata pm = new ProjectMetadata(); @@ -108,6 +105,7 @@ public class FunctionTests extends RefineTest { } } + @AfterMethod public void TearDown() { bindings = null; diff --git a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java b/main/tests/server/src/com/google/refine/tests/model/CacheTests.java index 639b471ac..3c3f1c33c 100644 --- a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java +++ b/main/tests/server/src/com/google/refine/tests/model/CacheTests.java @@ -35,9 +35,8 @@ package com.google.refine.tests.model; import static org.mockito.Mockito.mock; +import java.io.File; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.Properties; import org.json.JSONException; @@ -64,6 +63,7 @@ import com.google.refine.model.Row; import com.google.refine.operations.EngineDependentOperation; import com.google.refine.operations.row.RowRemovalOperation; import com.google.refine.tests.RefineTest; +import com.google.refine.tests.util.TestUtils; public class CacheTests extends RefineTest { @@ -92,8 +92,8 @@ public class CacheTests extends RefineTest { @BeforeMethod public void SetUp() throws JSONException, IOException, ModelException { - Path dir = Files.createTempDirectory("openrefine-test-workspace-dir"); - FileProjectManager.initialize(dir.toFile()); + File dir = TestUtils.createTempDirectory("openrefine-test-workspace-dir"); + FileProjectManager.initialize(dir); project = new Project(); ProjectMetadata pm = new ProjectMetadata(); pm.setName("TNG Test Project"); diff --git a/main/tests/server/src/com/google/refine/tests/util/TestUtils.java b/main/tests/server/src/com/google/refine/tests/util/TestUtils.java new file mode 100644 index 000000000..d19a10beb --- /dev/null +++ b/main/tests/server/src/com/google/refine/tests/util/TestUtils.java @@ -0,0 +1,25 @@ +package com.google.refine.tests.util; + +import java.io.File; +import java.io.IOException; + + +public class TestUtils { + + /** + * Create a temporary directory. NOTE: This is a quick and dirty + * implementation suitable for tests, not production code. + * + * @param name + * @return + * @throws IOException + */ + public static File createTempDirectory(String name) + throws IOException { + File dir = File.createTempFile(name, ""); + dir.delete(); + dir.mkdir(); + return dir; + } + +}