You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/01/05 15:11:23 UTC
svn commit: r1555513 -
/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java
Author: khmarbaise
Date: Sun Jan 5 14:11:22 2014
New Revision: 1555513
URL: http://svn.apache.org/r1555513
Log:
[MENFORCER-170]
- Refactored the unit test code a little bit.
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java?rev=1555513&r1=1555512&r2=1555513&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java Sun Jan 5 14:11:22 2014
@@ -19,27 +19,33 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
-import static org.mockito.Mockito.*;
-
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Prerequisites;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+import org.junit.Before;
import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class RequirePrerequisiteTest
{
+ private MavenProject project;
+ private EnforcerRuleHelper helper;
+
+ @Before
+ public void before() throws ExpressionEvaluationException {
+ project = mock( MavenProject.class );
+ helper = mock( EnforcerRuleHelper.class );
+ when( helper.evaluate( "${project}" ) ).thenReturn( project );
+ }
+
@Test( expected = EnforcerRuleException.class )
public void testNoPrerequisite()
throws Exception
{
RequirePrerequisite rule = new RequirePrerequisite();
-
- MavenProject project = mock( MavenProject.class );
-
- EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
- when( helper.evaluate( "${project}" ) ).thenReturn( project );
-
rule.execute( helper );
}
@@ -47,14 +53,9 @@ public class RequirePrerequisiteTest
public void testNoSpecifiedPrerequisite()
throws Exception
{
- RequirePrerequisite rule = new RequirePrerequisite();
-
- MavenProject project = mock( MavenProject.class );
when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
- EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
- when( helper.evaluate( "${project}" ) ).thenReturn( project );
-
+ RequirePrerequisite rule = new RequirePrerequisite();
rule.execute( helper );
}
@@ -62,15 +63,10 @@ public class RequirePrerequisiteTest
public void testLowerMavenPrerequisite()
throws Exception
{
- RequirePrerequisite rule = new RequirePrerequisite();
- rule.setMavenVersion( "3.0" );
-
- MavenProject project = mock( MavenProject.class );
when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
- EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
- when( helper.evaluate( "${project}" ) ).thenReturn( project );
-
+ RequirePrerequisite rule = new RequirePrerequisite();
+ rule.setMavenVersion( "3.0" );
rule.execute( helper );
}
@@ -78,14 +74,10 @@ public class RequirePrerequisiteTest
public void testLowerMavenRangePrerequisite()
throws Exception
{
- RequirePrerequisite rule = new RequirePrerequisite();
- rule.setMavenVersion( "[3.0,)" );
-
- MavenProject project = mock( MavenProject.class );
when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
- EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
- when( helper.evaluate( "${project}" ) ).thenReturn( project );
+ RequirePrerequisite rule = new RequirePrerequisite();
+ rule.setMavenVersion( "[3.0,)" );
rule.execute( helper );
}
@@ -94,17 +86,13 @@ public class RequirePrerequisiteTest
public void testValidPrerequisite()
throws Exception
{
- RequirePrerequisite rule = new RequirePrerequisite();
- rule.setMavenVersion( "2.2.1" );
-
- MavenProject project = mock( MavenProject.class );
Prerequisites prerequisites = new Prerequisites();
prerequisites.setMaven( "3.0" );
when( project.getPrerequisites() ).thenReturn( prerequisites );
- EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
- when( helper.evaluate( "${project}" ) ).thenReturn( project );
-
+ RequirePrerequisite rule = new RequirePrerequisite();
+ rule.setMavenVersion( "2.2.1" );
+
rule.execute( helper );
}
}