Automatic merge from branch-4.5

* origin/branch-4.5:
  SONAR-4898 add missing tests
  SONAR-4898 add missing tests
  Use correct temp dir for Ruby on Rails app
  Fail server startup if can not connect to DB

2 files changed, 8 insertions, 12 deletions

diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 547bff09e2d..b054c0bd128 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -154,18 +154,8 @@
 
     <!-- unit tests -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-assert</artifactId>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java
index 11bcb2f5631..49a66bc590c 100644
--- a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java
@@ -21,6 +21,7 @@ package org.sonar.application;
 
 import org.junit.Test;
 import org.sonar.process.Props;
+import org.sonar.test.TestUtils;
 
 import java.util.Properties;
 
@@ -56,4 +57,9 @@ public class DefaultSettingsTest {
     DefaultSettings.init(props);
     assertThat(props.valueAsInt("sonar.search.port")).isGreaterThan(0);
   }
+
+  @Test
+  public void private_constructor() throws Exception {
+    TestUtils.assertPrivateConstructor(DefaultSettings.class);
+  }
 }