Do a proper null to empty String conversion, add unittests for it
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1471712 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java b/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
index 7e9c1e4..d4d2eec 100644
--- a/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
+++ b/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
@@ -35,7 +35,7 @@
if ( scmConnection == null )
{
// prevent null-value
- scmConnection = String.valueOf( getScmConnection( project ) );
+ scmConnection = defaultString( getScmConnection( project ) );
if ( !ProjectUtils.isRootProject( project ) )
{
@@ -48,20 +48,20 @@
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 @@
return project.getScm().getDeveloperConnection();
}
+ public static String defaultString( String value )
+ {
+ return ( value == null ? "" : value );
+ }
+
}
diff --git a/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java b/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
new file mode 100644
index 0000000..a1f3767
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java
@@ -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 ) );
+ }
+
+}
