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 b1aac64536cbbb9f3425d4e5798b282362e58059 Author: Paul King <pa...@asert.com.au> AuthorDate: Tue May 14 15:56:36 2019 +1000 GROOVY-8647: Split package renaming (groovy-test NotYetImplemented and ScriptTestAdapter) --- .../src/main/java/groovy/test/transform/NotYetImplemented.java | 6 +++--- .../src/main/java/groovy/transform/NotYetImplemented.java | 4 +++- subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java | 2 +- .../groovy-test/src/main/java/groovy/util/GroovyTestSuite.java | 2 +- .../src/main/java/org/apache/groovy/test/ScriptTestAdapter.java | 3 ++- .../main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java | 3 +++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java index 253fb71..14724ca 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.transform; +package groovy.test.transform; import org.codehaus.groovy.transform.GroovyASTTransformationClass; @@ -35,11 +35,11 @@ import java.lang.annotation.Target; * <p> * The idea for this AST transformation originated in {@link groovy.util.GroovyTestCase#notYetImplemented()}. * - * @since 2.0.0 + * @since 3.0.0 */ @java.lang.annotation.Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) -@GroovyASTTransformationClass("org.codehaus.groovy.transform.NotYetImplementedASTTransformation") +@GroovyASTTransformationClass("org.apache.groovy.test.transform.NotYetImplementedASTTransformation") public @interface NotYetImplemented { } diff --git a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java index 253fb71..c383d6b 100644 --- a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java +++ b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java @@ -36,10 +36,12 @@ import java.lang.annotation.Target; * The idea for this AST transformation originated in {@link groovy.util.GroovyTestCase#notYetImplemented()}. * * @since 2.0.0 + * @deprecated use {@link groovy.test.transform.NotYetImplemented} */ +@Deprecated @java.lang.annotation.Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) -@GroovyASTTransformationClass("org.codehaus.groovy.transform.NotYetImplementedASTTransformation") +@GroovyASTTransformationClass("org.apache.groovy.test.transform.NotYetImplementedASTTransformation") public @interface NotYetImplemented { } 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 c926003..d92a1d7 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java @@ -24,7 +24,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.runtime.ScriptTestAdapter; +import org.apache.groovy.test.ScriptTestAdapter; import java.io.File; import java.io.IOException; diff --git a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java index ac16128..50e5a2c 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java @@ -23,7 +23,7 @@ import groovy.lang.Script; import junit.framework.Test; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.codehaus.groovy.runtime.ScriptTestAdapter; +import org.apache.groovy.test.ScriptTestAdapter; import java.io.File; import java.security.AccessController; diff --git a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java index 5595da8..e32ee3b 100644 --- a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java +++ b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.codehaus.groovy.runtime; +package org.apache.groovy.test; import junit.framework.Test; import junit.framework.TestResult; +import org.codehaus.groovy.runtime.InvokerHelper; /** * An adapter to make any Groovy Script class an instance of a JUnit Test diff --git a/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java index 5595da8..b82b49a 100644 --- a/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java +++ b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java @@ -23,7 +23,10 @@ import junit.framework.TestResult; /** * An adapter to make any Groovy Script class an instance of a JUnit Test + * + * @deprecated use {@link org.apache.groovy.test.ScriptTestAdapter} */ +@Deprecated public class ScriptTestAdapter implements Test { private Class scriptClass; private String[] arguments;