From 4bce3183b25c44ab406c2f4d8541a0a520b15a3d Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 15 Jun 2022 07:09:29 +0300 Subject: [PATCH 2/2] test: Rename some classes to avoid name conflicts * src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/App.java: Rename to "src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java" * src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTest.java Rename to "src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTimeoutTest.java" * src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppTest.java: Rename to "src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppShouldSucceedTest.java" * src/test/resources/test-build-should-succeed/src/main/java/org/apache/maven/shared/invoker/App.java: Rename to "src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java". --- ...AppTest.java => AppShouldSucceedTest.java} | 4 +-- .../org/apache/maven/shared/invoker/App.java | 32 ------------------- .../maven/shared/invoker/AppTimeout.java} | 2 +- .../{AppTest.java => AppTimeoutTest.java} | 2 +- 4 files changed, 4 insertions(+), 36 deletions(-) rename src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/{AppTest.java => AppShouldSucceedTest.java} (94%) delete mode 100644 src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/App.java rename src/test/resources/{test-build-should-succeed/src/main/java/org/apache/maven/shared/invoker/App.java => test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java} (97%) rename src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/{AppTest.java => AppTimeoutTest.java} (97%) diff --git a/src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppTest.java b/src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppShouldSucceedTest.java similarity index 94% rename from src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppTest.java rename to src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppShouldSucceedTest.java index 785d70c..9b5bb0a 100644 --- a/src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppTest.java +++ b/src/test/resources/test-build-should-succeed/src/test/java/org/apache/maven/shared/invoker/AppShouldSucceedTest.java @@ -26,7 +26,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppShouldSucceedTest extends TestCase { /** @@ -34,7 +34,7 @@ public class AppTest * * @param testName name of the test case */ - public AppTest( String testName ) + public AppShouldSucceedTest( String testName ) { super( testName ); } diff --git a/src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/App.java b/src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/App.java deleted file mode 100644 index 753a51c..0000000 --- a/src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/App.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.apache.maven.shared.invoker; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/src/test/resources/test-build-should-succeed/src/main/java/org/apache/maven/shared/invoker/App.java b/src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java similarity index 97% rename from src/test/resources/test-build-should-succeed/src/main/java/org/apache/maven/shared/invoker/App.java rename to src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java index 753a51c..d94b104 100644 --- a/src/test/resources/test-build-should-succeed/src/main/java/org/apache/maven/shared/invoker/App.java +++ b/src/test/resources/test-build-should-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java @@ -23,7 +23,7 @@ package org.apache.maven.shared.invoker; * Hello world! * */ -public class App +public class AppTimeout { public static void main( String[] args ) { diff --git a/src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTest.java b/src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTimeoutTest.java similarity index 97% rename from src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTest.java rename to src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTimeoutTest.java index 27808ea..2bdeda4 100644 --- a/src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTest.java +++ b/src/test/resources/test-build-should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTimeoutTest.java @@ -24,7 +24,7 @@ import org.junit.Test; /** * Unit test for simple App. */ -public class AppTest +public class AppTimeoutTest { /** -- 2.25.1