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/18 00:46:12 UTC
[groovy] 01/06: GROOVY-8647: Split package renaming (avoid
groovy.xml package in groovy module tests to avoid confusion even though
not a strict requirement)
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 0e4596914c9e6e446c258afa9c112c576ed73fd0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:07:30 2019 +1000
GROOVY-8647: Split package renaming (avoid groovy.xml package in groovy module tests to avoid confusion even though not a strict requirement)
---
src/test/groovy/{xml => util}/XmlAssert.java | 2 +-
.../org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java | 2 +-
.../codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java | 2 +-
src/test/org/codehaus/groovy/classgen/TestSupport.java | 8 ++++++--
.../groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy | 2 +-
.../groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java | 2 +-
.../src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy | 2 +-
7 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/test/groovy/xml/XmlAssert.java b/src/test/groovy/util/XmlAssert.java
similarity index 98%
rename from src/test/groovy/xml/XmlAssert.java
rename to src/test/groovy/util/XmlAssert.java
index f71e658..52b5cd5 100644
--- a/src/test/groovy/xml/XmlAssert.java
+++ b/src/test/groovy/util/XmlAssert.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.xml;
+package groovy.util;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit;
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
index a62f59c..fd9dfef 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.codehaus.groovy.antlr.parser.GroovyTokenTypes;
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
/**
* Testcases for the antlr AST visitor that prints groovy source code nodes as Freemind compatible XML.
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
index 43ba85d..92f8a77 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.antlr.treewalker;
import junit.framework.TestCase;
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
/**
* Testcases for the antlr AST visitor that prints groovy source code nodes as HTML.
diff --git a/src/test/org/codehaus/groovy/classgen/TestSupport.java b/src/test/org/codehaus/groovy/classgen/TestSupport.java
index a984174..a6f19c8 100644
--- a/src/test/org/codehaus/groovy/classgen/TestSupport.java
+++ b/src/test/org/codehaus/groovy/classgen/TestSupport.java
@@ -18,8 +18,12 @@
*/
package org.codehaus.groovy.classgen;
-import groovy.lang.*;
-import groovy.util.GroovyTestCase;
+import groovy.lang.Binding;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyObject;
+import groovy.lang.Script;
+import groovy.test.GroovyTestCase;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.CompileUnit;
import org.codehaus.groovy.ast.FieldNode;
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
index 31ee8e6..02f0df1 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
@@ -24,7 +24,7 @@ import org.xml.sax.InputSource
import javax.xml.transform.stream.StreamSource
-import static groovy.xml.XmlAssert.assertXmlEquals
+import static groovy.util.XmlAssert.assertXmlEquals
import static groovy.xml.XmlUtil.escapeControlCharacters
import static groovy.xml.XmlUtil.escapeXml
import static groovy.xml.XmlUtil.newSAXParser
diff --git a/src/test/groovy/bugs/SeansBug.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
similarity index 98%
rename from src/test/groovy/bugs/SeansBug.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
index 2bb7014..9eb3048 100644
--- a/src/test/groovy/bugs/SeansBug.java
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs;
+package groovy.xml.bugs;
import groovy.lang.GroovyShell;
import org.codehaus.groovy.classgen.TestSupport;
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
index 0fb0220..027817a 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
@@ -24,7 +24,7 @@ import groovy.xml.NamespaceBuilder
import groovy.xml.TestXmlSupport
import groovy.xml.XmlUtil
-import static groovy.xml.XmlAssert.assertXmlEquals
+import static groovy.util.XmlAssert.assertXmlEquals
class NamespaceDOMTest extends TestXmlSupport {