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 f034f99478aa312e4387a9124935863d52a51e6b Author: Paul King <pa...@asert.com.au> AuthorDate: Thu May 16 16:07:44 2019 +1000 GROOVY-8647: Split package renaming (groovy-test GroovyTestCase and friends) --- .../groovy-json/src/spec/test/json/JsonBuilderTest.groovy | 2 ++ .../groovy-json/src/spec/test/json/JsonTest.groovy | 1 + .../src/spec/test/json/StreamingJsonBuilderTest.groovy | 2 ++ .../src/test/groovy/groovy/json/CharBufTest.groovy | 1 + .../groovy/groovy/json/CustomJsonGeneratorTest.groovy | 1 + .../groovy/groovy/json/DefaultJsonGeneratorTest.groovy | 2 ++ .../groovy-json/src/test/groovy/groovy/json/IOTest.groovy | 1 + .../src/test/groovy/groovy/json/JsonBuilderTest.groovy | 2 ++ .../src/test/groovy/groovy/json/JsonLexerTest.groovy | 14 ++++++++++++-- .../src/test/groovy/groovy/json/JsonOutputTest.groovy | 5 +++-- .../src/test/groovy/groovy/json/JsonSlurperTest.groovy | 1 + .../src/test/groovy/groovy/json/JsonTokenTypeTest.groovy | 15 ++++++++++++++- .../src/test/groovy/groovy/json/JsonTokenValueTest.groovy | 9 ++++++++- .../test/groovy/groovy/json/RealJsonPayloadsTest.groovy | 2 ++ .../groovy/groovy/json/StreamingJsonBuilderTest.groovy | 1 + .../groovy/json/DefaultFastStringServiceTest.groovy | 2 ++ .../org/apache/groovy/json/internal/ArrayUtilsTest.groovy | 2 ++ .../apache/groovy/json/internal/CharScannerTest.groovy | 2 ++ .../groovy/org/apache/groovy/json/internal/ChrTest.groovy | 2 ++ .../org/apache/groovy/json/internal/DatesTest.groovy | 2 ++ .../org/apache/groovy/json/internal/LazyMapTest.groovy | 2 ++ .../groovy/json/internal/ReaderCharacterSourceTest.groovy | 1 + .../src/main/groovy/groovy/lang/GroovyLogTestCase.groovy | 1 + .../src/main/groovy/groovy/test/GroovyLogTestCase.groovy | 12 +++++------- .../main/groovy/groovy/test/GroovyShellTestCase.groovy | 2 +- .../groovy/groovy/test/JavadocAssertionTestBuilder.groovy | 2 +- .../groovy/groovy/test/JavadocAssertionTestSuite.groovy | 2 +- .../src/main/groovy/groovy/test/StringTestUtil.groovy | 2 +- .../main/groovy/groovy/util/GroovyShellTestCase.groovy | 2 ++ .../groovy/groovy/util/JavadocAssertionTestBuilder.groovy | 1 + .../groovy/groovy/util/JavadocAssertionTestSuite.groovy | 1 + .../src/main/groovy/groovy/util/StringTestUtil.groovy | 1 + .../src/main/java/groovy/test/AllTestSuite.java | 3 ++- .../src/main/java/groovy/test/GroovyTestCase.java | 2 +- .../src/main/java/groovy/test/GroovyTestSuite.java | 2 +- .../src/main/java/groovy/util/AllTestSuite.java | 1 + .../src/main/java/groovy/util/GroovyTestCase.java | 1 + .../src/main/java/groovy/util/GroovyTestSuite.java | 2 +- .../groovy/groovy/{util => test}/AllTestSuiteTest.groovy | 8 ++++---- .../groovy/{lang => test}/GroovyLogTestCaseTest.groovy | 2 +- .../groovy/{ => groovy/test}/GroovyTestCaseTest.groovy | 2 ++ .../suite/ATestScriptThatsNoTestCase.groovy | 0 42 files changed, 95 insertions(+), 26 deletions(-) diff --git a/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy index 0328cc7..4ada0d0 100644 --- a/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy +++ b/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy @@ -18,6 +18,8 @@ */ package json +import groovy.test.GroovyTestCase + class JsonBuilderTest extends GroovyTestCase { void testJsonBuilder() { diff --git a/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy b/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy index 4f9bf83..1069af1 100644 --- a/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy +++ b/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy @@ -21,6 +21,7 @@ package json import groovy.json.JsonOutput import groovy.json.JsonParserType import groovy.json.JsonSlurper +import groovy.test.GroovyTestCase class JsonTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy index 28ce1f9..0e00b4b 100644 --- a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy +++ b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy @@ -18,6 +18,8 @@ */ package json +import groovy.test.GroovyTestCase + class StreamingJsonBuilderTest extends GroovyTestCase { void testStreamingJsonBuilder() { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy index 5e759a4..5dcf8bb 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy @@ -18,6 +18,7 @@ */ package groovy.json +import groovy.test.GroovyTestCase import org.apache.groovy.json.internal.CharBuf /** diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/CustomJsonGeneratorTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/CustomJsonGeneratorTest.groovy index 09bb35f..1f99b79 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/CustomJsonGeneratorTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/CustomJsonGeneratorTest.groovy @@ -20,6 +20,7 @@ package groovy.json import groovy.json.JsonGenerator.Converter import groovy.json.JsonGenerator.Options +import groovy.test.GroovyTestCase import org.apache.groovy.json.internal.CharBuf /** diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/DefaultJsonGeneratorTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/DefaultJsonGeneratorTest.groovy index 027497e..48d7c60 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/DefaultJsonGeneratorTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/DefaultJsonGeneratorTest.groovy @@ -18,6 +18,8 @@ */ package groovy.json +import groovy.test.GroovyTestCase + class DefaultJsonGeneratorTest extends GroovyTestCase { void testExcludesNullValues() { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy index 2094cf5..e916bb8 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy @@ -18,6 +18,7 @@ */ package groovy.json +import groovy.test.GroovyTestCase import org.apache.groovy.json.internal.CharBuf import org.apache.groovy.json.internal.IO diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy index 7af7b69..6c967c8 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy @@ -18,6 +18,8 @@ */ package groovy.json +import groovy.test.GroovyTestCase + class JsonBuilderTest extends GroovyTestCase { void testJsonBuilderConstructor() { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy index f67109e..7359942 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy @@ -18,9 +18,19 @@ */ package groovy.json -import static groovy.json.JsonTokenType.* - import groovy.io.LineColumnReader +import groovy.test.GroovyTestCase + +import static groovy.json.JsonTokenType.CLOSE_BRACKET +import static groovy.json.JsonTokenType.CLOSE_CURLY +import static groovy.json.JsonTokenType.COLON +import static groovy.json.JsonTokenType.COMMA +import static groovy.json.JsonTokenType.FALSE +import static groovy.json.JsonTokenType.NULL +import static groovy.json.JsonTokenType.NUMBER +import static groovy.json.JsonTokenType.OPEN_BRACKET +import static groovy.json.JsonTokenType.OPEN_CURLY +import static groovy.json.JsonTokenType.TRUE class JsonLexerTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy index 289980b..3ed54bf 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy @@ -18,10 +18,11 @@ */ package groovy.json -import static groovy.json.JsonOutput.toJson - +import groovy.test.GroovyTestCase import groovy.transform.Canonical +import static groovy.json.JsonOutput.toJson + class JsonOutputTest extends GroovyTestCase { // Check for GROOVY-5918 diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy index 8135bee..085b4b3 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy @@ -18,6 +18,7 @@ */ package groovy.json +import groovy.test.GroovyTestCase import org.apache.groovy.json.internal.Value class JsonSlurperTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy index 0ecadda..543ff25 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy @@ -18,7 +18,20 @@ */ package groovy.json -import static JsonTokenType.* +import groovy.test.GroovyTestCase + +import static groovy.json.JsonTokenType.CLOSE_BRACKET +import static groovy.json.JsonTokenType.CLOSE_CURLY +import static groovy.json.JsonTokenType.COLON +import static groovy.json.JsonTokenType.COMMA +import static groovy.json.JsonTokenType.FALSE +import static groovy.json.JsonTokenType.NULL +import static groovy.json.JsonTokenType.NUMBER +import static groovy.json.JsonTokenType.OPEN_BRACKET +import static groovy.json.JsonTokenType.OPEN_CURLY +import static groovy.json.JsonTokenType.STRING +import static groovy.json.JsonTokenType.TRUE +import static groovy.json.JsonTokenType.startingWith class JsonTokenTypeTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy index ce6f98b..56558f6 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy @@ -18,7 +18,14 @@ */ package groovy.json -import static JsonTokenType.* +import groovy.test.GroovyTestCase + +import static groovy.json.JsonTokenType.FALSE +import static groovy.json.JsonTokenType.NULL +import static groovy.json.JsonTokenType.NUMBER +import static groovy.json.JsonTokenType.OPEN_CURLY +import static groovy.json.JsonTokenType.STRING +import static groovy.json.JsonTokenType.TRUE class JsonTokenValueTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy index 32bdfee..66c0986 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy @@ -18,6 +18,8 @@ */ package groovy.json +import groovy.test.GroovyTestCase + class RealJsonPayloadsTest extends GroovyTestCase { def parser = new JsonSlurper() diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy index 12fe06e..7fccb47 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy @@ -18,6 +18,7 @@ */ package groovy.json +import groovy.test.GroovyTestCase import groovy.transform.CompileStatic class StreamingJsonBuilderTest extends GroovyTestCase { diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/DefaultFastStringServiceTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/DefaultFastStringServiceTest.groovy index c79ac34..686233d 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/DefaultFastStringServiceTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/DefaultFastStringServiceTest.groovy @@ -18,6 +18,8 @@ */ package org.apache.groovy.json +import groovy.test.GroovyTestCase + class DefaultFastStringServiceTest extends GroovyTestCase { FastStringService service = new DefaultFastStringServiceFactory().service diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ArrayUtilsTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ArrayUtilsTest.groovy index d6bea5c..6d6be1d 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ArrayUtilsTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ArrayUtilsTest.groovy @@ -18,6 +18,8 @@ */ package org.apache.groovy.json.internal +import groovy.test.GroovyTestCase + class ArrayUtilsTest extends GroovyTestCase { void testCopyRange() { diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/CharScannerTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/CharScannerTest.groovy index 5e3f49a..ef09b3a 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/CharScannerTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/CharScannerTest.groovy @@ -18,6 +18,8 @@ */ package org.apache.groovy.json.internal +import groovy.test.GroovyTestCase + class CharScannerTest extends GroovyTestCase { void testParseInt() { diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ChrTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ChrTest.groovy index bcdac93..0f5c066 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ChrTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ChrTest.groovy @@ -20,6 +20,8 @@ package org.apache.groovy.json.internal import static org.apache.groovy.json.internal.Chr.* +import groovy.test.GroovyTestCase + class ChrTest extends GroovyTestCase { void testLpad() { diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/DatesTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/DatesTest.groovy index f130362..63108c3 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/DatesTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/DatesTest.groovy @@ -18,6 +18,8 @@ */ package org.apache.groovy.json.internal +import groovy.test.GroovyTestCase + class DatesTest extends GroovyTestCase{ // GROOVY-7462 diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/LazyMapTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/LazyMapTest.groovy index 607ad73..13a4a95 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/LazyMapTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/LazyMapTest.groovy @@ -18,6 +18,8 @@ */ package org.apache.groovy.json.internal +import groovy.test.GroovyTestCase + class LazyMapTest extends GroovyTestCase { // GROOVY-7302 diff --git a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ReaderCharacterSourceTest.groovy b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ReaderCharacterSourceTest.groovy index f45a0ef..4f2beec 100644 --- a/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ReaderCharacterSourceTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/org/apache/groovy/json/internal/ReaderCharacterSourceTest.groovy @@ -18,6 +18,7 @@ */ package org.apache.groovy.json.internal +import groovy.test.GroovyTestCase import org.apache.groovy.json.internal.Exceptions.JsonInternalException class ReaderCharacterSourceTest extends GroovyTestCase { diff --git a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy index 0205d47..c96808d 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy @@ -34,6 +34,7 @@ import java.util.logging.StreamHandler * * @see GroovyLogTestCaseTest */ +@Deprecated class GroovyLogTestCase extends GroovyTestCase { /** diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy index 0205d47..e2241a1 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.lang +package groovy.test import java.util.logging.Handler import java.util.logging.Level @@ -31,16 +31,14 @@ import java.util.logging.StreamHandler * do some proper logging. * As a measure of last resort, it can be used on MetaClass to spoof * it's log entries on 'invokeMethod'. - * - * @see GroovyLogTestCaseTest */ class GroovyLogTestCase extends GroovyTestCase { /** - * Execute the given Closure with the according level for the Logger that - * is qualified by the qualifier and return the log output as a String. - * Qualifiers are usually package or class names. - * Existing log level and handlers are restored after execution. + * Execute the given Closure with the according level for the Logger that + * is qualified by the qualifier and return the log output as a String. + * Qualifiers are usually package or class names. + * Existing log level and handlers are restored after execution. */ static String stringLog(Level level, String qualifier, Closure yield) { // store old values diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy index e2254e4..d994a0f 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.test /** * Groovy test case, which recreates internal GroovyShell in each setUp() diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy index b1e3a2a..0a1a58c 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.test import java.util.regex.Pattern diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy index d2b4a93..d66440a 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.test import junit.framework.Test import junit.framework.TestSuite diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/StringTestUtil.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/StringTestUtil.groovy index 0a575c4..c8fc9ca 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/test/StringTestUtil.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/test/StringTestUtil.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.test import org.junit.Assert diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy index e2254e4..c313763 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy @@ -21,6 +21,8 @@ package groovy.util /** * Groovy test case, which recreates internal GroovyShell in each setUp() */ + +@Deprecated class GroovyShellTestCase extends GroovyTestCase { @Delegate protected GroovyShell shell diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy index b1e3a2a..df83633 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy @@ -29,6 +29,7 @@ import java.util.regex.Pattern * tag will have the javadoc {@code code} tag stripped. Similarly, html entities are converted back when extracting * code, so {@code <} and {@code >} will be converted to {@code <} and {@code >}. */ +@Deprecated class JavadocAssertionTestBuilder { // TODO write tests for this classes functionality private static final Pattern javadocPattern = 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 d2b4a93..5e813e7 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy @@ -44,6 +44,7 @@ import junit.textui.TestRunner * * <b>Note: this class requires the Ant module at runtime.</b> */ +@Deprecated class JavadocAssertionTestSuite extends TestSuite { /** The System Property to set as base directory for collection of Classes. * The pattern will be used as an Ant fileset include basedir. diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy index 0a575c4..a49ac12 100644 --- a/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy +++ b/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy @@ -20,6 +20,7 @@ package groovy.util import org.junit.Assert +@Deprecated class StringTestUtil { static void assertMultilineStringsEqual(String a, String b) { def aLines = a.trim().replaceAll('\r','').split('\n') diff --git a/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java index b721573..dc816bc 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util; +package groovy.test; import groovy.lang.GroovyClassLoader; import groovy.lang.Script; +import groovy.util.IFileNameFinder; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java index 383efcb..b8baf35 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util; +package groovy.test; import groovy.lang.Closure; import groovy.test.GroovyAssert; diff --git a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java index 50e5a2c..24b2535 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util; +package groovy.test; import groovy.lang.GroovyClassLoader; import groovy.lang.Script; 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 b721573..afd62d0 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java @@ -46,6 +46,7 @@ import java.util.logging.Logger; * <p> * See also groovy.util.AllTestSuiteTest.groovy */ +@Deprecated public class AllTestSuite extends TestSuite { /** diff --git a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java index 383efcb..76dc45e 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java @@ -34,6 +34,7 @@ import java.util.logging.Logger; * * @see groovy.test.GroovyAssert */ +@Deprecated public class GroovyTestCase extends TestCase { protected static Logger log = Logger.getLogger(GroovyTestCase.class.getName()); 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 50e5a2c..f8ce24e 100644 --- a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java +++ b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java @@ -29,7 +29,6 @@ import java.io.File; import java.security.AccessController; import java.security.PrivilegedAction; - /** * A TestSuite which will run a Groovy unit test case inside any Java IDE * either as a unit test case or as an application. @@ -46,6 +45,7 @@ import java.security.PrivilegedAction; * -Dtest=src/test/Foo.groovy * </code> */ +@Deprecated public class GroovyTestSuite extends TestSuite { protected static String file = null; diff --git a/subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy similarity index 91% rename from subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy rename to subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy index 63e9ede..1ee15b0 100644 --- a/subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy +++ b/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.test import java.util.logging.Level @@ -36,8 +36,8 @@ class AllTestSuiteTest extends GroovyLogTestCase { } void testSuiteForThisFileOnly() { - def result = stringLog(Level.FINEST, 'groovy.util.AllTestSuite') { - withProps('src/test/groovy/groovy/util', 'AllTestSuiteTest.groovy') { + def result = stringLog(Level.FINEST, 'groovy.test.AllTestSuite') { + withProps('src/test/groovy/groovy/test', 'AllTestSuiteTest.groovy') { suite = AllTestSuite.suite() } } @@ -48,7 +48,7 @@ class AllTestSuiteTest extends GroovyLogTestCase { } void testAddingScriptsThatDoNotInheritFromTestCase() { - withProps('src/test/groovy/groovy/util', 'suite/*.groovy') { + withProps('src/test/groovy/groovy/test', 'suite/*.groovy') { suite = AllTestSuite.suite() } assert suite diff --git a/subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyLogTestCaseTest.groovy similarity index 98% rename from subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy rename to subprojects/groovy-test/src/test/groovy/groovy/test/GroovyLogTestCaseTest.groovy index 74d1367..37cf85c 100644 --- a/subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy +++ b/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyLogTestCaseTest.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.lang +package groovy.test import java.util.logging.Level import java.util.logging.Logger diff --git a/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyTestCaseTest.groovy similarity index 99% rename from subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy rename to subprojects/groovy-test/src/test/groovy/groovy/test/GroovyTestCaseTest.groovy index e1093f2..9c04ba7 100644 --- a/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy +++ b/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyTestCaseTest.groovy @@ -16,6 +16,8 @@ * specific language governing permissions and limitations * under the License. */ +package groovy.test + import junit.framework.AssertionFailedError /** diff --git a/subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/suite/ATestScriptThatsNoTestCase.groovy similarity index 100% rename from subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy rename to subprojects/groovy-test/src/test/groovy/groovy/test/suite/ATestScriptThatsNoTestCase.groovy