You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/17 09:22:55 UTC
[groovy] branch master updated: GROOVY-8647: Split package renaming
(some more tests to use new package for GroovyTestCase)
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
The following commit(s) were added to refs/heads/master by this push:
new e865a69 GROOVY-8647: Split package renaming (some more tests to use new package for GroovyTestCase)
e865a69 is described below
commit e865a6998209bd7709742b1d5978ea1f753f1a31
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 19:22:43 2019 +1000
GROOVY-8647: Split package renaming (some more tests to use new package for GroovyTestCase)
---
.../groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy | 3 ++-
.../groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy | 2 ++
.../src/test/groovy/groovy/ant/FileNameFinderTest.groovy | 2 ++
.../src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java | 2 +-
.../src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java | 10 ++++++++--
.../src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java | 12 ++++++------
.../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy | 1 +
.../src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy | 1 +
.../src/main/groovy/groovy/console/ui/ObjectBrowser.groovy | 2 +-
9 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
index c81db9a..d93c249 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
@@ -18,10 +18,11 @@
*/
package groovy.ant
+import groovy.test.GroovyTestCase
+import groovy.xml.NamespaceBuilder
import org.apache.tools.ant.BuildEvent
import org.apache.tools.ant.Project
import org.apache.tools.ant.ProjectHelper
-import groovy.xml.NamespaceBuilder
import org.apache.tools.ant.UnknownElement
import org.junit.Assert
diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
index 21d3d64..18fb16e 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
@@ -18,6 +18,8 @@
*/
package groovy.ant
+import groovy.test.GroovyTestCase
+
abstract class AntTestCase extends GroovyTestCase {
protected void doInTmpDir(Closure cl) {
// tag::create_zip_builder[]
diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
index c05c4b2..623d00e 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
@@ -18,6 +18,8 @@
*/
package groovy.ant
+import groovy.test.GroovyLogTestCase
+
/**
* Make sure FileNameFinder uses Ant filesets correctly.
*/
diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
index a6a6834..8f9811f 100644
--- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
+++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
@@ -19,7 +19,7 @@
package org.codehaus.groovy.ant;
import groovy.lang.GroovyRuntimeException;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.groovy.io.StringBuilderWriter;
diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
index e3d97bb..e0f25dc 100644
--- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
+++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
@@ -18,12 +18,18 @@
*/
package org.codehaus.groovy.ant;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
import java.util.regex.Pattern;
/**
diff --git a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
index 4a09ebe..0e012a4 100644
--- a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
+++ b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
@@ -90,14 +90,14 @@ public class CacheBSFTest extends TestCase {
}
public void testVariables() throws Exception {
- manager.registerBean("x", new Integer(4));
+ manager.registerBean("x", 4);
Object dontcare = manager.eval("groovy", "Test1.groovy", 0, 0,
"valueOfX = this.bsf.lookupBean('x'); assert valueOfX == 4; valueOfX + 1");
// nothing to really test here...just looking for debug that says it
// used cache version
Object answer = manager.eval("groovy", "Test2.groovy", 0, 0,
"valueOfX = this.bsf.lookupBean('x'); assert valueOfX == 4; valueOfX + 1");
- assertEquals("Incorrect return", new Integer(5), answer);
+ assertEquals("Incorrect return", 5, answer);
}
public void testClassLoaderSet() throws BSFException {
@@ -109,11 +109,11 @@ public class CacheBSFTest extends TestCase {
}
public void testDeclaredVariables() throws Exception {
- manager.declareBean("foo", new Integer(5), Integer.class);
+ manager.declareBean("foo", 5, Integer.class);
Object answer = manager.eval("groovy", "Test1.groovy", 0, 0, "valueOfFoo = foo; return valueOfFoo");
- assertEquals(new Integer(5), answer);
- manager.declareBean("foo", new Integer(6), Integer.class);
+ assertEquals(5, answer);
+ manager.declareBean("foo", 6, Integer.class);
answer = manager.eval("groovy", "Test2.groovy", 0, 0, "valueOfFoo = foo; return valueOfFoo");
- assertEquals(new Integer(6), answer);
+ assertEquals(6, answer);
}
}
diff --git a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
index 0d4d5a5..d23b64a 100644
--- a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
@@ -20,6 +20,7 @@ package groovy.cli.commons
import groovy.cli.Option
import groovy.cli.Unparsed
+import groovy.test.GroovyTestCase
import groovy.transform.ToString
import groovy.transform.TypeChecked
import org.apache.commons.cli.BasicParser
diff --git a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
index 526f6cf..564386a 100644
--- a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
@@ -20,6 +20,7 @@ package groovy.cli.picocli
import groovy.cli.Option
import groovy.cli.Unparsed
+import groovy.test.GroovyTestCase
import groovy.transform.ToString
import groovy.transform.TypeChecked
import picocli.CommandLine.DuplicateOptionAnnotationsException
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/ObjectBrowser.groovy b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/ObjectBrowser.groovy
index 2c117ae..2ac21c1 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/ObjectBrowser.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/ObjectBrowser.groovy
@@ -19,7 +19,7 @@
package groovy.console.ui
import groovy.inspect.Inspector
-import groovy.inspect.swingui.TableSorter
+import groovy.swing.table.TableSorter
import groovy.swing.SwingBuilder
import javax.swing.WindowConstants