From b0803b73ed63c4b0c23b3f87cefde1e5c2b32e89 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 21 Oct 2006 20:32:38 +0000 Subject: [PATCH] o reformat and optimize imports git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@466532 13f79535-47bb-0310-9956-ffa450edef68 --- .../integrationtests/MavenIT0083Test.java | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java b/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java index aa9fc318cb..f1a24930d1 100644 --- a/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java +++ b/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java @@ -1,31 +1,41 @@ package org.apache.maven.integrationtests; -import java.io.*; -import java.util.*; -import junit.framework.*; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.FileUtils; +import org.apache.maven.it.util.ResourceExtractor; -import org.apache.maven.it.*; -import org.apache.maven.it.util.*; +import java.io.File; -public class MavenIT0083Test extends TestCase /*extends AbstractMavenIntegrationTest*/ { +public class MavenIT0083Test + extends TestCase /*extends AbstractMavenIntegrationTest*/ +{ -/** Verify that overriding a compile time dependency as provided in a WAR ensures it is not included. */ -public void testit0083() throws Exception { -String basedir = System.getProperty("maven.test.tmpdir", System.getProperty("java.io.tmpdir")); -File testDir = new File(basedir, getName()); -FileUtils.deleteDirectory(testDir); -System.out.println("Extracting it0083 to " + testDir.getAbsolutePath()); -ResourceExtractor.extractResourcePath(getClass(), "/it0083", testDir); -Verifier verifier = new Verifier(testDir.getAbsolutePath()); -verifier.executeGoal("package"); -verifier.assertFilePresent("test-component-a/target/test-component-a-0.1.jar"); -verifier.assertFilePresent("test-component-b/target/test-component-b-0.1.jar"); -verifier.assertFilePresent("test-component-c/target/test-component-c-0.1.war"); -verifier.assertFilePresent("test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar"); -verifier.assertFileNotPresent("test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar"); -verifier.assertFilePresent("test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar"); -verifier.verifyErrorFreeLog(); -verifier.resetStreams(); -System.out.println("PASS"); -}} + /** + * Verify that overriding a compile time dependency as provided in a WAR ensures it is not included. + */ + public void testit0083() + throws Exception + { + String basedir = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) ); + File testDir = new File( basedir, getName() ); + FileUtils.deleteDirectory( testDir ); + System.out.println( "Extracting it0083 to " + testDir.getAbsolutePath() ); + ResourceExtractor.extractResourcePath( getClass(), "/it0083", testDir ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.executeGoal( "package" ); + verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" ); + verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" ); + verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" ); + verifier.assertFilePresent( + "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar" ); + verifier.assertFileNotPresent( + "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar" ); + verifier.assertFilePresent( + "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + System.out.println( "PASS" ); + } +}