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

[khmarbaise]

Author: khmarbaise
Date: Mon Jul 21 21:24:54 2014
New Revision: 1612401

URL: http://svn.apache.org/r1612401
Log:
- Improved unit test code.

Modified:
    
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java

Modified: 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java?rev=1612401&r1=1612400&r2=1612401&view=diff
==============================================================================
--- 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
 Mon Jul 21 21:24:54 2014
@@ -19,6 +19,14 @@ package org.apache.maven.plugins.enforce
  * under the License.
  */
 
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
 import org.apache.maven.model.Profile;
@@ -26,12 +34,6 @@ import org.apache.maven.project.MavenPro
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.junit.Before;
 import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 /**
  * Check the profile rule.
@@ -110,9 +112,7 @@ public class RequireActiveProfileTest
     public void testTwoActiveProfilesWithOneRequiredProfile()
         throws EnforcerRuleException
     {
-        List<Profile> profiles = new ArrayList<Profile>();
-        profiles.add( createProfile( "profile-1" )  );
-        profiles.add( createProfile( "profile-2" )  );
+        List<Profile> profiles = Arrays.asList( createProfile( "profile-1" ), 
createProfile( "profile-2" ) );
 
         when( project.getActiveProfiles() ).thenReturn( profiles );
 
@@ -126,9 +126,7 @@ public class RequireActiveProfileTest
     public void testTwoActiveProfilesWhereOneProfileIsRequiredToBeActivated()
         throws EnforcerRuleException
     {
-        List<Profile> profiles = new ArrayList<Profile>();
-        profiles.add( createProfile( "profile-1" )  );
-        profiles.add( createProfile( "profile-2" )  );
+        List<Profile> profiles = Arrays.asList( createProfile( "profile-1" ), 
createProfile( "profile-2" ) );
 
         when( project.getActiveProfiles() ).thenReturn( profiles );
 
@@ -143,9 +141,8 @@ public class RequireActiveProfileTest
     public void 
testTwoActiveProfilesWithTwoRequiredProfilesWhereOneOfThemIsNotPartOfTheActiveProfiles()
         throws EnforcerRuleException, ExpressionEvaluationException
     {
-        List<Profile> profiles = new ArrayList<Profile>();
-        profiles.add( createProfile( "profile-X" )  );
-        profiles.add( createProfile( "profile-Y" )  );
+
+        List<Profile> profiles = Arrays.asList( createProfile( "profile-X" ), 
createProfile( "profile-Y" ) );
 
         when( project.getActiveProfiles() ).thenReturn( profiles );
 
@@ -160,8 +157,7 @@ public class RequireActiveProfileTest
     public void testOneActiveProfilesWithTwoRequiredProfiles()
         throws EnforcerRuleException, ExpressionEvaluationException
     {
-        List<Profile> profiles = new ArrayList<Profile>();
-        profiles.add( createProfile( "profile-X" )  );
+        List<Profile> profiles = Collections.singletonList( createProfile( 
"profile-X" ) );
 
         when( project.getActiveProfiles() ).thenReturn( profiles );
 
@@ -176,8 +172,7 @@ public class RequireActiveProfileTest
     public void testOneActiveProfileWithTwoProfilesButNotAll()
         throws EnforcerRuleException, ExpressionEvaluationException
     {
-        List<Profile> profiles = new ArrayList<Profile>();
-        profiles.add( createProfile( "profile-X" )  );
+        List<Profile> profiles = Collections.singletonList( createProfile( 
"profile-X" ) );
 
         when( project.getActiveProfiles() ).thenReturn( profiles );