[Misc] Improve environment handling during tests

xwiki · Jul 17, 2024 · fbeac77 · fbeac77
1 parent a1f9346
commit fbeac77
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/...n/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/RepositoryUtils.java b/...n/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/RepositoryUtils.java
@@ -24,7 +24,6 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -68,15 +67,14 @@ public class RepositoryUtils
      */
     protected void initializeDirectories(Environment environment)
     {
-        File testDirectory = new File("target/test-" + new Date().getTime()).getAbsoluteFile();
-
         this.extensionDirectory = new File(environment.getPermanentDirectory(), "extension/");
         this.localRepositoryRoot = new File(this.extensionDirectory, "repository/");
 
-        this.mavenRepositoryRoot = new File(testDirectory, "maven/");
-        this.maven2RepositoryRoot = new File(testDirectory, "maven2/");
-        this.mavenUnknownRepositoryRoot = new File(testDirectory, "mavenunknown/");
-        this.remoteRepositoryRoot = new File(testDirectory, "remote/");
+        File repositoriesRootFile = new File(environment.getPermanentDirectory(), "repositories/");
+        this.mavenRepositoryRoot = new File(repositoriesRootFile, "maven/");
+        this.maven2RepositoryRoot = new File(repositoriesRootFile, "maven2/");
+        this.mavenUnknownRepositoryRoot = new File(repositoriesRootFile, "mavenunknown/");
+        this.remoteRepositoryRoot = new File(repositoriesRootFile, "remote/");
 
         Map<String, RepositorySerializer> repositories = new HashMap<>();
         repositories.put(null, new DefaultRepositorySerializer(getRemoteRepository()));