You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/02/13 08:19:28 UTC
[maven-compiler-plugin] 01/03: [MCOMPILER-526] Add packages to please the formatter
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 3dca82f4bf91e747c81ff3fe43e670f7cd7c08e1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Feb 10 10:11:40 2023 +0100
[MCOMPILER-526] Add packages to please the formatter
---
.../src/main/java/MyClass.java | 1 +
.../MCOMPILER-328_multiReleaseOutput/verify.groovy | 4 ++--
.../dependent-module/src/main/java/Main.java | 1 +
.../service/src/main/java/TestService.java | 1 +
.../dependent-module/src/main/java/Main.java | 1 +
.../service/src/main/java/TestService.java | 1 +
.../src/main/java/MyClass.java | 1 +
.../default-fork-windows/src/test/java/MyTest.java | 1 +
src/it/default-fork-windows/verify.groovy | 4 ++--
src/it/default-fork/src/main/java/MyClass.java | 1 +
src/it/default-fork/src/test/java/MyTest.java | 1 +
src/it/default-fork/verify.groovy | 4 ++--
.../src/main/java/{ => foo}/MyClass.java | 1 +
.../src/test/java/{ => foo}/MyTest.java | 1 +
src/it/default-incremental-disable/verify.groovy | 4 ++--
src/it/default/src/main/java/MyClass.java | 1 +
src/it/default/src/test/java/MyTest.java | 1 +
src/it/default/verify.bsh | 4 ++--
src/it/mcompiler-106/src/main/java/MyClass.java | 1 +
src/it/mcompiler-135/src/main/java/MyClass.java | 1 +
src/it/mcompiler-182/src/main/java/BeanA.java | 1 +
src/it/mcompiler-182/src/main/java/BeanA2.java | 1 +
src/it/mcompiler-182/verify.groovy | 2 +-
.../src/main/java/BeanA.java | 1 +
.../src/main/java/BeanA2.java | 1 +
.../src/main/java/BeanA.java | 1 +
.../src/main/java/BeanA2.java | 1 +
.../src/main/java/MyClass.java | 1 +
.../non-english-warnings/src/test/java/MyTest.java | 1 +
src/it/non-english-warnings/verify.bsh | 4 ++--
src/it/test1/src/main/java/MyClass.java | 1 +
.../plugin/compiler/CompilerMojoTestCase.java | 28 +++++++++++-----------
.../src/main/java/TestCompile0.java | 1 +
.../src/test/java/TestCompile0Test.java | 1 +
.../src/main/java/TestCompile0.java | 1 +
.../src/main/java/TestCompile0.java | 1 +
.../src/test/java/TestCompile0Test.java | 1 +
.../src/main/java/TestCompile0.java | 1 +
.../src/test/java/TestCompile0Test.java | 1 +
.../src/main/java/TestCompile0.java | 1 +
.../src/test/java/TestCompile0Test.java | 1 +
.../src/main/java/TestCompile1.java | 1 +
.../src/test/java/TestCompile1TestCase.java | 1 +
.../src/main/java/TestCompile2.java | 1 +
.../src/main/java/TestCompile3.java | 1 +
.../src/main/java/TestCompile4.java | 1 +
.../src/test/java/TestCompile2TestCase.java | 1 +
.../src/test/java/TestCompile3TestCase.java | 1 +
.../src/test/java/TestCompile4TestCase.java | 1 +
.../src/main/java/TestCompile2.java | 1 +
.../src/main/java/TestCompile3.java | 1 +
.../src/main/java/TestCompile4.java | 1 +
.../src/test/java/TestCompile2TestCase.java | 1 +
.../src/test/java/TestCompile3TestCase.java | 1 +
.../src/test/java/TestCompile4TestCase.java | 1 +
.../src/main/java/TestCompile2.java | 2 +-
.../src/main/java/TestCompile3.java | 1 +
.../src/main/java/TestCompile4.java | 1 +
.../src/test/java/TestCompile2TestCase.java | 1 +
.../src/test/java/TestCompile3TestCase.java | 1 +
.../src/test/java/TestCompile4TestCase.java | 1 +
.../src/main/java/TestSkipMainCompile0.java | 1 +
.../src/test/java/TestSkipMainCompile0Test.java | 1 +
.../src/main/java/TestSkipTestCompile0.java | 1 +
.../src/test/java/TestSkipTestCompile0Test.java | 1 +
65 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
+++ b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
index ea03de5..f3423da 100644
--- a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
+++ b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
@@ -17,6 +17,6 @@
* under the License.
*/
-assert !new File( basedir, 'target/classes/MyClass.class').exists()
+assert !new File( basedir, 'target/classes/foo/MyClass.class').exists()
-assert new File( basedir, 'target/classes/META-INF/versions/9/MyClass.class').exists()
\ No newline at end of file
+assert new File( basedir, 'target/classes/META-INF/versions/9/foo/MyClass.class').exists()
\ No newline at end of file
diff --git a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
index f77ad07..1d0ba1f 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class Main
{
diff --git a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
index df21d26..2e1d747 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestService
{
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
index dbad7cf..1403991 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class Main
{
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
index 7d5e878..4fb1ade 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestService
{
diff --git a/src/it/default-fork-windows/src/main/java/MyClass.java b/src/it/default-fork-windows/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-fork-windows/src/main/java/MyClass.java
+++ b/src/it/default-fork-windows/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/default-fork-windows/src/test/java/MyTest.java b/src/it/default-fork-windows/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-fork-windows/src/test/java/MyTest.java
+++ b/src/it/default-fork-windows/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/it/default-fork-windows/verify.groovy b/src/it/default-fork-windows/verify.groovy
index 6b1651d..2d4a24c 100644
--- a/src/it/default-fork-windows/verify.groovy
+++ b/src/it/default-fork-windows/verify.groovy
@@ -17,9 +17,9 @@
* under the License.
*/
-assert new File( basedir, 'target/classes/MyClass.class').exists()
+assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
-assert new File( basedir, 'target/test-classes/MyTest.class').exists()
+assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
assert !new File( basedir, 'target/classes/javac.sh').exists()
assert !new File( basedir, 'target/classes/javac.bat').exists()
diff --git a/src/it/default-fork/src/main/java/MyClass.java b/src/it/default-fork/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-fork/src/main/java/MyClass.java
+++ b/src/it/default-fork/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/default-fork/src/test/java/MyTest.java b/src/it/default-fork/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-fork/src/test/java/MyTest.java
+++ b/src/it/default-fork/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/it/default-fork/verify.groovy b/src/it/default-fork/verify.groovy
index ba3bd7a..6fb1fa1 100644
--- a/src/it/default-fork/verify.groovy
+++ b/src/it/default-fork/verify.groovy
@@ -17,9 +17,9 @@
* under the License.
*/
-assert new File( basedir, 'target/classes/MyClass.class').exists()
+assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
-assert new File( basedir, 'target/test-classes/MyTest.class').exists()
+assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
assert !new File( basedir, 'target/classes/javac.sh').exists()
assert !new File( basedir, 'target/classes/javac.bat').exists()
diff --git a/src/it/default-incremental-disable/src/main/java/MyClass.java b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
similarity index 98%
rename from src/it/default-incremental-disable/src/main/java/MyClass.java
rename to src/it/default-incremental-disable/src/main/java/foo/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-incremental-disable/src/main/java/MyClass.java
+++ b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/default-incremental-disable/src/test/java/MyTest.java b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
similarity index 98%
rename from src/it/default-incremental-disable/src/test/java/MyTest.java
rename to src/it/default-incremental-disable/src/test/java/foo/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-incremental-disable/src/test/java/MyTest.java
+++ b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/it/default-incremental-disable/verify.groovy b/src/it/default-incremental-disable/verify.groovy
index 2f72f1c..2f9fe2c 100644
--- a/src/it/default-incremental-disable/verify.groovy
+++ b/src/it/default-incremental-disable/verify.groovy
@@ -17,8 +17,8 @@
* under the License.
*/
-assert new File( basedir, "target/classes/MyClass.class" ).exists();
-assert new File( basedir, "target/test-classes/MyTest.class" ).exists();
+assert new File( basedir, "target/classes/foo/MyClass.class" ).exists();
+assert new File( basedir, "target/test-classes/foo/MyTest.class" ).exists();
content = new File( basedir, 'build.log' ).text;
diff --git a/src/it/default/src/main/java/MyClass.java b/src/it/default/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default/src/main/java/MyClass.java
+++ b/src/it/default/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/default/src/test/java/MyTest.java b/src/it/default/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default/src/test/java/MyTest.java
+++ b/src/it/default/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/it/default/verify.bsh b/src/it/default/verify.bsh
index 12bb543..402fb94 100644
--- a/src/it/default/verify.bsh
+++ b/src/it/default/verify.bsh
@@ -23,14 +23,14 @@ import java.util.regex.*;
try
{
- File mainClass = new File( basedir, "target/classes/MyClass.class" );
+ File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
if ( !mainClass.isFile() )
{
System.out.println( "Main class not existent: " + mainClass );
return false;
}
- File testClass = new File( basedir, "target/test-classes/MyTest.class" );
+ File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
if ( !testClass.isFile() )
{
System.out.println( "Test class not existent: " + testClass );
diff --git a/src/it/mcompiler-106/src/main/java/MyClass.java b/src/it/mcompiler-106/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/mcompiler-106/src/main/java/MyClass.java
+++ b/src/it/mcompiler-106/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/mcompiler-135/src/main/java/MyClass.java b/src/it/mcompiler-135/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/mcompiler-135/src/main/java/MyClass.java
+++ b/src/it/mcompiler-135/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/mcompiler-182/src/main/java/BeanA.java b/src/it/mcompiler-182/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/mcompiler-182/src/main/java/BeanA2.java b/src/it/mcompiler-182/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/mcompiler-182/verify.groovy b/src/it/mcompiler-182/verify.groovy
index 316aeaf..fdff21e 100644
--- a/src/it/mcompiler-182/verify.groovy
+++ b/src/it/mcompiler-182/verify.groovy
@@ -23,4 +23,4 @@ content = logFile.text
assert content.contains( 'COMPILATION ERROR :' )
-assert !new File( basedir, 'target/classes/BeanA.class' ).exists();
+assert !new File( basedir, 'target/classes/foo/BeanA.class' ).exists();
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
/**
* dumb test bean
diff --git a/src/it/non-english-warnings/src/main/java/MyClass.java b/src/it/non-english-warnings/src/main/java/MyClass.java
index 22efe45..62c02ee 100644
--- a/src/it/non-english-warnings/src/main/java/MyClass.java
+++ b/src/it/non-english-warnings/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/it/non-english-warnings/src/test/java/MyTest.java b/src/it/non-english-warnings/src/test/java/MyTest.java
index 1de5f62..a51de2b 100644
--- a/src/it/non-english-warnings/src/test/java/MyTest.java
+++ b/src/it/non-english-warnings/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyTest
{
diff --git a/src/it/non-english-warnings/verify.bsh b/src/it/non-english-warnings/verify.bsh
index 8b1bc6e..919db9d 100644
--- a/src/it/non-english-warnings/verify.bsh
+++ b/src/it/non-english-warnings/verify.bsh
@@ -21,13 +21,13 @@ import java.io.*;
import java.util.*;
import java.util.regex.*;
-File mainClass = new File( basedir, "target/classes/MyClass.class" );
+File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
if ( !mainClass.isFile() )
{
throw new FileNotFoundException( "Main class not existent: " + mainClass );
}
-File testClass = new File( basedir, "target/test-classes/MyTest.class" );
+File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
if ( !testClass.isFile() )
{
throw new FileNotFoundException( "Test class not existent: " + testClass );
diff --git a/src/it/test1/src/main/java/MyClass.java b/src/it/test1/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/test1/src/main/java/MyClass.java
+++ b/src/it/test1/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class MyClass
{
diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
index 6c12627..ae3e670 100644
--- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
@@ -67,7 +67,7 @@ public class CompilerMojoTestCase
compileMojo.execute();
- File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile0.class" );
+ File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile0.class" );
assertTrue( testClass.exists() );
@@ -80,7 +80,7 @@ public class CompilerMojoTestCase
assertNotNull( "MCOMPILER-94: artifact file should only be null if there is nothing to compile",
projectArtifact.getFile() );
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile0Test.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile0Test.class" );
verify( log ).warn( startsWith( "No explicit value set for target or release!" ) );
@@ -150,13 +150,13 @@ public class CompilerMojoTestCase
compileMojo.execute();
- File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile2.class" );
+ File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile2.class" );
assertFalse( testClass.exists() );
- testClass = new File( compileMojo.getOutputDirectory(), "TestCompile3.class" );
+ testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile3.class" );
assertFalse( testClass.exists() );
- testClass = new File( compileMojo.getOutputDirectory(), "TestCompile4.class" );
+ testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile4.class" );
assertTrue( testClass.exists() );
TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo,
@@ -167,13 +167,13 @@ public class CompilerMojoTestCase
testCompileMojo.execute();
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile2TestCase.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile2TestCase.class" );
assertFalse( testClass.exists() );
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile3TestCase.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile3TestCase.class" );
assertFalse( testClass.exists() );
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile4TestCase.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile4TestCase.class" );
assertTrue( testClass.exists() );
}
@@ -192,7 +192,7 @@ public class CompilerMojoTestCase
compileMojo.execute();
- File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile1.class" );
+ File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile1.class" );
assertTrue( testClass.exists() );
TestCompilerMojo testCompileMojo =
@@ -203,7 +203,7 @@ public class CompilerMojoTestCase
testCompileMojo.execute();
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile1TestCase.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile1TestCase.class" );
assertTrue( testClass.exists() );
}
@@ -345,13 +345,13 @@ public class CompilerMojoTestCase
CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
setVariableValueToObject( compileMojo, "skipMain", true );
compileMojo.execute();
- File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipMainCompile0.class" );
+ File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0.class" );
assertFalse( testClass.exists() );
TestCompilerMojo testCompileMojo =
getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
testCompileMojo.execute();
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipMainCompile0Test.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0Test.class" );
assertTrue( testClass.exists() );
}
@@ -365,14 +365,14 @@ public class CompilerMojoTestCase
{
CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
compileMojo.execute();
- File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipTestCompile0.class" );
+ File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0.class" );
assertTrue( testClass.exists() );
TestCompilerMojo testCompileMojo =
getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
setVariableValueToObject( testCompileMojo, "skip", true );
testCompileMojo.execute();
- testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipTestCompile0Test.class" );
+ testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0Test.class" );
assertFalse( testClass.exists() );
}
diff --git a/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile0
{
diff --git a/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile0
{
diff --git a/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile0
{
diff --git a/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile0
{
diff --git a/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile0
{
diff --git a/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java b/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
index 4e4ded8..c694c3f 100644
--- a/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
+++ b/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile1
{
diff --git a/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java b/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
index ede2355..cf276f9 100644
--- a/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
+++ b/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
index 18053c3..ff8fa23 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile2
{
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile3
{
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile4
{
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
index 18053c3..ff8fa23 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile2
{
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile3
{
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile4
{
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
index 18053c3..e187e0c 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile2
{
@@ -25,5 +26,4 @@ public class TestCompile2
System.out.println( "Woo Hoo!" );
}
-
}
\ No newline at end of file
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile3
{
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestCompile4
{
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java b/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
index f1788b4..a7805d7 100644
--- a/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
+++ b/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestSkipMainCompile0
{
diff --git a/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java b/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
index 3058998..d3d66b4 100644
--- a/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
+++ b/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;
diff --git a/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java b/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
index 95bcc5a..08911a9 100644
--- a/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
+++ b/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
public class TestSkipTestCompile0
{
diff --git a/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java b/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
index aa5e09d..0c64e55 100644
--- a/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
+++ b/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+package foo;
import junit.framework.TestCase;