Author: brianf
Date: Mon Apr 2 19:46:44 2007
New Revision: 525005
URL: http://svn.apache.org/viewvc?view=rev&rev=525005
Log:
code cleanup
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DisplayInfoMojo.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockEnforcerRule.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockPlexusContainer.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
Mon Apr 2 19:46:44 2007
@@ -122,12 +122,12 @@
*
* @param allowedRange
* range of allowed versions.
- * @param version
+ * @param theVersion
* the version to be checked.
*
* @return true if the version is contained by the range.
*/
- public boolean containsVersion( VersionRange allowedRange, ArtifactVersion
version )
+ public boolean containsVersion( VersionRange allowedRange, ArtifactVersion
theVersion )
{
boolean matched = false;
ArtifactVersion recommendedVersion =
allowedRange.getRecommendedVersion();
@@ -137,7 +137,7 @@
for ( Iterator i = allowedRange.getRestrictions().iterator();
i.hasNext() && !matched; )
{
Restriction restriction = (Restriction) i.next();
- if ( restriction.containsVersion( version ) )
+ if ( restriction.containsVersion( theVersion ) )
{
matched = true;
}
@@ -146,7 +146,7 @@
else
{
// only singular versions ever have a recommendedVersion
- int compareTo = recommendedVersion.compareTo( version );
+ int compareTo = recommendedVersion.compareTo( theVersion );
matched = ( compareTo <= 0 );
}
return matched;
@@ -161,7 +161,8 @@
}
/**
- * @param theVersion the version to set
+ * @param theVersion
+ * the version to set
*/
public void setVersion( String theVersion )
{
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java
Mon Apr 2 19:46:44 2007
@@ -22,9 +22,7 @@
import java.io.File;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DisplayInfoMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DisplayInfoMojo.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DisplayInfoMojo.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DisplayInfoMojo.java
Mon Apr 2 19:46:44 2007
@@ -26,8 +26,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.path.PathTranslator;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
@@ -40,7 +38,7 @@
public class DisplayInfoMojo
extends AbstractMojo
{
-
+
/**
* Path Translator needed by the ExpressionEvaluator
*
@@ -64,7 +62,6 @@
*/
protected MavenProject project;
-
/**
* Entry point to the mojo
*/
@@ -77,10 +74,9 @@
DefaultEnforcementRuleHelper helper = new
DefaultEnforcementRuleHelper( session, evaluator, getLog() );
RuntimeInformation rti = (RuntimeInformation) helper.getComponent(
RuntimeInformation.class );
getLog().info( "Maven Version: " + rti.getApplicationVersion() );
- RequireJavaVersion java = new RequireJavaVersion();
getLog().info(
"JDK Version: " + SystemUtils.JAVA_VERSION + "
normalized as: "
- + java.normalizeJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED ) );
+ + RequireJavaVersion.normalizeJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED ) );
RequireOS os = new RequireOS();
os.displayOSInfo( getLog(), true );
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
Mon Apr 2 19:46:44 2007
@@ -31,7 +31,6 @@
import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
/**
* This goal executes the defined enforcer-rules once per module.
@@ -264,7 +263,8 @@
}
/**
- * @param theProject the project to set
+ * @param theProject
+ * the project to set
*/
public void setProject( MavenProject theProject )
{
@@ -280,7 +280,8 @@
}
/**
- * @param theSession the session to set
+ * @param theSession
+ * the session to set
*/
public void setSession( MavenSession theSession )
{
@@ -296,7 +297,8 @@
}
/**
- * @param theTranslator the translator to set
+ * @param theTranslator
+ * the translator to set
*/
public void setTranslator( PathTranslator theTranslator )
{
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java
Mon Apr 2 19:46:44 2007
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.enforcer;
-import java.util.Properties;
-
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
@@ -10,9 +8,9 @@
import org.apache.maven.project.path.PathTranslator;
/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
- * This class wraps the PluginParameterExpressionEvaluator because it can't be
accessed directly in 2.0.x so we muct
- * create a new one.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a> This class wraps
+ * the PluginParameterExpressionEvaluator because it can't be accessed
+ * directly in 2.0.x so we muct create a new one.
*/
public class EnforcerExpressionEvaluator
extends PluginParameterExpressionEvaluator
@@ -24,9 +22,11 @@
* @param thePathTranslator
* @param theProject
*/
- public EnforcerExpressionEvaluator( MavenSession theContext,
PathTranslator thePathTranslator, MavenProject theProject )
+ public EnforcerExpressionEvaluator( MavenSession theContext,
PathTranslator thePathTranslator,
+ MavenProject theProject )
{
- super( theContext, new MojoExecution(new MojoDescriptor()),
thePathTranslator, null, theProject, theContext.getExecutionProperties() );
+ super( theContext, new MojoExecution( new MojoDescriptor() ),
thePathTranslator, null, theProject, theContext
+ .getExecutionProperties() );
}
}
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
Mon Apr 2 19:46:44 2007
@@ -54,11 +54,11 @@
log.debug( "Normalized Java String: " + java_version );
ArtifactVersion detectedJdkVersion = new DefaultArtifactVersion(
java_version );
-
+
log.debug( "Parsed Version: Major: " +
detectedJdkVersion.getMajorVersion() + " Minor: "
+ detectedJdkVersion.getMinorVersion() + " Incremental: " +
detectedJdkVersion.getIncrementalVersion()
+ " Build: " + detectedJdkVersion.getBuildNumber() + " Qualifier:
" + detectedJdkVersion.getQualifier() );
-
+
enforceVersion( helper.getLog(), "JDK", version, detectedJdkVersion );
}
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java
Mon Apr 2 19:46:44 2007
@@ -24,7 +24,6 @@
import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
@@ -43,7 +42,7 @@
{
try
{
- RuntimeInformation rti = (RuntimeInformation) helper.getComponent(
RuntimeInformation.class);
+ RuntimeInformation rti = (RuntimeInformation) helper.getComponent(
RuntimeInformation.class );
ArtifactVersion detectedMavenVersion = rti.getApplicationVersion();
helper.getLog().debug( "Detected Maven Version: " +
detectedMavenVersion );
enforceVersion( helper.getLog(), "Maven", this.version,
detectedMavenVersion );
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
Mon Apr 2 19:46:44 2007
@@ -35,13 +35,15 @@
{
public static MavenSession getMavenSession()
{
- return new MavenSession( new MockPlexusContainer(), null, null, null,
null, null, null, new Properties(), new Date() );
+ return new MavenSession( new MockPlexusContainer(), null, null, null,
null, null, null, new Properties(),
+ new Date() );
}
-
+
public static EnforcerRuleHelper getHelper()
{
MavenSession session = getMavenSession();
- ExpressionEvaluator eval = new EnforcerExpressionEvaluator(session,new
MockPathTranslator(), new MockProject());
- return new DefaultEnforcementRuleHelper(session,eval,new
SystemStreamLog());
+ ExpressionEvaluator eval = new EnforcerExpressionEvaluator( session,
new MockPathTranslator(),
+ new
MockProject() );
+ return new DefaultEnforcementRuleHelper( session, eval, new
SystemStreamLog() );
}
}
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockEnforcerRule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockEnforcerRule.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockEnforcerRule.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockEnforcerRule.java
Mon Apr 2 19:46:44 2007
@@ -25,25 +25,25 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
- *
+ *
*/
public class MockEnforcerRule
implements EnforcerRule
{
public boolean failRule = false;
-
- public MockEnforcerRule (boolean fail)
+
+ public MockEnforcerRule( boolean fail )
{
this.failRule = fail;
}
-
+
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
- if (isFailRule())
+ if ( isFailRule() )
{
- throw new EnforcerRuleException(" this condition is not allowed.");
+ throw new EnforcerRuleException( " this condition is not allowed."
);
}
}
@@ -56,7 +56,8 @@
}
/**
- * @param theFailRule the failRule to set
+ * @param theFailRule
+ * the failRule to set
*/
public void setFailRule( boolean theFailRule )
{
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockPlexusContainer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockPlexusContainer.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockPlexusContainer.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockPlexusContainer.java
Mon Apr 2 19:46:44 2007
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.execution.DefaultRuntimeInformation;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.project.MavenProject;
import org.codehaus.classworlds.ClassRealm;
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java
Mon Apr 2 19:46:44 2007
@@ -29,13 +29,10 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Build;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Contributor;
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java
Mon Apr 2 19:46:44 2007
@@ -60,15 +60,15 @@
assertTrue( rule.containsVersion( VersionRange.createFromVersionSpec(
"2.0.5" ), version ) );
assertFalse( rule.containsVersion( VersionRange.createFromVersionSpec(
"2.0.6" ), version ) );
-
- version = new DefaultArtifactVersion("1.5.0-7");
+
+ version = new DefaultArtifactVersion( "1.5.0-7" );
assertTrue( rule.containsVersion( VersionRange.createFromVersionSpec(
"[1.5.0,)" ), version ) );
assertTrue( rule.containsVersion( VersionRange.createFromVersionSpec(
"[1.5,1.6)" ), version ) );
-
- version = new
DefaultArtifactVersion(RequireJavaVersion.normalizeJDKVersion( "1.5.0-07" ));
+
+ version = new DefaultArtifactVersion(
RequireJavaVersion.normalizeJDKVersion( "1.5.0-07" ) );
assertTrue( rule.containsVersion( VersionRange.createFromVersionSpec(
"[1.5.0,)" ), version ) );
assertTrue( rule.containsVersion( VersionRange.createFromVersionSpec(
"[1.5,1.6)" ), version ) );
-
+
}
private void enforceFalse( AbstractVersionEnforcer rule, Log log, String
var, String range, ArtifactVersion version )
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
Mon Apr 2 19:46:44 2007
@@ -29,19 +29,21 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
- *
+ *
*/
-public class TestDefaultEnforcementRuleHelper extends TestCase
+public class TestDefaultEnforcementRuleHelper
+ extends TestCase
{
- public void testHelper() throws ComponentLookupException,
ExpressionEvaluationException
+ public void testHelper()
+ throws ComponentLookupException, ExpressionEvaluationException
{
Log log = new SystemStreamLog();
DefaultEnforcementRuleHelper helper = (DefaultEnforcementRuleHelper)
EnforcerTestUtils.getHelper();
-
+
assertNotNull( helper.getLog() );
- assertNotNull( helper.evaluate( "${session}" ));
- assertNotNull(helper.evaluate( "${project}" ));
+ assertNotNull( helper.evaluate( "${session}" ) );
+ assertNotNull( helper.evaluate( "${project}" ) );
assertNotNull( helper.getComponent( RuntimeInformation.class ) );
-
+
}
}
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
Mon Apr 2 19:46:44 2007
@@ -19,11 +19,11 @@
* under the License.
*/
+import junit.framework.TestCase;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
-import junit.framework.TestCase;
-
/**
* Exhaustively check the enforcer mojo.
*
@@ -34,40 +34,41 @@
extends TestCase
{
- public void testEnforceMojo() throws MojoExecutionException
+ public void testEnforceMojo()
+ throws MojoExecutionException
{
EnforceMojo mojo = new EnforceMojo();
mojo.setFail( false );
mojo.setSession( EnforcerTestUtils.getMavenSession() );
mojo.setProject( new MockProject() );
-
+
try
{
mojo.execute();
- fail("Expected a Mojo Execution Exception.");
+ fail( "Expected a Mojo Execution Exception." );
}
catch ( MojoExecutionException e )
{
- System.out.println("Caught Expected
Exception:"+e.getLocalizedMessage());
+ System.out.println( "Caught Expected Exception:" +
e.getLocalizedMessage() );
}
-
+
EnforcerRule[] rules = new EnforcerRule[10];
- rules[0] = new MockEnforcerRule(true);
- rules[1] = new MockEnforcerRule(true);
+ rules[0] = new MockEnforcerRule( true );
+ rules[1] = new MockEnforcerRule( true );
mojo.setRules( rules );
-
+
mojo.execute();
-
+
try
{
mojo.setFailFast( false );
mojo.setFail( true );
mojo.execute();
- fail("Expected a Mojo Execution Exception.");
+ fail( "Expected a Mojo Execution Exception." );
}
catch ( MojoExecutionException e )
{
- System.out.println("Caught Expected
Exception:"+e.getLocalizedMessage());
+ System.out.println( "Caught Expected Exception:" +
e.getLocalizedMessage() );
}
try
@@ -75,19 +76,16 @@
mojo.setFailFast( true );
mojo.setFail( true );
mojo.execute();
- fail("Expected a Mojo Execution Exception.");
+ fail( "Expected a Mojo Execution Exception." );
}
catch ( MojoExecutionException e )
{
- System.out.println("Caught Expected
Exception:"+e.getLocalizedMessage());
+ System.out.println( "Caught Expected Exception:" +
e.getLocalizedMessage() );
}
-
- ((MockEnforcerRule) rules[0]).setFailRule(false);
- ((MockEnforcerRule) rules[1]).setFailRule(false);
- mojo.execute();
-
+ ( (MockEnforcerRule) rules[0] ).setFailRule( false );
+ ( (MockEnforcerRule) rules[1] ).setFailRule( false );
+ mojo.execute();
-
}
}
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java
Mon Apr 2 19:46:44 2007
@@ -19,12 +19,11 @@
* under the License.
*/
+import junit.framework.TestCase;
+
import org.apache.commons.lang.SystemUtils;
-import org.apache.maven.plugin.logging.SystemStreamLog;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
-
-import junit.framework.TestCase;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
Mon Apr 2 19:46:44 2007
@@ -19,13 +19,12 @@
* under the License.
*/
+import junit.framework.TestCase;
+
import org.apache.commons.lang.SystemUtils;
-import org.apache.maven.plugin.logging.SystemStreamLog;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
-import junit.framework.TestCase;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*
@@ -64,7 +63,7 @@
// test the singular version
rule.execute( helper );
-
+
// exclude this version
rule.setVersion( "(" + thisVersion );
@@ -77,8 +76,8 @@
{
// expected to catch this.
}
-
- //this shouldn't crash
+
+ // this shouldn't crash
rule.setVersion( SystemUtils.JAVA_VERSION_TRIMMED );
rule.execute( helper );
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java?view=diff&rev=525005&r1=525004&r2=525005
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java
Mon Apr 2 19:46:44 2007
@@ -40,7 +40,7 @@
public void testOS()
{
Log log = new SystemStreamLog();
-
+
RequireOS rule = new RequireOS();
rule.displayOSInfo( log, true );
