Revert "Reformatted to code style"
Something creepy is going on @ localhost
This reverts commit 8858a32d7b5c59f230db137d8321ce2be254557b.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517906 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/it/file-sets-absolute-paths/child-a/pom.xml b/src/it/file-sets-absolute-paths/child-a/pom.xml
index 0addc39..ed4536d 100644
--- a/src/it/file-sets-absolute-paths/child-a/pom.xml
+++ b/src/it/file-sets-absolute-paths/child-a/pom.xml
@@ -30,7 +30,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>child-a</artifactId>
+ <artifactId>child-a</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child A</name>
diff --git a/src/it/file-sets-relative-paths/child-a/pom.xml b/src/it/file-sets-relative-paths/child-a/pom.xml
index 9aaeab1..a1ff584 100644
--- a/src/it/file-sets-relative-paths/child-a/pom.xml
+++ b/src/it/file-sets-relative-paths/child-a/pom.xml
@@ -30,7 +30,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>child-a</artifactId>
+ <artifactId>child-a</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child A</name>
diff --git a/src/it/file-sets-relative-paths/child-b/pom.xml b/src/it/file-sets-relative-paths/child-b/pom.xml
index 162a682..6821d50 100644
--- a/src/it/file-sets-relative-paths/child-b/pom.xml
+++ b/src/it/file-sets-relative-paths/child-b/pom.xml
@@ -30,7 +30,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>child-b</artifactId>
+ <artifactId>child-b</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child B</name>
diff --git a/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java b/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
index 2263ba1..d23e485 100644
--- a/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
@@ -37,18 +37,14 @@
public class CleanMojoTest
extends AbstractMojoTestCase
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected void setUp()
throws Exception
{
super.setUp();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected void tearDown()
throws Exception
{
@@ -67,20 +63,19 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/basic-clean-test" ),
- new File( getBasedir(), "target/test-classes/unit/basic-clean-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/basic-clean-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
mojo.execute();
- assertFalse( "Directory exists",
- checkExists( getBasedir() + "/target/test-classes/unit/" + "basic-clean-test/buildDirectory" ) );
- assertFalse( "Directory exists", checkExists(
- getBasedir() + "/target/test-classes/unit/basic-clean-test/" + "buildOutputDirectory" ) );
- assertFalse( "Directory exists", checkExists(
- getBasedir() + "/target/test-classes/unit/basic-clean-test/" + "buildTestDirectory" ) );
+ assertFalse( "Directory exists", checkExists( getBasedir() + "/target/test-classes/unit/"
+ + "basic-clean-test/buildDirectory" ) );
+ assertFalse( "Directory exists", checkExists( getBasedir() + "/target/test-classes/unit/basic-clean-test/"
+ + "buildOutputDirectory" ) );
+ assertFalse( "Directory exists", checkExists( getBasedir() + "/target/test-classes/unit/basic-clean-test/"
+ + "buildTestDirectory" ) );
}
/**
@@ -95,8 +90,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/nested-clean-test" ),
- new File( getBasedir(), "target/test-classes/unit/nested-clean-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/nested-clean-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -121,8 +115,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/empty-clean-test" ),
- new File( getBasedir(), "target/test-classes/unit/empty-clean-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/empty-clean-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupEmptyMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -130,12 +123,12 @@
mojo.execute();
assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/empty-clean-test/testDirectoryStructure" ) );
- assertTrue( checkExists(
- getBasedir() + "/target/test-classes/unit/empty-clean-test/" + "testDirectoryStructure/file.txt" ) );
- assertTrue( checkExists(
- getBasedir() + "/target/test-classes/unit/empty-clean-test/" + "testDirectoryStructure/outputDirectory" ) );
assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/empty-clean-test/"
- + "testDirectoryStructure/outputDirectory/file.txt" ) );
+ + "testDirectoryStructure/file.txt" ) );
+ assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/empty-clean-test/"
+ + "testDirectoryStructure/outputDirectory" ) );
+ assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/empty-clean-test/"
+ + "testDirectoryStructure/outputDirectory/file.txt" ) );
}
/**
@@ -150,8 +143,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/fileset-clean-test" ),
- new File( getBasedir(), "target/test-classes/unit/fileset-clean-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/fileset-clean-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -163,16 +155,15 @@
assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/classes" ) );
assertFalse( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/test-classes" ) );
assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/subdir" ) );
- assertFalse(
- checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/classes/file.txt" ) );
+ assertFalse( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/classes/file.txt" ) );
assertTrue( checkEmpty( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/classes" ) );
assertTrue( checkEmpty( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/subdir" ) );
// fileset 2
- assertTrue(
- checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/" + "buildOutputDirectory" ) );
- assertFalse( checkExists(
- getBasedir() + "/target/test-classes/unit/fileset-clean-test/" + "buildOutputDirectory/file.txt" ) );
+ assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/"
+ + "buildOutputDirectory" ) );
+ assertFalse( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/"
+ + "buildOutputDirectory/file.txt" ) );
}
/**
@@ -187,8 +178,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/invalid-directory-test" ),
- new File( getBasedir(), "target/test-classes/unit/invalid-directory-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/invalid-directory-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -217,8 +207,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/missing-directory-test" ),
- new File( getBasedir(), "target/test-classes/unit/missing-directory-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/missing-directory-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -238,7 +227,7 @@
public void testCleanLockedFile()
throws Exception
{
- if ( !System.getProperty( "os.name" ).toLowerCase().contains( "windows" ) )
+ if (!System.getProperty("os.name").toLowerCase().contains("windows"))
{
assertTrue( "Ignored this test on none Windows based systems", true );
return;
@@ -248,8 +237,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/locked-file-test" ),
- new File( getBasedir(), "target/test-classes/unit/locked-file-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/locked-file-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
assertNotNull( mojo );
@@ -294,7 +282,7 @@
public void testCleanLockedFileWithNoError()
throws Exception
{
- if ( !System.getProperty( "os.name" ).toLowerCase().contains( "windows" ) )
+ if (!System.getProperty("os.name").toLowerCase().contains("windows"))
{
assertTrue( "Ignored this test on none Windows based systems", true );
return;
@@ -304,8 +292,7 @@
// safety
FileUtils.copyDirectory( new File( getBasedir(), "src/test/resources/unit/locked-file-test" ),
- new File( getBasedir(), "target/test-classes/unit/locked-file-test" ), null,
- "**/.svn,**/.svn/**" );
+ new File( getBasedir(), "target/test-classes/unit/locked-file-test" ), null, "**/.svn,**/.svn/**" );
CleanMojo mojo = (CleanMojo) lookupMojo( "clean", pluginPom );
setVariableValueToObject( mojo, "failOnError", Boolean.FALSE );
