Skip to content

Commit 3dca82f

Browse files
committed
[MCOMPILER-526] Add packages to please the formatter
1 parent f9b6bd0 commit 3dca82f

File tree

65 files changed

+84
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+84
-28
lines changed

src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
assert !new File( basedir, 'target/classes/MyClass.class').exists()
20+
assert !new File( basedir, 'target/classes/foo/MyClass.class').exists()
2121

22-
assert new File( basedir, 'target/classes/META-INF/versions/9/MyClass.class').exists()
22+
assert new File( basedir, 'target/classes/META-INF/versions/9/foo/MyClass.class').exists()

src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class Main
2122
{

src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class TestService
2122
{

src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class Main
2122
{

src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class TestService
2122
{

src/it/default-fork-windows/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/default-fork-windows/src/test/java/MyTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
import junit.framework.TestCase;
2122

src/it/default-fork-windows/verify.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
assert new File( basedir, 'target/classes/MyClass.class').exists()
20+
assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
2121

22-
assert new File( basedir, 'target/test-classes/MyTest.class').exists()
22+
assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
2323

2424
assert !new File( basedir, 'target/classes/javac.sh').exists()
2525
assert !new File( basedir, 'target/classes/javac.bat').exists()

src/it/default-fork/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/default-fork/src/test/java/MyTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
import junit.framework.TestCase;
2122

src/it/default-fork/verify.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
assert new File( basedir, 'target/classes/MyClass.class').exists()
20+
assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
2121

22-
assert new File( basedir, 'target/test-classes/MyTest.class').exists()
22+
assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
2323

2424
assert !new File( basedir, 'target/classes/javac.sh').exists()
2525
assert !new File( basedir, 'target/classes/javac.bat').exists()

src/it/default-incremental-disable/src/main/java/MyClass.java src/it/default-incremental-disable/src/main/java/foo/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/default-incremental-disable/src/test/java/MyTest.java src/it/default-incremental-disable/src/test/java/foo/MyTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
import junit.framework.TestCase;
2122

src/it/default-incremental-disable/verify.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* under the License.
1818
*/
1919

20-
assert new File( basedir, "target/classes/MyClass.class" ).exists();
21-
assert new File( basedir, "target/test-classes/MyTest.class" ).exists();
20+
assert new File( basedir, "target/classes/foo/MyClass.class" ).exists();
21+
assert new File( basedir, "target/test-classes/foo/MyTest.class" ).exists();
2222

2323
content = new File( basedir, 'build.log' ).text;
2424

src/it/default/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/default/src/test/java/MyTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
import junit.framework.TestCase;
2122

src/it/default/verify.bsh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import java.util.regex.*;
2323

2424
try
2525
{
26-
File mainClass = new File( basedir, "target/classes/MyClass.class" );
26+
File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
2727
if ( !mainClass.isFile() )
2828
{
2929
System.out.println( "Main class not existent: " + mainClass );
3030
return false;
3131
}
3232

33-
File testClass = new File( basedir, "target/test-classes/MyTest.class" );
33+
File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
3434
if ( !testClass.isFile() )
3535
{
3636
System.out.println( "Test class not existent: " + testClass );

src/it/mcompiler-106/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/mcompiler-135/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/mcompiler-182/src/main/java/BeanA.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/mcompiler-182/src/main/java/BeanA2.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/mcompiler-182/verify.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ content = logFile.text
2323

2424
assert content.contains( 'COMPILATION ERROR :' )
2525

26-
assert !new File( basedir, 'target/classes/BeanA.class' ).exists();
26+
assert !new File( basedir, 'target/classes/foo/BeanA.class' ).exists();

src/it/mcompiler-21_class-remove/src/main/java/BeanA.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
/**
2122
* dumb test bean

src/it/non-english-warnings/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/it/non-english-warnings/src/test/java/MyTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyTest
2122
{

src/it/non-english-warnings/verify.bsh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import java.io.*;
2121
import java.util.*;
2222
import java.util.regex.*;
2323

24-
File mainClass = new File( basedir, "target/classes/MyClass.class" );
24+
File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
2525
if ( !mainClass.isFile() )
2626
{
2727
throw new FileNotFoundException( "Main class not existent: " + mainClass );
2828
}
2929

30-
File testClass = new File( basedir, "target/test-classes/MyTest.class" );
30+
File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
3131
if ( !testClass.isFile() )
3232
{
3333
throw new FileNotFoundException( "Test class not existent: " + testClass );

src/it/test1/src/main/java/MyClass.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class MyClass
2122
{

src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testCompilerBasic()
6767

6868
compileMojo.execute();
6969

70-
File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile0.class" );
70+
File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile0.class" );
7171

7272
assertTrue( testClass.exists() );
7373

@@ -80,7 +80,7 @@ public void testCompilerBasic()
8080
assertNotNull( "MCOMPILER-94: artifact file should only be null if there is nothing to compile",
8181
projectArtifact.getFile() );
8282

83-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile0Test.class" );
83+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile0Test.class" );
8484

8585
verify( log ).warn( startsWith( "No explicit value set for target or release!" ) );
8686

@@ -150,13 +150,13 @@ public void testCompilerIncludesExcludes()
150150

151151
compileMojo.execute();
152152

153-
File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile2.class" );
153+
File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile2.class" );
154154
assertFalse( testClass.exists() );
155155

156-
testClass = new File( compileMojo.getOutputDirectory(), "TestCompile3.class" );
156+
testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile3.class" );
157157
assertFalse( testClass.exists() );
158158

159-
testClass = new File( compileMojo.getOutputDirectory(), "TestCompile4.class" );
159+
testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile4.class" );
160160
assertTrue( testClass.exists() );
161161

162162
TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo,
@@ -167,13 +167,13 @@ public void testCompilerIncludesExcludes()
167167

168168
testCompileMojo.execute();
169169

170-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile2TestCase.class" );
170+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile2TestCase.class" );
171171
assertFalse( testClass.exists() );
172172

173-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile3TestCase.class" );
173+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile3TestCase.class" );
174174
assertFalse( testClass.exists() );
175175

176-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile4TestCase.class" );
176+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile4TestCase.class" );
177177
assertTrue( testClass.exists() );
178178
}
179179

@@ -192,7 +192,7 @@ public void testCompilerFork()
192192

193193
compileMojo.execute();
194194

195-
File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile1.class" );
195+
File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile1.class" );
196196
assertTrue( testClass.exists() );
197197

198198
TestCompilerMojo testCompileMojo =
@@ -203,7 +203,7 @@ public void testCompilerFork()
203203

204204
testCompileMojo.execute();
205205

206-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile1TestCase.class" );
206+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile1TestCase.class" );
207207
assertTrue( testClass.exists() );
208208
}
209209

@@ -345,13 +345,13 @@ public void testCompileSkipMain()
345345
CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
346346
setVariableValueToObject( compileMojo, "skipMain", true );
347347
compileMojo.execute();
348-
File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipMainCompile0.class" );
348+
File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0.class" );
349349
assertFalse( testClass.exists() );
350350

351351
TestCompilerMojo testCompileMojo =
352352
getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
353353
testCompileMojo.execute();
354-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipMainCompile0Test.class" );
354+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0Test.class" );
355355
assertTrue( testClass.exists() );
356356
}
357357

@@ -365,14 +365,14 @@ public void testCompileSkipTest()
365365
{
366366
CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
367367
compileMojo.execute();
368-
File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipTestCompile0.class" );
368+
File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0.class" );
369369
assertTrue( testClass.exists() );
370370

371371
TestCompilerMojo testCompileMojo =
372372
getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
373373
setVariableValueToObject( testCompileMojo, "skip", true );
374374
testCompileMojo.execute();
375-
testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipTestCompile0Test.class" );
375+
testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0Test.class" );
376376
assertFalse( testClass.exists() );
377377
}
378378

src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
public class TestCompile0
2122
{

src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
package foo;
1920

2021
import junit.framework.TestCase;
2122

0 commit comments

Comments
 (0)