groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] 17/23: don't use deprecated version of class
Date Thu, 26 Sep 2019 00:26:36 GMT
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 d7abc6fcdc9dcb8ab6b9caf2a9cc3e74fc5953a7
Author: Paul King <paulk@asert.com.au>
AuthorDate: Thu Sep 19 19:01:34 2019 +1000

    don't use deprecated version of class
---
 src/test/DefaultPackageClassSupport.java                             | 2 +-
 src/test/gls/annotations/AnnotationsTestBase.java                    | 2 +-
 .../closures/AnnotationClosureExhaustiveTestSupport.groovy           | 2 ++
 src/test/gls/generics/GenericsTestBase.java                          | 2 +-
 src/test/groovy/bugs/Groovy2365Base.groovy                           | 2 ++
 src/test/groovy/bugs/Groovy2706Bug.groovy                            | 2 +-
 src/test/groovy/bugs/TestSupport.java                                | 2 +-
 src/test/groovy/lang/EmptyRangeTest.java                             | 2 +-
 src/test/groovy/lang/GStringTest.java                                | 2 +-
 src/test/groovy/lang/GroovyShellTest.java                            | 2 +-
 src/test/groovy/lang/MetaClassTest.java                              | 2 +-
 src/test/groovy/lang/SequenceTest.java                               | 2 +-
 src/test/groovy/lang/SpreadMapTest.java                              | 2 +-
 src/test/groovy/lang/TupleTest.java                                  | 2 +-
 src/test/groovy/security/SecurityTestSupport.java                    | 2 +-
 src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java          | 2 +-
 src/test/org/codehaus/groovy/antlr/SourceBufferTest.java             | 2 +-
 src/test/org/codehaus/groovy/antlr/SourceParserTest.java             | 2 +-
 src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java   | 2 +-
 src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java | 2 +-
 .../codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java    | 2 +-
 src/test/org/codehaus/groovy/ast/Groovy7826Bug.java                  | 2 +-
 src/test/org/codehaus/groovy/classgen/CapitalizeTest.java            | 2 +-
 src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java  | 2 +-
 src/test/org/codehaus/groovy/reflection/SecurityTest.java            | 2 +-
 src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java      | 2 +-
 src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java     | 2 +-
 src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java           | 2 +-
 src/test/org/codehaus/groovy/runtime/InvokerTest.java                | 2 +-
 src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java        | 2 +-
 src/test/org/codehaus/groovy/runtime/MethodFailureTest.java          | 2 +-
 src/test/org/codehaus/groovy/runtime/PropertyTest.java               | 2 +-
 src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java    | 2 +-
 src/test/org/codehaus/groovy/runtime/TupleListTest.java              | 2 +-
 src/test/org/codehaus/groovy/syntax/TokenTest.java                   | 2 +-
 src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java    | 2 +-
 src/test/org/codehaus/groovy/tools/CompilerTest.java                 | 2 +-
 src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java       | 2 +-
 src/test/org/codehaus/groovy/tools/gse/DependencyTest.java           | 2 +-
 subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlSTCTest.groovy  | 1 +
 .../groovy/test/transform/NotYetImplementedTransformTest.groovy      | 5 +++++
 .../groovy/org/apache/groovy/plugin/testng/TestNgRunnerTest.groovy   | 2 ++
 42 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/test/DefaultPackageClassSupport.java b/src/test/DefaultPackageClassSupport.java
index 24c5350..8144bf5 100644
--- a/src/test/DefaultPackageClassSupport.java
+++ b/src/test/DefaultPackageClassSupport.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 public abstract class DefaultPackageClassSupport extends GroovyTestCase {
 }
diff --git a/src/test/gls/annotations/AnnotationsTestBase.java b/src/test/gls/annotations/AnnotationsTestBase.java
index 1fb6d43..b657424 100644
--- a/src/test/gls/annotations/AnnotationsTestBase.java
+++ b/src/test/gls/annotations/AnnotationsTestBase.java
@@ -20,7 +20,7 @@ package gls.annotations;
 
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyClassLoader.InnerLoader;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilationUnit;
diff --git a/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
b/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
index a7db534..901799d 100644
--- a/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
+++ b/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
@@ -18,6 +18,8 @@
  */
 package gls.annotations.closures
 
