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:27:53 UTC
svn commit: r680221 - 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:27:53 2008
New Revision: 680221
URL: http://svn.apache.org/viewvc?rev=680221&view=rev
Log:
o we can find the resources for the test automatically, we can rename the directory structures later
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=680221&r1=680220&r2=680221&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:27:53 2008
@@ -85,7 +85,7 @@
protected void runTest()
throws Throwable
{
- out.print( getITName() + "(" + getName() + ").." );
+ out.print( getITName() + "(" + getName() + "[" + getLocation() + "]).." );
if ( skip )
{
@@ -145,7 +145,26 @@
{
return new DefaultInvocationRequest().setGoals( goals );
}
+
+ private String getLocation()
+ {
+ String location = getClass().getName().substring( getClass().getPackage().getName().length() + 6 ).toLowerCase();
+ location = location.substring( 0, location.length() - 4 );
+ return location;
+ }
+ // The end goal will be to pull the resources required for a test based on naming. Right now we can't
+ // because no one stuck to the original naming.
+ public IntegrationTestRunner createTestRunner()
+ throws IOException, IntegrationTestException
+ {
+ String location = getLocation();
+ System.out.println( location);
+ File basedir = extractTestResources( getClass(), location );
+ IntegrationTestRunner runner = new IntegrationTestRunner( basedir );
+ return runner;
+ }
+
public IntegrationTestRunner createTestRunner( String location )
throws IOException, IntegrationTestException
{
@@ -153,9 +172,9 @@
{
location = "/" + location;
}
-
+
File basedir = extractTestResources( getClass(), location );
- IntegrationTestRunner runner = new IntegrationTestRunner( basedir );
+ 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=680221&r1=680220&r2=680221&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:27:53 2008
@@ -14,7 +14,7 @@
public void testit0000()
throws Exception
{
- IntegrationTestRunner itr = createTestRunner( "it000" );
+ IntegrationTestRunner itr = createTestRunner();
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=680221&r1=680220&r2=680221&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:27:53 2008
@@ -15,14 +15,14 @@
public void testit0001()
throws Exception
{
- 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();
+ IntegrationTestRunner itr = createTestRunner();
+ itr.invoke( createInvocationRequest( "package" ) );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0001/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0001/PersonTest.class" );
+ itr.assertFilePresent( "target/maven-it-it0001-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0001-1.0.jar!/it0001.properties" );
+ itr.verifyErrorFreeLog();
+ itr.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=680221&r1=680220&r2=680221&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:27:53 2008
@@ -12,16 +12,16 @@
public void testit0002()
throws Exception
{
- IntegrationTestRunner verifier = createTestRunner( "it002" );
- verifier.deleteArtifact( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
- 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" );
- verifier.assertFilePresent( "target/maven-it-it0002-1.0.jar!/it0002.properties" );
- verifier.assertArtifactPresent( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = createTestRunner();
+ itr.deleteArtifact( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
+ itr.invoke( createInvocationRequest( "package" ) );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0002/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0002/PersonTest.class" );
+ itr.assertFilePresent( "target/maven-it-it0002-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0002-1.0.jar!/it0002.properties" );
+ itr.assertArtifactPresent( "org.apache.maven.its", "maven-core-it-support", "1.0", "jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}