From 27deefca7cca90351ff2a0c96edf6aab3d1919d7 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 21 Oct 2006 20:29:43 +0000 Subject: [PATCH] o reformat and optimize imports git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@466474 13f79535-47bb-0310-9956-ffa450edef68 --- .../integrationtests/MavenIT0026Test.java | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java b/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java index 54d4118f78..7e24ed7b2d 100644 --- a/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java +++ b/maven-core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java @@ -1,30 +1,38 @@ 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; +import java.util.Properties; -public class MavenIT0026Test extends TestCase /*extends AbstractMavenIntegrationTest*/ { +public class MavenIT0026Test + extends TestCase /*extends AbstractMavenIntegrationTest*/ +{ -/** Test merging of global- and user-level settings.xml files. */ -public void testit0026() 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 it0026 to " + testDir.getAbsolutePath()); -ResourceExtractor.extractResourcePath(getClass(), "/it0026", testDir); -Verifier verifier = new Verifier(testDir.getAbsolutePath()); -Properties systemProperties = new Properties(); -systemProperties.put("org.apache.maven.user-settings", "user-settings.xml"); -systemProperties.put("org.apache.maven.global-settings", "global-settings.xml"); -verifier.setSystemProperties(systemProperties); -verifier.executeGoal("core-it:touch"); -verifier.assertFilePresent("target/test.txt"); -verifier.verifyErrorFreeLog(); -verifier.resetStreams(); -System.out.println("PASS"); -}} + /** + * Test merging of global- and user-level settings.xml files. + */ + public void testit0026() + 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 it0026 to " + testDir.getAbsolutePath() ); + ResourceExtractor.extractResourcePath( getClass(), "/it0026", testDir ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + Properties systemProperties = new Properties(); + systemProperties.put( "org.apache.maven.user-settings", "user-settings.xml" ); + systemProperties.put( "org.apache.maven.global-settings", "global-settings.xml" ); + verifier.setSystemProperties( systemProperties ); + verifier.executeGoal( "core-it:touch" ); + verifier.assertFilePresent( "target/test.txt" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + System.out.println( "PASS" ); + } +}