svn commit: r1471712 - in /maven/shared/trunk/maven-project-utils/src: main/java/org/apache/maven/shared/project/utils/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/maven/ test/java/org/apache/maven/shared/ test/java/org/apache/...

[rfscholte]

Author: rfscholte
Date: Wed Apr 24 21:55:32 2013
New Revision: 1471712

URL: http://svn.apache.org/r1471712
Log:
Do a proper null to empty String conversion, add unittests for it

Added:
    maven/shared/trunk/maven-project-utils/src/test/java/
    maven/shared/trunk/maven-project-utils/src/test/java/org/
    maven/shared/trunk/maven-project-utils/src/test/java/org/apache/
    maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/
    
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/
    
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/
    
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/
    
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
Modified:
    
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java

Modified: 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java?rev=1471712&r1=1471711&r2=1471712&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
 (original)
+++ 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
 Wed Apr 24 21:55:32 2013
@@ -35,7 +35,7 @@ public final class ScmUtils
         if ( scmConnection == null )
         {
             // prevent null-value
-            scmConnection = String.valueOf( getScmConnection( project ) );
+            scmConnection = defaultString( getScmConnection( project ) );
             
             if ( !ProjectUtils.isRootProject( project ) )
             {
@@ -48,20 +48,20 @@ public final class ScmUtils
 
     public static String resolveScmDeveloperConnection( MavenProject project )
     {
-        String siteUrl = getScmDeveloperConnection( project.getModel() );
+        String scmDeveloperConnection = getScmDeveloperConnection( 
project.getModel() );
 
-        if ( siteUrl == null )
+        if ( scmDeveloperConnection == null )
         {
             // prevent null-value
-            siteUrl = String.valueOf( getScmDeveloperConnection( project ) );
+            scmDeveloperConnection = defaultString( getScmDeveloperConnection( 
project ) );
             
             if ( !ProjectUtils.isRootProject( project ) )
             {
                 // assuming that folder matches the moduleName
-                siteUrl += '/' + project.getFile().getParentFile().getName();
+                scmDeveloperConnection += '/' + 
project.getFile().getParentFile().getName();
             }
         }
-        return siteUrl;
+        return scmDeveloperConnection;
     }
 
     protected static String getScmConnection( Model model )
@@ -100,4 +100,9 @@ public final class ScmUtils
         return project.getScm().getDeveloperConnection();
     }
 
+    public static String defaultString( String value )
+    {
+        return ( value == null ? "" : value );
+    }
+    
 }

Added: 
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java?rev=1471712&view=auto
==============================================================================
--- 
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
 (added)
+++ 
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
 Wed Apr 24 21:55:32 2013
@@ -0,0 +1,25 @@
+package org.apache.maven.shared.project.utils;
+
+import static org.junit.Assert.*;
+
+import org.apache.maven.project.MavenProject;
+import org.junit.Test;
+
+public class ScmUtilsTest
+{
+
+    @Test
+    public void resolveScmConnection()
+    {
+        MavenProject project = new MavenProject();
+        assertEquals( "",  ScmUtils.resolveScmConnection( project ) );
+    }
+
+    @Test
+    public void resolveScmDeveloperConnection()
+    {
+        MavenProject project = new MavenProject();
+        assertEquals( "",  ScmUtils.resolveScmDeveloperConnection( project ) );
+    }
+
+}