Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0022StrongNameKeyAddedToAssemblyTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0022StrongNameKeyAddedToAssemblyTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0022StrongNameKeyAddedToAssemblyTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0022StrongNameKeyAddedToAssemblyTest.java Fri Jul 11 10:00:12 2014 @@ -35,13 +35,12 @@ public class NPandayIT0022StrongNameKeyA public void testStrongNameKeyAddedToAssembly() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0022StrongNameKeyAddedToAssemblyTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String assembly = new File( testDir, getAssemblyFile( "NPandayIT0022", "1.0.0.0", "dll" ) ).getAbsolutePath(); verifier.assertFilePresent( assembly ); assertPublicKey( assembly ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } }
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0028RemoteSnapshot public void testSnapDeploymentRemoteRepoNotUnique() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0028RemoteSnapshotRepoTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "deploy" ); verifier.assertFilePresent( new File( testDir, getAssemblyFile( "NPandayIT0028", "1.0.0.0", "dll" ) ).getAbsolutePath() ); @@ -45,6 +45,5 @@ public class NPandayIT0028RemoteSnapshot verifier.assertFilePresent( new File( testDir, path + ".dll" ).getAbsolutePath() ); verifier.assertFilePresent( new File( testDir, path + ".pom" ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0029RemoteRepoTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0029RemoteRepoTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0029RemoteRepoTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0029RemoteRepoTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0029RemoteRepoTest public void testDeployNonSnapshotRemoteRepo() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0029RemoteRepoTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "deploy" ); verifier.assertFilePresent( new File( testDir, getAssemblyFile( "NPandayIT0029", "1.0.0.0", "dll" ) ).getAbsolutePath() ); @@ -44,6 +44,5 @@ public class NPandayIT0029RemoteRepoTest verifier.assertFilePresent( new File( testDir, path + ".dll" ).getAbsolutePath() ); verifier.assertFilePresent( new File( testDir, path + ".pom" ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0032CompileExclusionsTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0032CompileExclusionsTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0032CompileExclusionsTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0032CompileExclusionsTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0032CompileExclusi public void testCompileExclusions() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0032CompileExclusionsTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String assembly = new File( testDir, getAssemblyFile( "NPandayIT0032", "1.0.0.0", "dll" ) ).getAbsolutePath(); verifier.assertFilePresent( assembly ); @@ -46,6 +46,5 @@ public class NPandayIT0032CompileExclusi verifier.assertFilePresent( testAssembly ); assertClassPresent( testAssembly, "It0032Test1" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0033VBSourceWithCSharpSourceTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0033VBSourceWithCSharpSourceTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0033VBSourceWithCSharpSourceTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0033VBSourceWithCSharpSourceTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0033VBSourceWithCS public void testVBSourceWithCsharpTestSource() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0033VBSourceWithCSharpSourceTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String assembly = new File( testDir, getAssemblyFile( "NPandayIT0033", "1.0.0.0", "dll" ) ).getAbsolutePath(); verifier.assertFilePresent( assembly ); @@ -46,6 +46,5 @@ public class NPandayIT0033VBSourceWithCS verifier.assertFilePresent( testAssembly ); assertClassPresent( testAssembly, "Class1" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0035VBRootNamespaceTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0035VBRootNamespaceTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0035VBRootNamespaceTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0035VBRootNamespaceTest.java Fri Jul 11 10:00:12 2014 @@ -35,13 +35,12 @@ public class NPandayIT0035VBRootNamespac public void testVBRootNamespace() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0035VBRootNamespaceTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String assembly = new File( testDir, getAssemblyFile( "NPandayIT0035", "1.0.0.0", "exe" ) ).getAbsolutePath(); verifier.assertFilePresent( assembly ); assertClassPresent( assembly, "it0035.Module1" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0036InstalledArtif public void testIT0036InstalledArtifacts() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0036InstalledArtifactsVerificationTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String exe = new File( testDir, getAssemblyFile( "NPandayIT0036", "1.0.0.0", "exe" ) ).getAbsolutePath(); @@ -54,6 +54,5 @@ public class NPandayIT0036InstalledArtif assertClassPresent( exe, "Module2" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0037ClassLibWithWebRefInstallTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0037ClassLibWithWebRefInstallTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0037ClassLibWithWebRefInstallTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0037ClassLibWithWebRefInstallTest.java Fri Jul 11 10:00:12 2014 @@ -35,14 +35,13 @@ public class NPandayIT0037ClassLibWithWe public void testClassLibWithWebRefInstall() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0037ClassLibWithWebRefInstallTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String generatedClass = "ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.cs"; verifier.assertFilePresent( new File( testDir, generatedClass ).getAbsolutePath() ); verifier.assertFilePresent( new File( testDir, "ClassLibraryWithWebReference/" + getAssemblyFile( "ClassLibraryWithWebReference", "1.0.0", "dll" ) ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0038CompilerWithArgsTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0038CompilerWithArgsTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0038CompilerWithArgsTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0038CompilerWithArgsTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0038CompilerWithAr public void testCompilerWithArgs() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0038CompilerWithArgsTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); String assembly = new File( testDir, getAssemblyFile( "NPandayITCompilerWithArgs", "1.0.0.0", "dll", null ) ).getAbsolutePath(); @@ -44,6 +44,5 @@ public class NPandayIT0038CompilerWithAr assertClassPresent( assembly, "It0001" ); assertClassNotPresent( assembly, "It0002" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0039ConsoleApplicationTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0039ConsoleApplicationTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0039ConsoleApplicationTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0039ConsoleApplicationTest.java Fri Jul 11 10:00:12 2014 @@ -35,12 +35,11 @@ public class NPandayIT0039ConsoleApplica public void testConsoleApplication() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0039ConsoleApplicationTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); verifier.assertFilePresent( new File( testDir, "ConsoleApplicationEx/" + getAssemblyFile( "ConsoleApplicationEx", "1.0.0", "exe" ) ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0040IntraProjectDependencyTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0040IntraProjectDependencyTest.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0040IntraProjectDependencyTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0040IntraProjectDependencyTest.java Fri Jul 11 10:00:12 2014 @@ -35,8 +35,8 @@ public class NPandayIT0040IntraProjectDe public void testIntraProjectDependency() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0040IntraProjectDependencyTest" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); File libDir = new File( testDir, "ClassLibrary3" ); verifier.assertFilePresent( @@ -47,6 +47,5 @@ public class NPandayIT0040IntraProjectDe verifier.assertFilePresent( new File( libDir, "target/test-assemblies/NUnit.Framework.dll" ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java Fri Jul 11 10:00:12 2014 @@ -35,12 +35,11 @@ public class NPandayIT0041Net35Test public void testNet35Project() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPandayIT0041Net35Test" ); - Verifier verifier = getVerifier( testDir ); + Verifier verifier = getDefaultVerifier(); + String testDir = verifier.getBasedir(); verifier.executeGoal( "install" ); verifier.assertFilePresent( new File( testDir, "ClassLibrary1/" + getAssemblyFile( "ClassLibrary1", "1.0.0", "dll" ) ).getAbsolutePath() ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); } } \ No newline at end of file Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIntegrationTestContext.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIntegrationTestContext.java?rev=1609663&r1=1609662&r2=1609663&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIntegrationTestContext.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIntegrationTestContext.java Fri Jul 11 10:00:12 2014 @@ -19,32 +19,14 @@ package npanday.its; * under the License. */ -import org.apache.maven.it.Verifier; - import java.io.File; public class NPandayIntegrationTestContext { - private Verifier verifier; - private String groupId; private File testDir; - public void setVerifier( Verifier verifier ) - { - this.verifier = verifier; - } - - /** - * Creates a verifier and removes installed artifacts from the local repository. - * @return The maven verifier for the project under test. - */ - public Verifier getPreparedVerifier() - { - return verifier; - } - public void setGroupId( String groupId ) { this.groupId = groupId;
