Merge pull request #105 from sharwell/fix-103

Unique test folders
antlr · Feb 20, 2015 · ce9f65b · ce9f65b
2 parents 16c85ad + e0def14
commit ce9f65b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -297,6 +297,9 @@ There are currently about 600 StringTemplate source downloads a month.
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.17</version>
                 <configuration>
+                    <systemProperties>
+                        <java.io.tmpdir>${project.build.directory}/test-output/</java.io.tmpdir>
+                    </systemProperties>
                     <additionalClasspathElements>
                         <additionalClasspathElement>${basedir}/src</additionalClasspathElement>
                     </additionalClasspathElements>

diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java
@@ -49,10 +49,11 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public abstract class BaseTest {
 	public static final String pathSep = System.getProperty("path.separator");
-    public static final String tmpdir = System.getProperty("java.io.tmpdir");
 	public static final boolean interactive = Boolean.parseBoolean(System.getProperty("test.interactive"));
     public static final String newline = Misc.newline;
 
+	public String tmpdir = null;
+
 	/**
 	 * When runnning from Maven, the junit tests are run via the surefire plugin. It sets the
 	 * classpath for the test environment into the following property. We need to pick this up
@@ -105,6 +106,10 @@ public String toString() {
     public void setUp() {
         STGroup.defaultGroup = new STGroup();
         Compiler.subtemplateCount = 0;
+
+        String baseTestDirectory = System.getProperty("java.io.tmpdir");
+        String testDirectory = getClass().getSimpleName() + "-" + System.currentTimeMillis();
+        tmpdir = new File(baseTestDirectory, testDirectory).getAbsolutePath();
     }
 
     /**
@@ -340,12 +345,11 @@ public boolean equals(Object o) {
         }
 	}
 
-    public static String getRandomDir() {
-        String randomDir = tmpdir+"dir"+String.valueOf((int)(Math.random()*100000));
-        File f = new File(randomDir);
-        f.mkdirs();
-        return randomDir;
-    }
+	public String getRandomDir() {
+		File randomDir = new File(tmpdir, "dir" + String.valueOf((int)(Math.random() * 100000)));
+		randomDir.mkdirs();
+		return randomDir.getAbsolutePath();
+	}
 
 	/**
 	 * Removes the specified file or directory, and all subdirectories.

diff --git a/test/org/stringtemplate/v4/test/TestCompiler.java b/test/org/stringtemplate/v4/test/TestCompiler.java
@@ -65,9 +65,6 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import static org.junit.Assert.assertEquals;
 
 public class TestCompiler extends BaseTest {
-    @Before
-	@Override
-    public void setUp() { org.stringtemplate.v4.compiler.Compiler.subtemplateCount = 0; }
 
     @Test public void testAttr() throws Exception {
         String template = "hi <name>";

diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java b/test/org/stringtemplate/v4/test/TestRenderers.java
@@ -42,6 +42,7 @@ public class TestRenderers extends BaseTest {
 	@Before
 	@Override
 	public void setUp() {
+		super.setUp();
 		origLocale = Locale.getDefault();
 		Locale.setDefault(Locale.US);
 	}