SONAR-4756 Fix side effect (SONAR_HOME not set in webapp tests)

diff --git a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
index 55b9e4beab8ac9af35f88d87bd2c1fccdbc1816c..fb63dff26373ba1ec0dc047ef2e9d563b89d20c0 100644 (file)
--- a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
@@ -24,6 +24,7 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.Valve;
 import org.apache.catalina.startup.Tomcat;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -31,16 +32,26 @@ import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 
+import java.io.File;
 import java.util.Properties;
 
 import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class LoggingTest {
 
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
 
+  @Before
+  public void setHome() {
+    File homeDir = temp.newFolder("home");
+    System.setProperty("SONAR_HOME", homeDir.getAbsolutePath());
+  }
+
   @Test
   public void enable_access_logs_by_Default() throws Exception {
     Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS);

diff --git a/sonar-application/src/test/java/org/sonar/application/WebappTest.java b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
index 19dc03ff94b2ca2fa49ce95a2cc93f6564063489..1c57ed714dc13cf2b1e95f617c6d05161243141f 100644 (file)
--- a/sonar-application/src/test/java/org/sonar/application/WebappTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
@@ -21,6 +21,7 @@ package org.sonar.application;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -30,16 +31,28 @@ import java.util.Properties;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class WebappTest {
 
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
 
+  private Env env;
+
+  @Before
+  public void initEnv() {
+    env = mock(Env.class);
+    File sonarHome = temp.newFolder("home");
+    when(env.rootDir()).thenReturn(sonarHome);
+    System.setProperty("SONAR_HOME", sonarHome.getAbsolutePath());
+  }
+
   @Test
   public void fail_on_error() throws Exception {
-    Env env = mock(Env.class);
     File webDir = temp.newFolder("web");
     when(env.file("web")).thenReturn(webDir);