This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit d8eeaffd70a0fa68aeb05853e40c65428f01df44 Author: Paul King <[email protected]> AuthorDate: Wed May 15 23:34:18 2019 +1000 GROOVY-8647: Split package renaming (groovy-test) --- .../main/groovy/groovy/util/JavadocAssertionTestSuite.groovy | 2 +- .../src/main/java/groovy/test/NotYetImplemented.java | 2 +- .../groovy-test/src/main/java/groovy/util/AllTestSuite.java | 2 +- .../test/transform/NotYetImplementedASTTransformation.java | 2 +- .../test/transform/NotYetImplementedTransformTest.groovy | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy index 285428a..d2b4a93 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy @@ -69,7 +69,7 @@ class JavadocAssertionTestSuite extends TestSuite { public static final String SYSPROP_SRC_EXCLUDES_PATTERN = "javadocAssertion.src.excludesPattern"; private static final JavadocAssertionTestBuilder testBuilder = new JavadocAssertionTestBuilder() - private static final IFileNameFinder finder = Class.forName('groovy.util.FileNameFinder',true,this.classLoader).newInstance() + private static final IFileNameFinder finder = Class.forName('groovy.ant.FileNameFinder',true,this.classLoader).newInstance() static Test suite() { String basedir = System.getProperty(SYSPROP_SRC_DIR, "./src/") diff --git a/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java index 14724ca..c040417 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.test.transform; +package groovy.test; import org.codehaus.groovy.transform.GroovyASTTransformationClass; diff --git a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java index d92a1d7..b721573 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java @@ -92,7 +92,7 @@ public class AllTestSuite extends TestSuite { static { // this is only needed since the Groovy Build compiles *.groovy files after *.java files try { // TODO: dk: make FileNameFinder injectable - finder = (IFileNameFinder) Class.forName("groovy.util.FileNameFinder").getDeclaredConstructor().newInstance(); + finder = (IFileNameFinder) Class.forName("groovy.ant.FileNameFinder").getDeclaredConstructor().newInstance(); } catch (Exception e) { throw new RuntimeException("Cannot find and instantiate class FileNameFinder", e); } diff --git a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java index a5c59c1..9ff1fb3 100644 --- a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java +++ b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java @@ -48,7 +48,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS; /** * Handles generation of code for the {@code @NotYetImplemented} annotation. * - * @see groovy.transform.NotYetImplemented + * @see groovy.test.NotYetImplemented */ @GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION) public class NotYetImplementedASTTransformation extends AbstractASTTransformation { diff --git a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy index 993f5e9..12605e1 100644 --- a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy +++ b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy @@ -24,7 +24,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testNotYetImplemented() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented class MyTests extends GroovyTestCase { @NotYetImplemented void testShouldNotFail() { @@ -41,7 +41,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testNotYetImplementedWithException() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented class MyTests extends GroovyTestCase { @NotYetImplemented void testShouldNotFail() { @@ -58,7 +58,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testNotYetImplementedPassThrough() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented class MyTests extends GroovyTestCase { @NotYetImplemented void testShouldFail() { @@ -77,7 +77,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testEmptyTestMethod() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented class MyTests extends GroovyTestCase { @NotYetImplemented void testShouldNotFail() {} @@ -94,7 +94,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testNotYetImplementedJUnit4() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented import org.junit.Test import org.junit.runner.JUnitCore @@ -113,7 +113,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase { void testNotYetImplementedPassThroughJUnit4() { def output = evaluate(""" - import groovy.transform.NotYetImplemented + import groovy.test.NotYetImplemented import org.junit.Test import org.junit.runner.JUnitCore
