svn commit: r1806346 - in /maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact: deploy/internal/DefaultArtifactDeployerTest.java install/internal/DefaultArtifactInstallerTest.java

[khmarbaise]

Author: khmarbaise
Date: Sun Aug 27 10:22:28 2017
New Revision: 1806346

URL: http://svn.apache.org/viewvc?rev=1806346&view=rev
Log:
[MSHARED-656] Make integration testing for different Maven versions possible
 o Reordered parts of the tests.

Modified:
    
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
    
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java

Modified: 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java?rev=1806346&r1=1806345&r2=1806346&view=diff
==============================================================================
--- 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
 (original)
+++ 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
 Sun Aug 27 10:22:28 2017
@@ -57,10 +57,10 @@ public class DefaultArtifactDeployerTest
         throws ArtifactDeployerException
     {
         DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
+        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
 
         thrown.expect( IllegalArgumentException.class );
         thrown.expectMessage( "The parameter mavenArtifacts is not allowed to 
be null." );
-        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
         dap.deploy( pbr, null );
     }
 
@@ -69,10 +69,10 @@ public class DefaultArtifactDeployerTest
         throws ArtifactDeployerException
     {
         DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
+        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
 
         thrown.expect( IllegalArgumentException.class );
         thrown.expectMessage( "The collection mavenArtifacts is not allowed to 
be empty." );
-        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
         dap.deploy( pbr, Collections.<Artifact>emptyList() );
     }
 
@@ -93,10 +93,10 @@ public class DefaultArtifactDeployerTest
         throws ArtifactDeployerException
     {
         DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
+        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
 
         thrown.expect( IllegalArgumentException.class );
         thrown.expectMessage( "The parameter mavenArtifacts is not allowed to 
be null." );
-        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
         dap.deploy( pbr, null, null );
     }
 
@@ -105,10 +105,10 @@ public class DefaultArtifactDeployerTest
         throws ArtifactDeployerException
     {
         DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
+        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
 
         thrown.expect( IllegalArgumentException.class );
         thrown.expectMessage( "The collection mavenArtifacts is not allowed to 
be empty." );
-        ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
         dap.deploy( pbr, null, Collections.<Artifact>emptyList() );
     }
 

Modified: 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java?rev=1806346&r1=1806345&r2=1806346&view=diff
==============================================================================
--- 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
 (original)
+++ 
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
 Sun Aug 27 10:22:28 2017
@@ -45,8 +45,7 @@ public class DefaultArtifactInstallerTes
     public ExpectedException thrown = ExpectedException.none();
 
     @Test
-    public void 
installShouldReturnIllegalArgumentExceptionForFirstParameterWithNull()
-        throws ArtifactInstallerException
+    public void 
installShouldReturnIllegalArgumentExceptionForFirstParameterWithNull() throws 
IllegalArgumentException, ArtifactInstallerException
     {
         DefaultArtifactInstaller dai = new DefaultArtifactInstaller();