[Misc] Improve environment handling during tests

(cherry picked from commit 89d96a55)

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/src/test/java/org/xwiki/test/ui/AllIT.java

@@ -54,6 +54,7 @@ public void preStart(List<XWikiExecutor> executors) throws Exception
         XWikiExecutor executor = executors.get(0);
 
         repositoryUtil = new RepositoryUtils();
+        repositoryUtil.setup();
 
         LOGGER.info("Adding repository to xwiki.properties");
 
@@ -80,6 +81,7 @@ public static void initExtensions(PersistentTestContext context) throws Exceptio
         // This will not be null if we are in the middle of allTests
         if (repositoryUtil == null) {
             repositoryUtil = new RepositoryUtils();
+            repositoryUtil.setup();
         }
 
         // Initialize extensions and repositories

xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/test/MockitoOldcore.java

@@ -77,7 +77,7 @@
 import org.xwiki.script.internal.ScriptExecutionContextInitializer;
 import org.xwiki.security.authorization.AuthorizationManager;
 import org.xwiki.security.authorization.ContextualAuthorizationManager;
-import org.xwiki.test.XWikiTempDirUtil;
+import org.xwiki.test.TestEnvironment;
 import org.xwiki.test.annotation.AllComponents;
 import org.xwiki.test.internal.MockConfigurationSource;
 import org.xwiki.test.mockito.MockitoComponentManager;
@@ -401,7 +401,9 @@ public void before(Class<?> testClass) throws Exception
                 when(servletContextMock.getAttribute("javax.servlet.context.tempdir"))
                     .thenReturn(new File(System.getProperty("java.io.tmpdir")));
 
-                initEnvironmentDirectories();
+                Environment testEnvironment = new TestEnvironment();
+                this.temporaryDirectory = testEnvironment.getTemporaryDirectory();
+                this.permanentDirectory = testEnvironment.getPermanentDirectory();
 
                 servletEnvironment.setTemporaryDirectory(this.temporaryDirectory);
                 servletEnvironment.setPermanentDirectory(this.permanentDirectory);
@@ -1423,25 +1425,16 @@ public MemoryConfigurationSource getMockWikiConfigurationSource()
         return this.wikiConfigurationSource;
     }
 
-    private void initEnvironmentDirectories()
-    {
-        File testDirectory = XWikiTempDirUtil.createTemporaryDirectory();
-
-        this.temporaryDirectory = new File(testDirectory, "temporary");
-        this.permanentDirectory = new File(testDirectory, "permanent-dir");
-    }
-
     /**
      * @since 7.2M2
      */
     public void registerMockEnvironment() throws Exception
     {
-        this.environment = getMocker().registerMockComponent(Environment.class);
-
-        initEnvironmentDirectories();
+        this.environment = new TestEnvironment();
+        getMocker().registerComponent(Environment.class, this.environment);
 
-        when(this.environment.getTemporaryDirectory()).thenReturn(this.temporaryDirectory);
-        when(this.environment.getPermanentDirectory()).thenReturn(this.permanentDirectory);
+        this.temporaryDirectory = this.environment.getTemporaryDirectory();
+        this.permanentDirectory = this.environment.getPermanentDirectory();
     }
 
     public UserPropertiesResolver getMockAllUserPropertiesResolver()

xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/src/test/it/org/xwiki/repository/test/ui/AllIT.java

@@ -54,6 +54,7 @@ public void preStart(List<XWikiExecutor> executors) throws Exception
         XWikiExecutor executor = executors.get(0);
 
         repositoryUtil = new RepositoryUtils();
+        repositoryUtil.setup();
 
         LOGGER.info("Adding maven repository to xwiki.properties");