Author: brianf
Date: Tue Mar 27 19:51:39 2007
New Revision: 523148
URL: http://svn.apache.org/viewvc?view=rev&rev=523148
Log:
more tests
Added:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.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/TestMavenVersion.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.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=523148&r1=523147&r2=523148
==============================================================================
---
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
Tue Mar 27 19:51:39 2007
@@ -151,4 +151,20 @@
}
return matched;
}
+
+ /**
+ * @return the version
+ */
+ public String getVersion()
+ {
+ return this.version;
+ }
+
+ /**
+ * @param theVersion the version to set
+ */
+ public void setVersion( String theVersion )
+ {
+ this.version = theVersion;
+ }
}
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=523148&r1=523147&r2=523148
==============================================================================
---
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
Tue Mar 27 19:51:39 2007
@@ -6,6 +6,9 @@
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;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@@ -326,7 +329,15 @@
public Object lookup( String theComponentKey )
throws ComponentLookupException
{
- // TODO Auto-generated method stub
+ if ( theComponentKey.equals( MavenProject.class.getName() ) )
+ {
+ return new MavenProject();
+ }
+ else if ( theComponentKey.equals( RuntimeInformation.class.getName() )
)
+ {
+ return new DefaultRuntimeInformation();
+ }
+
return null;
}
Added:
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=auto&rev=523148
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
(added)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestDefaultEnforcementRuleHelper.java
Tue Mar 27 19:51:39 2007
@@ -0,0 +1,27 @@
+package org.apache.maven.plugin.enforcer;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.logging.SystemStreamLog;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ *
+ */
+public class TestDefaultEnforcementRuleHelper extends TestCase
+{
+ public void testHelper() throws ComponentLookupException
+ {
+ Log log = new SystemStreamLog();
+ DefaultEnforcementRuleHelper helper = new
DefaultEnforcementRuleHelper(EnforcerTestUtils.getMavenSession(),log);
+
+ assertSame( log, helper.getLog() );
+
+ assertNotNull( helper.getSession());
+ assertNotNull(helper.getProject());
+ assertNotNull( helper.getRuntimeInformation() );
+
+ }
+}
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=523148&r1=523147&r2=523148
==============================================================================
---
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
Tue Mar 27 19:51:39 2007
@@ -1,5 +1,10 @@
package org.apache.maven.plugin.enforcer;
+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;
/**
@@ -9,5 +14,38 @@
public class TestMavenVersion
extends TestCase
{
+ public void testRule()
+ throws EnforcerRuleException
+{
+
+
+ String thisVersion = RequireJavaVersion.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED );
+
+ RequireJavaVersion rule = new RequireJavaVersion();
+ rule.setVersion( thisVersion );
+
+ EnforcerRuleHelper helper = new DefaultEnforcementRuleHelper(
EnforcerTestUtils.getMavenSession(),
+ new
SystemStreamLog() );
+
+ // test the singular version
+ rule.execute( helper );
+
+ // exclude this version
+ rule.setVersion( "(" + thisVersion );
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Expected an exception." );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ // expected to catch this.
+ }
+
+ //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/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=523148&r1=523147&r2=523148
==============================================================================
---
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
Tue Mar 27 19:51:39 2007
@@ -1,5 +1,10 @@
package org.apache.maven.plugin.enforcer;
+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;
/**
@@ -23,6 +28,38 @@
assertEquals( "1.5.0", RequireJavaVersion.fixJDKVersion( "1-5-0-11" )
);
assertEquals( "1.5.0", RequireJavaVersion.fixJDKVersion( "1-_5-_0-_11"
) );
assertEquals( "1.5.0", RequireJavaVersion.fixJDKVersion( "1_5_0_11" )
);
+ }
+
+ public void testRule()
+ throws EnforcerRuleException
+ {
+ String thisVersion = RequireJavaVersion.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED );
+
+ RequireJavaVersion rule = new RequireJavaVersion();
+ rule.setVersion( thisVersion );
+
+ EnforcerRuleHelper helper = new DefaultEnforcementRuleHelper(
EnforcerTestUtils.getMavenSession(),
+ new
SystemStreamLog() );
+
+ // test the singular version
+ rule.execute( helper );
+
+ // exclude this version
+ rule.setVersion( "(" + thisVersion );
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Expected an exception." );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ // expected to catch this.
+ }
+
+ //this shouldn't crash
+ rule.setVersion( SystemUtils.JAVA_VERSION_TRIMMED );
+ rule.execute( helper );
}
}
