Author: olamy
Date: Wed Mar 28 15:13:55 2012
New Revision: 1306404
URL: http://svn.apache.org/viewvc?rev=1306404&view=rev
Log:
force add in ScmTckTestCase and add a new method in CommandParameters with
default value for getBoolean
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java?rev=1306404&r1=1306403&r2=1306404&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
Wed Mar 28 15:13:55 2012
@@ -34,8 +34,8 @@ public class CommandParameters
implements Serializable
{
private static final long serialVersionUID = -7346070735958137283L;
-
- private Map<String, Object> parameters = new HashMap<String,Object>();
+
+ private Map<String, Object> parameters = new HashMap<String, Object>();
// ----------------------------------------------------------------------
// String
@@ -115,9 +115,9 @@ public class CommandParameters
/**
* Return the parameter value as int or the default value if it doesn't
exist.
*
- * @param parameter The parameter
- * @return The parameter value as a int
+ * @param parameter The parameter
* @param defaultValue The defaultValue
+ * @return The parameter value as a int
* @throws ScmException if the value is in the wrong type
*/
public int getInt( CommandParameter parameter, int defaultValue )
@@ -166,7 +166,7 @@ public class CommandParameters
/**
* Return the parameter value as String or the default value if it doesn't
exist.
*
- * @param parameter The parameter
+ * @param parameter The parameter
* @param defaultValue The defaultValue
* @return The parameter value as a Date
* @throws ScmException if the value is in the wrong type
@@ -198,7 +198,7 @@ public class CommandParameters
* Return the parameter value as boolean.
*
* @param parameter The parameter
- * @return The parameter value as a String
+ * @return The parameter value as a boolean
* @throws ScmException if the parameter doesn't exist
*/
public boolean getBoolean( CommandParameter parameter )
@@ -207,6 +207,19 @@ public class CommandParameters
return Boolean.valueOf( getString( parameter ) ).booleanValue();
}
+ /**
+ * Return the parameter value as boolean.
+ *
+ * @param parameter The parameter
+ * @param defaultValue default value if parameter not exists
+ * @return The parameter value as a boolean
+ */
+ public boolean getBoolean( CommandParameter parameter, boolean
defaultValue )
+ throws ScmException
+ {
+ return Boolean.valueOf( getString( parameter, Boolean.toString(
defaultValue ) ) ).booleanValue();
+ }
+
// ----------------------------------------------------------------------
// ScmVersion
// ----------------------------------------------------------------------
@@ -267,8 +280,7 @@ public class CommandParameters
}
/**
- *
- * @param parameter not null
+ * @param parameter not null
* @param defaultValue could be null
* @return an array of files
* @throws ScmException if any
@@ -304,8 +316,6 @@ public class CommandParameters
return (ScmBranchParameters) getObject( ScmBranchParameters.class,
parameter, new ScmBranchParameters() );
}
-
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -334,8 +344,8 @@ public class CommandParameters
/**
* Return the value object or the default value if it doesn't exist.
*
- * @param clazz The type of the parameter value
- * @param parameter The parameter
+ * @param clazz The type of the parameter value
+ * @param parameter The parameter
* @param defaultValue The defaultValue
* @return The parameter value
* @throws ScmException if the defaultValue is in the wrong type
@@ -352,8 +362,9 @@ public class CommandParameters
if ( clazz != null && !clazz.isAssignableFrom( object.getClass() ) )
{
- throw new ScmException( "Wrong parameter type for '" +
parameter.getName() + ". " + "Expected: "
- + clazz.getName() + ", got: " + object.getClass().getName() );
+ throw new ScmException(
+ "Wrong parameter type for '" + parameter.getName() + ". " +
"Expected: " + clazz.getName() + ", got: "
+ + object.getClass().getName() );
}
return object;
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java?rev=1306404&r1=1306403&r2=1306404&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
Wed Mar 28 15:13:55 2012
@@ -163,7 +163,7 @@ public abstract class ScmTckTestCase
CommandParameters commandParameters = new CommandParameters();
commandParameters.setString( CommandParameter.FORCE_ADD,
Boolean.TRUE.toString() );
- AddScmResult result = provider.add( repository, new ScmFileSet(
workingDirectory, file ) );
+ AddScmResult result = provider.add( repository, new ScmFileSet(
workingDirectory, file ), commandParameters );
assertTrue( "Check result was successful, output: " +
result.getCommandOutput(), result.isSuccess() );
