svn commit: r1556031 - /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java

[kh...@apache.org]

Author: khmarbaise
Date: Mon Jan  6 21:05:08 2014
New Revision: 1556031

URL: http://svn.apache.org/r1556031
Log:
[MENFORCER-170]
 - Undone the changes in r1555513 to 
   analyze the root cause of the build failure.

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=1556031&r1=1556030&r2=1556031&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 Mon Jan  6 21:05:08 2014
@@ -19,33 +19,27 @@ 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 );
     }
     
@@ -53,9 +47,14 @@ public class RequirePrerequisiteTest
     public void testNoSpecifiedPrerequisite()
         throws Exception
     {
+        RequirePrerequisite rule = new RequirePrerequisite();
+
+        MavenProject project = mock( MavenProject.class );
         when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
 
-        RequirePrerequisite rule = new RequirePrerequisite();
+        EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
+        when( helper.evaluate( "${project}" ) ).thenReturn( project );
+
         rule.execute( helper );
     }
 
@@ -63,10 +62,15 @@ public class RequirePrerequisiteTest
     public void testLowerMavenPrerequisite()
         throws Exception
     {
-        when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
-
         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 );
+
         rule.execute( helper );
     }
 
@@ -74,11 +78,15 @@ public class RequirePrerequisiteTest
     public void testLowerMavenRangePrerequisite()
         throws Exception
     {
-        when( project.getPrerequisites() ).thenReturn( new Prerequisites() );
-
         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 );
+
         rule.execute( helper );
     }
 
@@ -86,13 +94,17 @@ 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 );
 
-        RequirePrerequisite rule = new RequirePrerequisite();
-        rule.setMavenVersion( "2.2.1" );
-        
+        EnforcerRuleHelper helper = mock( EnforcerRuleHelper.class );
+        when( helper.evaluate( "${project}" ) ).thenReturn( project );
+
         rule.execute( helper );
     }
 }