You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/28 03:11:58 UTC
svn commit: r680217 - in
/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests:
AbstractMavenIntegrationTestCase.java MavenIT0000Test.java
MavenIT0001Test.java MavenIT0002Test.java
Author: jvanzyl
Date: Sun Jul 27 18:11:57 2008
New Revision: 680217
URL: http://svn.apache.org/viewvc?rev=680217&view=rev
Log:
o still trying to tighten up how an integration test is written
o we can probably determine the resource location based on the class name, if we can't we should change them so we can
Modified:
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/AbstractMavenIntegrationTestCase.java
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0000Test.java
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/AbstractMavenIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/AbstractMavenIntegrationTestCase.java?rev=680217&r1=680216&r2=680217&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/AbstractMavenIntegrationTestCase.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/AbstractMavenIntegrationTestCase.java Sun Jul 27 18:11:57 2008
@@ -149,6 +149,11 @@
public IntegrationTestRunner createTestRunner( String location )
throws IOException, IntegrationTestException
{
+ if ( !location.startsWith( "/" ) )
+ {
+ location = "/" + location;
+ }
+
File basedir = extractTestResources( getClass(), location );
IntegrationTestRunner runner = new IntegrationTestRunner( basedir );
return runner;
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0000Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0000Test.java?rev=680217&r1=680216&r2=680217&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0000Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0000Test.java Sun Jul 27 18:11:57 2008
@@ -14,7 +14,7 @@
public void testit0000()
throws Exception
{
- IntegrationTestRunner itr = createTestRunner( "/it000" );
+ IntegrationTestRunner itr = createTestRunner( "it000" );
itr.invoke( createInvocationRequest( "package" ) );
itr.assertFilePresent( "target/classes/org/apache/maven/it0000/Person.class" );
itr.assertFilePresent( "target/test-classes/org/apache/maven/it0000/PersonTest.class" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java?rev=680217&r1=680216&r2=680217&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java Sun Jul 27 18:11:57 2008
@@ -15,16 +15,14 @@
public void testit0001()
throws Exception
{
- File testDir = extractTestResources( getClass(), "/it0001" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ IntegrationTestRunner verifier = createTestRunner( "it001" );
+ verifier.invoke( createInvocationRequest( "package" ) );
verifier.assertFilePresent( "target/classes/org/apache/maven/it0001/Person.class" );
verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0001/PersonTest.class" );
verifier.assertFilePresent( "target/maven-it-it0001-1.0.jar" );
verifier.assertFilePresent( "target/maven-it-it0001-1.0.jar!/it0001.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java?rev=680217&r1=680216&r2=680217&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java Sun Jul 27 18:11:57 2008
@@ -1,7 +1,5 @@
package org.apache.maven.integrationtests;
-import java.io.File;
-
import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0002Test
@@ -14,10 +12,9 @@
public void testit0002()
throws Exception
{
- File testDir = extractTestResources( getClass(), "/it0002" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = createTestRunner( "it002" );
verifier.deleteArtifact( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
- verifier.executeGoal( "package" );
+ verifier.invoke( createInvocationRequest( "package" ) );
verifier.assertFilePresent( "target/classes/org/apache/maven/it0002/Person.class" );
verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0002/PersonTest.class" );
verifier.assertFilePresent( "target/maven-it-it0002-1.0.jar" );
@@ -25,7 +22,6 @@
verifier.assertArtifactPresent( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}