Author: krosenvold
Date: Thu Nov 13 05:28:17 2014
New Revision: 1639248
URL: http://svn.apache.org/r1639248
Log:
EasyMock, testing things you don't want to test for nearly 10 years
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Thu Nov 13 05:28:17 2014
@@ -286,6 +286,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetReactorProjects( projects );
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
+ macTask.expectGetMode( 0777, 0777 );
+
final int mode = TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
@@ -374,6 +376,7 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
+ macTask.expectGetMode( 0222, 0222 );
macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
@@ -459,6 +462,7 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectGetMode( 0222, 0222 );
final ModuleBinaries binaries = new ModuleBinaries();
@@ -529,6 +533,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
+ macTask.expectGetMode( 0222, 0222 );
+
macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Thu Nov 13 05:28:17 2014
@@ -74,6 +74,7 @@ public class AddArtifactTaskTest
ArtifactMock artifactMock = new ArtifactMock( mockManager, "group",
"artifact", "version", "jar", false );
File artifactFile = artifactMock.setNewFile();
+ mac.expectGetMode( 0222, 0222 );
mac.expectGetDestFile( new File( "junk" ) );
mac.expectAddFile( artifactFile, outputLocation );
mac.expectInterpolators();
@@ -100,6 +101,8 @@ public class AddArtifactTaskTest
File file = mock.setNewFile();
mock.setExtension( ext );
+ mac.expectGetMode( 0222, 0222 );
+
mac.expectGetDestFile( new File( "junk" ) );
mac.expectAddFile( file, outputDir + artifactId + "-" + version + "."
+ ext );
mac.expectInterpolators();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Thu Nov 13 05:28:17 2014
@@ -103,6 +103,8 @@ public class AddDependencySetsTaskTest
macTask.expectAddFile( newFile, outDir + depAid + "-" + depVer + "." +
depExt, 10 );
macTask.expectGetSession( null );
+ macTask.expectGetMode( 0222, 0222 );
+
DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
@@ -173,6 +175,7 @@ public class AddDependencySetsTaskTest
macTask.expectCSGetFinalName( "final-name" );
macTask.expectAddFile( file, "out/" + aid + "-" + version + "." + type
);
+ macTask.expectGetMode( 0222, 0222 );
macTask.expectGetSession( null );
final DependencySet ds = new DependencySet();
@@ -230,7 +233,7 @@ public class AddDependencySetsTaskTest
if ( unpack )
{
macTask.expectAddArchivedFileSet();
- macTask.expectModeChange( -1, -1, 10, 10, 2 );
+// macTask.expectModeChange( -1, -1, 10, 10, 2 );
}
else
{
@@ -246,6 +249,7 @@ public class AddDependencySetsTaskTest
final MavenProject depProject = new MavenProject( new Model() );
macTask.expectBuildFromRepository( depProject );
+ macTask.expectGetMode( 0222, 0222 );
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
Thu Nov 13 05:28:17 2014
@@ -88,6 +88,15 @@ public class MockAndControlForAddArtifac
expect(archiver.getDestFile()).andReturn( destFile ).atLeastOnce();
}
+ public void expectGetMode( final int originalDirMode, final int
originalFileMode )
+ {
+ expect( archiver.getOverrideDirectoryMode()).andReturn(
originalDirMode );
+ expect(archiver.getOverrideFileMode()).andReturn( originalFileMode );
+ archiver.setFileMode( anyInt() );
+ EasyMock.expectLastCall().anyTimes();
+ }
+
+
public void expectAddArchivedFileSet()
{
try
@@ -151,6 +160,7 @@ public class MockAndControlForAddArtifac
}
}
+
public void expectAddFile( final File file, final String outputLocation )
{
try
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
Thu Nov 13 05:28:17 2014
@@ -114,9 +114,7 @@ public class MockAndControlForAddDepende
public void expectModeChange( final int originalDirMode, final int
originalFileMode, final int dirMode,
final int fileMode, final int
numberOfChanges )
{
- expect( archiver.getOverrideDirectoryMode()).andReturn(
originalDirMode );
- expect(archiver.getOverrideFileMode()).andReturn( originalFileMode );
-
+ expectGetMode( originalDirMode, originalFileMode );
// one of the changes will occur below, when we restore the original
mode.
if ( numberOfChanges > 1 )
{
@@ -131,6 +129,17 @@ public class MockAndControlForAddDepende
archiver.setFileMode( originalFileMode );
}
+ public void expectGetMode( final int originalDirMode, final int
originalFileMode )
+ {
+ archiver.setFileMode( anyInt() );
+ EasyMock.expectLastCall().anyTimes();
+ expect( archiver.getOverrideDirectoryMode()).andReturn(
originalDirMode );
+ expect( archiver.getOverrideFileMode() ).andReturn( originalFileMode );
+ archiver.setDirectoryMode( anyInt() );
+ EasyMock.expectLastCall().anyTimes();
+
+ }
+
public void expectAddFile( final File file, final String outputLocation )
{
try
