You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/06/16 20:53:12 UTC
svn commit: r1493569 - in /maven/enforcer/trunk/enforcer-rules/src:
main/java/org/apache/maven/plugins/enforcer/
test/java/org/apache/maven/plugins/enforcer/
Author: rfscholte
Date: Sun Jun 16 18:53:12 2013
New Revision: 1493569
URL: http://svn.apache.org/r1493569
Log:
Fix checkstyle errors
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java Sun Jun 16 18:53:12 2013
@@ -71,6 +71,8 @@ public abstract class AbstractBanDepende
// if any are found, fail the check but list all of them
if ( foundExcludes != null && !foundExcludes.isEmpty() )
{
+ String message = getMessage();
+
StringBuilder buf = new StringBuilder();
if ( message != null )
{
@@ -80,7 +82,7 @@ public abstract class AbstractBanDepende
{
buf.append( getErrorMessage( artifact ) );
}
- message = buf.toString()+ "Use 'mvn dependency:tree' to locate the source of the banned dependencies.";
+ message = buf.toString() + "Use 'mvn dependency:tree' to locate the source of the banned dependencies.";
throw new EnforcerRuleException( message );
}
@@ -115,30 +117,10 @@ public abstract class AbstractBanDepende
* @return the sets the
* @throws EnforcerRuleException the enforcer rule exception
*/
- abstract protected Set<Artifact> checkDependencies( Set<Artifact> dependencies, Log log )
+ protected abstract Set<Artifact> checkDependencies( Set<Artifact> dependencies, Log log )
throws EnforcerRuleException;
/**
- * Gets the message.
- *
- * @return the message
- */
- public String getMessage()
- {
- return this.message;
- }
-
- /**
- * Sets the message.
- *
- * @param theMessage the message to set
- */
- public void setMessage( String theMessage )
- {
- this.message = theMessage;
- }
-
- /**
* Checks if is search transitive.
*
* @return the searchTransitive
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java Sun Jun 16 18:53:12 2013
@@ -1,102 +1,113 @@
-package org.apache.maven.plugins.enforcer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-
-/**
- * Abstract enforcer rule that give a foundation to validate properties from multiple sources.
- *
- * @author Paul Gier
- * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
- * @version $Id: AbstractPropertyEnforcerRule.java $
- */
-public abstract class AbstractPropertyEnforcerRule
- extends AbstractNonCacheableEnforcerRule
-{
-
- /**
- * Match the property value to a given regular expression. Defaults to <code>null</code> (any value is ok).
- */
- public String regex = null;
-
- /**
- * Specify a warning message if the regular expression is not matched.
- */
- public String regexMessage = null;
-
- public AbstractPropertyEnforcerRule()
- {
- super();
- }
-
- /**
- * Execute the rule.
- *
- * @param helper the helper
- * @throws EnforcerRuleException the enforcer rule exception
- */
- public void execute( EnforcerRuleHelper helper )
- throws EnforcerRuleException
- {
- Object propValue = resolveValue( helper );
-
- // Check that the property is not null or empty string
- if ( propValue == null )
- {
- if ( message == null )
- {
- message = getName() + " \"" + getPropertyName() + "\" is required for this build.";
- }
- throw new EnforcerRuleException( message );
- }
- // If there is a regex, check that the property matches it
- if ( regex != null && !propValue.toString().matches( regex ) )
- {
- if ( regexMessage == null )
- {
- regexMessage = getName() + " \"" + getPropertyName() + "\" evaluates to \"" + propValue + "\". "
- + "This does not match the regular expression \"" + regex + "\"";
- }
- throw new EnforcerRuleException( regexMessage );
- }
- }
-
- /**
- * How the property that is being evaluated is called
- */
- public abstract String getName();
-
- /**
- * The name of the property currently being evaluated, this is used for default message pourpouses only
- */
- public abstract String getPropertyName();
-
- /**
- * Resolves the property value
- *
- * @param helper
- * @throws EnforcerRuleException
- */
- public abstract Object resolveValue( EnforcerRuleHelper helper )
- throws EnforcerRuleException;
-
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+
+/**
+ * Abstract enforcer rule that give a foundation to validate properties from multiple sources.
+ *
+ * @author Paul Gier
+ * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
+ * @version $Id$
+ */
+public abstract class AbstractPropertyEnforcerRule
+ extends AbstractNonCacheableEnforcerRule
+{
+
+ /**
+ * Match the property value to a given regular expression. Defaults to <code>null</code> (any value is ok).
+ */
+ private String regex;
+
+ /**
+ * Specify a warning message if the regular expression is not matched.
+ */
+ private String regexMessage;
+
+ public AbstractPropertyEnforcerRule()
+ {
+ super();
+ }
+
+ public void setRegex( String regex )
+ {
+ this.regex = regex;
+ }
+
+ public void setRegexMessage( String regexMessage )
+ {
+ this.regexMessage = regexMessage;
+ }
+
+ /**
+ * Execute the rule.
+ *
+ * @param helper the helper
+ * @throws EnforcerRuleException the enforcer rule exception
+ */
+ public void execute( EnforcerRuleHelper helper )
+ throws EnforcerRuleException
+ {
+ Object propValue = resolveValue( helper );
+
+ // Check that the property is not null or empty string
+ if ( propValue == null )
+ {
+ String message = getMessage();
+ if ( message == null )
+ {
+ message = getName() + " \"" + getPropertyName() + "\" is required for this build.";
+ }
+ throw new EnforcerRuleException( message );
+ }
+ // If there is a regex, check that the property matches it
+ if ( regex != null && !propValue.toString().matches( regex ) )
+ {
+ if ( regexMessage == null )
+ {
+ regexMessage = getName() + " \"" + getPropertyName() + "\" evaluates to \"" + propValue + "\". "
+ + "This does not match the regular expression \"" + regex + "\"";
+ }
+ throw new EnforcerRuleException( regexMessage );
+ }
+ }
+
+ /**
+ * How the property that is being evaluated is called
+ */
+ public abstract String getName();
+
+ /**
+ * The name of the property currently being evaluated, this is used for default message pourpouses only
+ */
+ public abstract String getPropertyName();
+
+ /**
+ * Resolves the property value
+ *
+ * @param helper
+ * @throws EnforcerRuleException
+ */
+ public abstract Object resolveValue( EnforcerRuleHelper helper )
+ throws EnforcerRuleException;
+
}
\ No newline at end of file
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java Sun Jun 16 18:53:12 2013
@@ -69,18 +69,18 @@ public abstract class AbstractRequireFil
{
if ( !allowNulls && files.length == 0 )
- {
+ {
throw new EnforcerRuleException( "The file list is empty and Null files are disabled." );
- }
+ }
List<File> failures = new ArrayList<File>();
for ( File file : files )
{
if ( !allowNulls && file == null )
- {
+ {
failures.add( file );
- }
- else if ( !checkFile( file ) )
+ }
+ else if ( !checkFile( file ) )
{
failures.add( file );
}
@@ -89,6 +89,8 @@ public abstract class AbstractRequireFil
// if anything was found, log it with the optional message.
if ( !failures.isEmpty() )
{
+ String message = getMessage();
+
StringBuilder buf = new StringBuilder();
if ( message != null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java Sun Jun 16 18:53:12 2013
@@ -29,6 +29,16 @@ public abstract class AbstractStandardEn
{
/** Specify a friendly message if the rule fails. */
- public String message = null;
+ private String message;
+
+ public final void setMessage( String message )
+ {
+ this.message = message;
+ }
+
+ public final String getMessage()
+ {
+ return message;
+ }
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java Sun Jun 16 18:53:12 2013
@@ -93,6 +93,8 @@ public abstract class AbstractVersionEnf
}
else
{
+ String message = getMessage();
+
if ( StringUtils.isEmpty( message ) )
{
message = msg + " is not in the allowed range " + vr + ".";
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java Sun Jun 16 18:53:12 2013
@@ -37,6 +37,8 @@ public class AlwaysFail
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
+ String message = getMessage();
+
StringBuffer buf = new StringBuffer();
if ( message != null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java Sun Jun 16 18:53:12 2013
@@ -38,6 +38,9 @@ public class AlwaysPass
throws EnforcerRuleException
{
final Log log = helper.getLog();
+
+ String message = getMessage();
+
StringBuffer buf = new StringBuffer();
if ( message != null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java Sun Jun 16 18:53:12 2013
@@ -164,6 +164,7 @@ public class BanTransitiveDependencies
throw new EnforcerRuleException( "Error: Could not construct dependency tree.", e );
}
+ String message = getMessage();
StringBuilder generatedMessage = null;
if ( message == null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java Sun Jun 16 18:53:12 2013
@@ -61,11 +61,12 @@ public class EvaluateBeanshell
log.debug( "Echo script : " + script );
if ( !evaluateCondition( script, log ) )
{
+ String message = getMessage();
if ( StringUtils.isEmpty( message ) )
{
message = "The expression \"" + condition + "\" is not true.";
}
- throw new EnforcerRuleException( this.message );
+ throw new EnforcerRuleException( message );
}
}
catch ( ExpressionEvaluationException e )
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java Sun Jun 16 18:53:12 2013
@@ -86,6 +86,7 @@ public class RequireActiveProfile
if ( fail )
{
+ String message = getMessage();
StringBuilder buf = new StringBuilder();
if ( message != null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java Sun Jun 16 18:53:12 2013
@@ -140,6 +140,7 @@ public class RequireNoRepositories
// optional message.
if ( !badModels.isEmpty() )
{
+ String message = getMessage();
if ( StringUtils.isNotEmpty( message ) )
{
newMsg.append( message );
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Sun Jun 16 18:53:12 2013
@@ -285,6 +285,7 @@ public class RequirePluginVersions
}
newMsg.append( "\n" );
}
+ String message = getMessage();
if ( StringUtils.isNotEmpty( message ) )
{
newMsg.append( message );
@@ -1155,26 +1156,6 @@ public class RequirePluginVersions
}
/**
- * Gets the message.
- *
- * @return the message
- */
- protected String getMessage()
- {
- return this.message;
- }
-
- /**
- * Sets the message.
- *
- * @param theMessage the message to set
- */
- protected void setMessage( String theMessage )
- {
- this.message = theMessage;
- }
-
- /**
* Gets the utils.
*
* @return the utils
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java Sun Jun 16 18:53:12 2013
@@ -54,6 +54,7 @@ public class RequireReleaseVersion
if ( project.getArtifact().isSnapshot() )
{
+ String message = getMessage();
StringBuffer buf = new StringBuffer();
if ( message != null )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java Sun Jun 16 18:53:12 2013
@@ -181,7 +181,7 @@ public class TestBannedDependencies
{
try
{
- rule.message = null;
+ rule.setMessage( null );
rule.execute( helper );
if ( shouldFail )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java Sun Jun 16 18:53:12 2013
@@ -53,7 +53,7 @@ public class TestEvaluateBeanshell
EvaluateBeanshell rule = new EvaluateBeanshell();
// this property should not be set
rule.condition = "${env} == \"This is a test.\"";
- rule.message = "We have a variable : ${env}";
+ rule.setMessage( "We have a variable : ${env}" );
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
rule.execute( helper );
@@ -66,7 +66,7 @@ public class TestEvaluateBeanshell
// this property should be set by the surefire
// plugin
rule.condition = "${env} == null";
- rule.message = "We have a variable : ${env}";
+ rule.setMessage( "We have a variable : ${env}" );
try
{
@@ -76,7 +76,7 @@ public class TestEvaluateBeanshell
}
catch ( EnforcerRuleException e )
{
- assertEquals( e.getLocalizedMessage(), rule.message );
+ assertEquals( e.getLocalizedMessage(), rule.getMessage() );
}
}
@@ -95,7 +95,7 @@ public class TestEvaluateBeanshell
}
catch ( EnforcerRuleException e )
{
- assertEquals( e.getLocalizedMessage(), rule.message );
+ assertEquals( e.getLocalizedMessage(), "The expression \"${env} == null\" is not true." );
assertTrue( e.getLocalizedMessage().length() > 0 );
}
}
@@ -105,7 +105,7 @@ public class TestEvaluateBeanshell
{
EvaluateBeanshell rule = new EvaluateBeanshell();
rule.condition = "${env} == null";
- rule.message = "We have a variable : ${env}";
+ rule.setMessage( "We have a variable : ${env}" );
ExpressionEvaluator eval = mock( ExpressionEvaluator.class );
when( eval.evaluate( rule.condition ) ).thenThrow( new ExpressionEvaluationException( "expected error" ) );
@@ -117,7 +117,7 @@ public class TestEvaluateBeanshell
}
catch ( EnforcerRuleException e )
{
- assertFalse( e.getLocalizedMessage().equals( rule.message ) );
+ assertFalse( e.getLocalizedMessage().equals( rule.getMessage() ) );
}
verify( eval );
}
@@ -127,7 +127,7 @@ public class TestEvaluateBeanshell
{
EvaluateBeanshell rule = new EvaluateBeanshell();
rule.condition = "this is not valid beanshell";
- rule.message = "We have a variable : ${env}";
+ rule.setMessage( "We have a variable : ${env}" );
try
{
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
@@ -136,7 +136,7 @@ public class TestEvaluateBeanshell
}
catch ( EnforcerRuleException e )
{
- assertFalse( e.getLocalizedMessage().equals( rule.message ) );
+ assertFalse( e.getLocalizedMessage().equals( rule.getMessage() ) );
}
}
}
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java Sun Jun 16 18:53:12 2013
@@ -1,111 +1,111 @@
-package org.apache.maven.plugins.enforcer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-
-/**
- * Unit test for {@link RequireEnvironmentVariable}}
- *
- * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
- */
-public class TestRequireEnvironmentVariable
- extends TestCase
-{
-
- /**
- * Test rule.
- *
- * @throws EnforcerRuleException the enforcer rule exception
- */
- public void testRule()
- throws EnforcerRuleException
- {
- MockProject project = new MockProject();
- project.setProperty( "testProp", "This is a test." );
- EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
-
- RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
- // this env variable should not be set
- rule.variableName = "JUNK";
-
- try
- {
- rule.execute( helper );
- fail( "Expected an exception." );
- }
- catch ( EnforcerRuleException e )
- {
- // expected to catch this.
- }
-
- // PATH shall be common to windows and linux
- rule.variableName = "PATH";
- try
- {
- rule.execute( helper );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "This should not throw an exception" );
- }
- }
-
- /**
- * Test rule with regex.
- *
- * @throws EnforcerRuleException the enforcer rule exception
- */
- public void testRuleWithRegex()
- throws EnforcerRuleException
- {
- EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
-
- RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
- rule.variableName = "PATH";
- // This expression should not match the property
- // value
- rule.regex = "[^abc]";
-
- try
- {
- rule.execute( helper );
- fail( "Expected an exception." );
- }
- catch ( EnforcerRuleException e )
- {
- // expected to catch this.
- }
-
- // can't really predict what a PATH will looks like, just enforce it ain't empty
- rule.regex = ".{1,}";
- try
- {
- rule.execute( helper );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "This should not throw an exception" );
- }
- }
-
-}
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+
+/**
+ * Unit test for {@link RequireEnvironmentVariable}}
+ *
+ * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
+ */
+public class TestRequireEnvironmentVariable
+ extends TestCase
+{
+
+ /**
+ * Test rule.
+ *
+ * @throws EnforcerRuleException the enforcer rule exception
+ */
+ public void testRule()
+ throws EnforcerRuleException
+ {
+ MockProject project = new MockProject();
+ project.setProperty( "testProp", "This is a test." );
+ EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
+
+ RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
+ // this env variable should not be set
+ rule.variableName = "JUNK";
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Expected an exception." );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ // expected to catch this.
+ }
+
+ // PATH shall be common to windows and linux
+ rule.variableName = "PATH";
+ try
+ {
+ rule.execute( helper );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ fail( "This should not throw an exception" );
+ }
+ }
+
+ /**
+ * Test rule with regex.
+ *
+ * @throws EnforcerRuleException the enforcer rule exception
+ */
+ public void testRuleWithRegex()
+ throws EnforcerRuleException
+ {
+ EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
+
+ RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
+ rule.variableName = "PATH";
+ // This expression should not match the property
+ // value
+ rule.setRegex( "[^abc]" );
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Expected an exception." );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ // expected to catch this.
+ }
+
+ // can't really predict what a PATH will looks like, just enforce it ain't empty
+ rule.setRegex( ".{1,}" );
+ try
+ {
+ rule.execute( helper );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ fail( "This should not throw an exception" );
+ }
+ }
+
+}
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java Sun Jun 16 18:53:12 2013
@@ -45,7 +45,7 @@ public class TestRequireNoRepositories
super.setUp();
rule = new RequireNoRepositories();
- rule.message = "my message";
+ rule.setMessage( "my message" );
project = new MockProject();
project.setGroupId( "org.apache.maven.plugins.enforcer.test" );
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java?rev=1493569&r1=1493568&r2=1493569&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java Sun Jun 16 18:53:12 2013
@@ -89,7 +89,7 @@ public class TestRequireProperty
rule.property = "testProp";
// This expression should not match the property
// value
- rule.regex = "[^abc]";
+ rule.setRegex( "[^abc]" );
try
{
@@ -102,7 +102,7 @@ public class TestRequireProperty
}
// this expr should match the property
- rule.regex = "[This].*[.]";
+ rule.setRegex( "[This].*[.]" );
try
{
rule.execute( helper );