+import groovy.test.GroovyTestCase
+
 abstract class AnnotationClosureExhaustiveTestSupport extends GroovyTestCase {
     abstract Class getAnnotationClass()
 
diff --git a/src/test/gls/generics/GenericsTestBase.java b/src/test/gls/generics/GenericsTestBase.java
index 5b91306..8b9a11d 100644
--- a/src/test/gls/generics/GenericsTestBase.java
+++ b/src/test/gls/generics/GenericsTestBase.java
@@ -20,7 +20,7 @@ package gls.generics;
 
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyClassLoader.InnerLoader;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilationUnit;
diff --git a/src/test/groovy/bugs/Groovy2365Base.groovy b/src/test/groovy/bugs/Groovy2365Base.groovy
index be56328..32c74dc 100644
--- a/src/test/groovy/bugs/Groovy2365Base.groovy
+++ b/src/test/groovy/bugs/Groovy2365Base.groovy
@@ -25,6 +25,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 abstract class Groovy2365Base extends GroovyTestCase {
 
     protected String createData () {
diff --git a/src/test/groovy/bugs/Groovy2706Bug.groovy b/src/test/groovy/bugs/Groovy2706Bug.groovy
index 64830ed..099d597 100644
--- a/src/test/groovy/bugs/Groovy2706Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2706Bug.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.bugs
 
-import groovy.util.GroovyTestCase
+import groovy.test.GroovyTestCase
 
 public class Groovy2706Bug extends GroovyTestCase {
     static counter = 0
diff --git a/src/test/groovy/bugs/TestSupport.java b/src/test/groovy/bugs/TestSupport.java
index 730a42b..87a05b1 100644
--- a/src/test/groovy/bugs/TestSupport.java
+++ b/src/test/groovy/bugs/TestSupport.java
@@ -18,7 +18,7 @@
  */
 package groovy.bugs;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.junit.Ignore;
 
 import java.util.Arrays;
diff --git a/src/test/groovy/lang/EmptyRangeTest.java b/src/test/groovy/lang/EmptyRangeTest.java
index 05e3140..7f76839 100644
--- a/src/test/groovy/lang/EmptyRangeTest.java
+++ b/src/test/groovy/lang/EmptyRangeTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/test/groovy/lang/GStringTest.java b/src/test/groovy/lang/GStringTest.java
index a3222cf..1891bf0 100644
--- a/src/test/groovy/lang/GStringTest.java
+++ b/src/test/groovy/lang/GStringTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 /**
diff --git a/src/test/groovy/lang/GroovyShellTest.java b/src/test/groovy/lang/GroovyShellTest.java
index d254a74..65c77ff 100644
--- a/src/test/groovy/lang/GroovyShellTest.java
+++ b/src/test/groovy/lang/GroovyShellTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
diff --git a/src/test/groovy/lang/MetaClassTest.java b/src/test/groovy/lang/MetaClassTest.java
index 571537b..f493fc7 100644
--- a/src/test/groovy/lang/MetaClassTest.java
+++ b/src/test/groovy/lang/MetaClassTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.util.ArrayList;
diff --git a/src/test/groovy/lang/SequenceTest.java b/src/test/groovy/lang/SequenceTest.java
index 89c95af..70869f9 100644
--- a/src/test/groovy/lang/SequenceTest.java
+++ b/src/test/groovy/lang/SequenceTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.util.List;
diff --git a/src/test/groovy/lang/SpreadMapTest.java b/src/test/groovy/lang/SpreadMapTest.java
index d7bfae7..906b3e3 100644
--- a/src/test/groovy/lang/SpreadMapTest.java
+++ b/src/test/groovy/lang/SpreadMapTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.util.Map;
 
diff --git a/src/test/groovy/lang/TupleTest.java b/src/test/groovy/lang/TupleTest.java
index 7900fe0..dca17d0 100644
--- a/src/test/groovy/lang/TupleTest.java
+++ b/src/test/groovy/lang/TupleTest.java
@@ -18,7 +18,7 @@
  */
 package groovy.lang;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 
 import java.util.HashSet;
diff --git a/src/test/groovy/security/SecurityTestSupport.java b/src/test/groovy/security/SecurityTestSupport.java
index be407a6..a4e08c9 100644
--- a/src/test/groovy/security/SecurityTestSupport.java
+++ b/src/test/groovy/security/SecurityTestSupport.java
@@ -22,7 +22,7 @@ import groovy.lang.Binding;
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyCodeSource;
 import groovy.lang.Script;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import junit.framework.TestCase;
 import junit.framework.TestFailure;
 import junit.framework.TestResult;
diff --git a/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java b/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
index bd5e169..57570db 100644
--- a/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
+++ b/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.antlr;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 public class GroovySourceASTTest extends GroovyTestCase {
     GroovySourceAST a;
diff --git a/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java b/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
index 4c98a75..4d1a1d9 100644
--- a/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
+++ b/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.antlr;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.io.Reader;
 import java.io.StringReader;
diff --git a/src/test/org/codehaus/groovy/antlr/SourceParserTest.java b/src/test/org/codehaus/groovy/antlr/SourceParserTest.java
index af4c8ce..caf5e7b 100644
--- a/src/test/org/codehaus/groovy/antlr/SourceParserTest.java
+++ b/src/test/org/codehaus/groovy/antlr/SourceParserTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.antlr;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.io.PrintWriter;
 import java.io.Reader;
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
index ec09094..2032be1 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.antlr.treewalker;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.antlr.java.Java2GroovyProcessor;
 
 public class Java2GroovyTest extends GroovyTestCase {
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
index 8a8d961..78d267e 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.antlr.treewalker;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 /**
  * Testcases for the antlr AST visitor that prints groovy source code.
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
index b8ecba8..c185ed1 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.antlr.treewalker;
 
 import groovy.lang.GroovyShell;
 import groovy.lang.Script;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 /**
  * This tests code that is valid in parser, but has issues further down the line.
diff --git a/src/test/org/codehaus/groovy/ast/Groovy7826Bug.java b/src/test/org/codehaus/groovy/ast/Groovy7826Bug.java
index 5acc693..ed6b4ab 100644
--- a/src/test/org/codehaus/groovy/ast/Groovy7826Bug.java
+++ b/src/test/org/codehaus/groovy/ast/Groovy7826Bug.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.ast;
 
 import groovy.lang.GroovyShell;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.control.CompilerConfiguration;
 
 public class Groovy7826Bug extends GroovyTestCase {
diff --git a/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java b/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
index 4905307..ed8bca6 100644
--- a/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
+++ b/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.classgen;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 public class CapitalizeTest extends GroovyTestCase {
 
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 50816ab..fcc68a2 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.control;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.control.messages.WarningMessage;
 
 import java.io.File;
diff --git a/src/test/org/codehaus/groovy/reflection/SecurityTest.java b/src/test/org/codehaus/groovy/reflection/SecurityTest.java
index 229865e..41f7b03 100644
--- a/src/test/org/codehaus/groovy/reflection/SecurityTest.java
+++ b/src/test/org/codehaus/groovy/reflection/SecurityTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.reflection;
 
 import groovy.lang.GroovyObjectSupport;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.InvokerInvocationException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java b/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
index 1b543de..716d7c3 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.runtime;
 
 import groovy.lang.GString;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 /**
  * Tests method invocation
diff --git a/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
index 0ffb3ca..2f865aa 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.runtime;
 
 import groovy.lang.Closure;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
index 4be0243..60cd460 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
@@ -21,7 +21,7 @@ package org.codehaus.groovy.runtime;
 import groovy.lang.GString;
 import groovy.lang.GroovyRuntimeException;
 import groovy.lang.IntRange;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import junit.framework.AssertionFailedError;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
diff --git a/src/test/org/codehaus/groovy/runtime/InvokerTest.java b/src/test/org/codehaus/groovy/runtime/InvokerTest.java
index d0744f8..354fba4 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokerTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokerTest.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.runtime;
 
 import groovy.lang.GString;
 import groovy.lang.GroovyRuntimeException;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
 import java.util.*;
diff --git a/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
index 14c8658..65b4565 100644
--- a/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
+++ b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.runtime;
 
 import groovy.lang.GroovyClassLoader;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 public class JdkDynamicProxyTest extends GroovyTestCase {
 
diff --git a/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java b/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
index 1197f96..e31c1b0 100644
--- a/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
+++ b/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
@@ -21,7 +21,7 @@ package org.codehaus.groovy.runtime;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovyRuntimeException;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 /**
  * Tests failing method invocations to ensure correct exceptions
diff --git a/src/test/org/codehaus/groovy/runtime/PropertyTest.java b/src/test/org/codehaus/groovy/runtime/PropertyTest.java
index 4839481..f812f42 100644
--- a/src/test/org/codehaus/groovy/runtime/PropertyTest.java
+++ b/src/test/org/codehaus/groovy/runtime/PropertyTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.runtime;
 
 import groovy.lang.MissingMethodException;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import groovy.util.HeadlessTestSupport;
 import groovy.util.Node;
 
diff --git a/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java b/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
index a298e55..5e7fccd 100644
--- a/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
+++ b/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.runtime;
 
 import groovy.lang.Closure;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/test/org/codehaus/groovy/runtime/TupleListTest.java b/src/test/org/codehaus/groovy/runtime/TupleListTest.java
index 0fe035c..259aa53 100644
--- a/src/test/org/codehaus/groovy/runtime/TupleListTest.java
+++ b/src/test/org/codehaus/groovy/runtime/TupleListTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.runtime;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/src/test/org/codehaus/groovy/syntax/TokenTest.java b/src/test/org/codehaus/groovy/syntax/TokenTest.java
index 7ff99cb..d4add62 100644
--- a/src/test/org/codehaus/groovy/syntax/TokenTest.java
+++ b/src/test/org/codehaus/groovy/syntax/TokenTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.syntax;
 
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 public class TokenTest
         extends GroovyTestCase {
diff --git a/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java b/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
index 0d80453..0f3f6d3 100644
--- a/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
+++ b/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.syntax.parser;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.control.SourceUnit;
 
diff --git a/src/test/org/codehaus/groovy/tools/CompilerTest.java b/src/test/org/codehaus/groovy/tools/CompilerTest.java
index ac621d8..d415b9a 100644
--- a/src/test/org/codehaus/groovy/tools/CompilerTest.java
+++ b/src/test/org/codehaus/groovy/tools/CompilerTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.tools;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.control.CompilerConfiguration;
 
 import java.io.File;
diff --git a/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java b/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
index bf5d966..c472b69 100644
--- a/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
+++ b/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
@@ -18,7 +18,7 @@
  */
 package org.codehaus.groovy.tools;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.control.CompilerConfiguration;
 
 import java.io.File;
diff --git a/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java b/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
index 138f828..e903298 100644
--- a/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
+++ b/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
@@ -28,7 +28,7 @@ import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 
 @SuppressWarnings("deprecation")
 public class DependencyTest extends GroovyTestCase {
diff --git a/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlSTCTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlSTCTest.groovy
index 275690d..2cdfe6b 100644
--- a/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlSTCTest.groovy
+++ b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlSTCTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.sql
 
+import groovy.test.GroovyShellTestCase
 import groovy.transform.TypeChecked
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
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 12605e1..b4ab0da 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
@@ -18,12 +18,14 @@
  */
 package org.apache.groovy.test.transform
 
+import groovy.test.GroovyShellTestCase
 import junit.framework.AssertionFailedError
 
 class NotYetImplementedTransformTest extends GroovyShellTestCase {
 
     void testNotYetImplemented() {
         def output = evaluate("""
+              import groovy.test.GroovyTestCase
               import groovy.test.NotYetImplemented
 
               class MyTests extends GroovyTestCase {
@@ -41,6 +43,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
 
     void testNotYetImplementedWithException() {
             def output = evaluate("""
+                  import groovy.test.GroovyTestCase
                   import groovy.test.NotYetImplemented
 
                   class MyTests extends GroovyTestCase {
@@ -58,6 +61,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
 
     void testNotYetImplementedPassThrough() {
         def output = evaluate("""
+              import groovy.test.GroovyTestCase
               import groovy.test.NotYetImplemented
 
               class MyTests extends GroovyTestCase {
@@ -77,6 +81,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
 
     void testEmptyTestMethod() {
         def output = evaluate("""
+              import groovy.test.GroovyTestCase
               import groovy.test.NotYetImplemented
 
               class MyTests extends GroovyTestCase {
diff --git a/subprojects/groovy-testng/src/test/groovy/org/apache/groovy/plugin/testng/TestNgRunnerTest.groovy
b/subprojects/groovy-testng/src/test/groovy/org/apache/groovy/plugin/testng/TestNgRunnerTest.groovy
index cda81f4..e45447d 100644
--- a/subprojects/groovy-testng/src/test/groovy/org/apache/groovy/plugin/testng/TestNgRunnerTest.groovy
+++ b/subprojects/groovy-testng/src/test/groovy/org/apache/groovy/plugin/testng/TestNgRunnerTest.groovy
@@ -18,6 +18,8 @@
  */
 package org.apache.groovy.plugin.testng
 
+import groovy.test.GroovyShellTestCase
+
 class TestNgRunnerTest extends GroovyShellTestCase {
 
     @Override


Mime
View raw message