Merge branch 'master' into SONAR-5529

4 files changed, 14 insertions, 8 deletions

diff --git a/server/process/pom.xml b/server/process/pom.xml
index b2d9174cbef..bd06cb24b37 100644
--- a/server/process/pom.xml
+++ b/server/process/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>server</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/server/process/sonar-dummy-app/pom.xml b/server/process/sonar-dummy-app/pom.xml
index ded06395f6e..9c0f067ebbb 100644
--- a/server/process/sonar-dummy-app/pom.xml
+++ b/server/process/sonar-dummy-app/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>process</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -93,4 +93,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <properties>
+    <sonar.exclusions>**/*.java</sonar.exclusions>
+  </properties>
 </project>
diff --git a/server/process/sonar-process/pom.xml b/server/process/sonar-process/pom.xml
index 4753b693998..9d812c9d868 100644
--- a/server/process/sonar-process/pom.xml
+++ b/server/process/sonar-process/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>process</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/server/process/sonar-process/src/test/java/org/sonar/process/PropsTest.java b/server/process/sonar-process/src/test/java/org/sonar/process/PropsTest.java
index 5d283b44f8f..6985b0ba086 100644
--- a/server/process/sonar-process/src/test/java/org/sonar/process/PropsTest.java
+++ b/server/process/sonar-process/src/test/java/org/sonar/process/PropsTest.java
@@ -29,7 +29,7 @@ import static org.fest.assertions.Fail.fail;
 public class PropsTest {
 
   @Test
-  public void of() throws Exception {
+  public void value() throws Exception {
     Properties p = new Properties();
     p.setProperty("foo", "bar");
     Props props = new Props(p);
@@ -41,7 +41,7 @@ public class PropsTest {
   }
 
   @Test
-  public void intOf() throws Exception {
+  public void valueAsInt() throws Exception {
     Properties p = new Properties();
     p.setProperty("foo", "33");
     p.setProperty("blank", "");
@@ -56,7 +56,7 @@ public class PropsTest {
   }
 
   @Test
-  public void intOf_not_integer() throws Exception {
+  public void valueAsInt_not_integer() throws Exception {
     Properties p = new Properties();
     p.setProperty("foo", "bar");
     Props props = new Props(p);
@@ -70,7 +70,7 @@ public class PropsTest {
   }
 
   @Test
-  public void booleanOf() throws Exception {
+  public void valueAsBoolean() throws Exception {
     Properties p = new Properties();
     p.setProperty("foo", "True");
     p.setProperty("bar", "false");
@@ -82,7 +82,7 @@ public class PropsTest {
   }
 
   @Test
-  public void booleanOf_default_value() throws Exception {
+  public void valueAsBoolean_default_value() throws Exception {
     Properties p = new Properties();
     p.setProperty("foo", "true");
     p.setProperty("bar", "false");
@@ -114,9 +114,11 @@ public class PropsTest {
     Props props = new Props(p);
     props.set("foo", "new_foo");
     props.set("bar", "new_bar");
+    props.set("null", null);
 
     assertThat(props.value("foo")).isEqualTo("new_foo");
     assertThat(props.value("bar")).isEqualTo("new_bar");
+    assertThat(props.value("null")).isNull();
   }
 
   @Test