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 cd7c7cb630f38c47b4e4c5f882638634f53bc0d3 Author: Paul King <[email protected]> AuthorDate: Mon Apr 13 14:42:11 2026 +1000 minor refactor: junit5 tests can have slightly cleaner names --- .../src/test/groovy/groovy/xml/DOMTest.groovy | 4 +-- .../test/groovy/groovy/xml/FactorySupportTest.java | 6 ++-- .../groovy/groovy/xml/MarkupWithWriterTest.groovy | 4 +-- .../groovy/xml/NamespaceNodeGPathTest.groovy | 2 +- .../groovy/groovy/xml/NamespaceNodeTest.groovy | 8 ++--- .../groovy/groovy/xml/NavigationXmlTest.groovy | 6 ++-- .../src/test/groovy/groovy/xml/SAXTest.groovy | 4 +-- .../groovy/xml/SafeNumberXmlParserTest.groovy | 2 +- .../groovy/xml/SafeNumberXmlSlurperTest.groovy | 2 +- .../test/groovy/groovy/xml/StaxBuilderTest.groovy | 4 +-- .../groovy/xml/StreamingSAXBuilderTest.groovy | 6 ++-- .../groovy/xml/UseMarkupWithWriterScript.groovy | 2 +- .../test/groovy/groovy/xml/VerboseDOMTest.groovy | 4 +-- .../groovy/groovy/xml/XmlNodePrinterTest.groovy | 34 +++++++++---------- .../groovy/groovy/xml/XmlParserFactoryTest.groovy | 2 +- .../test/groovy/groovy/xml/XmlParserTest.groovy | 34 +++++++++---------- .../groovy/groovy/xml/XmlSlurperFactoryTest.groovy | 2 +- .../test/groovy/groovy/xml/XmlSlurperTest.groovy | 38 +++++++++++----------- .../src/test/groovy/groovy/xml/XmlUtilTest.groovy | 8 ++--- .../groovy/xml/benchmark/BuilderPerfTest.groovy | 2 +- .../groovy/groovy/xml/bugs/Groovy249_Bug.groovy | 4 +-- .../groovy/groovy/xml/bugs/Groovy593_Bug.groovy | 2 +- .../groovy/groovy/xml/bugs/Groovy_2473Bug.groovy | 2 +- .../groovy/groovy/xml/bugs/MarkupInScriptBug.java | 2 +- .../src/test/groovy/groovy/xml/bugs/SeansBug.java | 4 +-- .../groovy/groovy/xml/bugs/StaticMarkupBug.groovy | 2 +- .../groovy/groovy/xml/bugs/TedsClosureBug.groovy | 2 +- .../groovy/groovy/xml/dom/DOMCategoryTest.groovy | 28 ++++++++-------- .../src/test/groovy/groovy/xml/dom/DOMTest.groovy | 14 ++++---- .../groovy/groovy/xml/dom/NamespaceDOMTest.groovy | 6 ++-- .../apache/groovy/xml/tools/DomToGroovyTest.groovy | 4 +-- 31 files changed, 122 insertions(+), 122 deletions(-) diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy index a56eba0dbd..c7ec6316f8 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test final class DOMTest extends TestXmlSupport { @Test - void testSmallTree() { + void smallTree() { def b = DOMBuilder.newInstance() def root = b.root1(a:5, b:7) { @@ -42,7 +42,7 @@ final class DOMTest extends TestXmlSupport { } @Test - void testTree() { + void tree() { def b = DOMBuilder.newInstance() def root = b.root2(a:5, b:7) { diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java index 87efd51eda..01c4ba9ce5 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java @@ -33,13 +33,13 @@ public class FactorySupportTest { private static final ParserConfigurationException PARSER_CONFIGURATION_EXCEPTION = new ParserConfigurationException(); @Test - public void testCreatesFactories() throws Exception { + public void createsFactories() throws Exception { assertNotNull(FactorySupport.createDocumentBuilderFactory()); assertNotNull(FactorySupport.createSaxParserFactory()); } @Test - public void testParserConfigurationExceptionNotWrapped() throws ParserConfigurationException { + public void parserConfigurationExceptionNotWrapped() throws ParserConfigurationException { try { FactorySupport.createFactory(new PrivilegedExceptionAction() { public Object run() throws Exception { @@ -53,7 +53,7 @@ public class FactorySupportTest { } @Test - public void testOtherExceptionsWrappedAsUnchecked() throws ParserConfigurationException { + public void otherExceptionsWrappedAsUnchecked() throws ParserConfigurationException { try { FactorySupport.createFactory(new PrivilegedExceptionAction() { public Object run() throws Exception { diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy index 6c861b6c99..dabbc08547 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals final class MarkupWithWriterTest extends TestXmlSupport { @Test - void testSmallTreeWithStringWriter() { + void smallTreeWithStringWriter() { def writer = new java.io.StringWriter() def b = new MarkupBuilder(writer) @@ -45,7 +45,7 @@ final class MarkupWithWriterTest extends TestXmlSupport { } @Test - void testWriterUseInScriptFile() { + void writerUseInScriptFile() { assertScriptFile 'src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy' } } diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy index 15061719d4..fe80a2c2cb 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test final class NamespaceNodeGPathTest extends TestXmlSupport { @Test - void testTree() { + void tree() { Node root = new XmlParser().parseText(""" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";> <xsd:annotation xsd:cheese="Edam"> diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy index 6a26eccf85..f9b45ceb24 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test final class NamespaceNodeTest extends TestXmlSupport { @Test - void testNodeBuilderWithNamespace() { + void nodeBuilderWithNamespace() { def n = new Namespace('http://foo/bar') def builder = NamespaceBuilder.newInstance(new NodeBuilder(), n.uri) def result = builder.outer(id: "3") { @@ -39,7 +39,7 @@ final class NamespaceNodeTest extends TestXmlSupport { } @Test - void testTree() { + void tree() { def builder = NodeBuilder.newInstance() def xmlns = new NamespaceBuilder(builder) def xsd = xmlns.namespace('http://www.w3.org/2001/XMLSchema', 'xsd') @@ -88,7 +88,7 @@ final class NamespaceNodeTest extends TestXmlSupport { } @Test - void testNodeBuilderWithImplicitNamespace() { + void nodeBuilderWithImplicitNamespace() { def n = new Namespace('http://foo/bar') def builder = NamespaceBuilder.newInstance(new NodeBuilder(), n.uri) @@ -112,7 +112,7 @@ final class NamespaceNodeTest extends TestXmlSupport { } @Test - void testNamespaceBuilderWithoutNamespace() { + void namespaceBuilderWithoutNamespace() { def builder = NamespaceBuilder.newInstance(new NodeBuilder()) def result = builder.outer(id: "3") { inner(name: "foo") diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NavigationXmlTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NavigationXmlTest.groovy index 26b8180ad6..87d339fc32 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/NavigationXmlTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NavigationXmlTest.groovy @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test */ class NavigationXmlTest { @Test - void testPrePostOrder() { + void prePostOrder() { def root = createTreeFromXmlParser() def combos = [[false, true], ['depthFirst', 'breadthFirst']].combinations() def actual = combos.collect{ preorder, type -> @@ -44,7 +44,7 @@ class NavigationXmlTest { } @Test - void testPrePostOrderWithClosure() { + void prePostOrderWithClosure() { def root = createTreeFromXmlParser() def combos = [[false, true], ['depthFirst', 'breadthFirst']].combinations() def actual = combos.collect{ preorder, type -> @@ -62,7 +62,7 @@ class NavigationXmlTest { } @Test - void testLevelWithClosure() { + void levelWithClosure() { def root = createTreeFromXmlParser() def result = [:].withDefault { [] } root.depthFirst { node, index -> diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy index 80aa313fbe..2c661e96d4 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test final class SAXTest extends TestXmlSupport { @Test - void testSmallTree() { + void smallTree() { def b = createSAXBuilder() def root = b.root1(a:5, b:7) { @@ -38,7 +38,7 @@ final class SAXTest extends TestXmlSupport { } @Test - void testTree() { + void tree() { def b = createSAXBuilder() def root = b.root2(a:5, b:7) { diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlParserTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlParserTest.groovy index bacd6599a6..4baf146650 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlParserTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlParserTest.groovy @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test class SafeNumberXmlParserTest { @Test - void testSafetyWhenConvertingToNumbers() { + void safetyWhenConvertingToNumbers() { def xmlText = ''' <someNumberValues> <someBigDecimal>123.4</someBigDecimal> diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlSlurperTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlSlurperTest.groovy index dde1368ba6..06fb69a4e1 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlSlurperTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SafeNumberXmlSlurperTest.groovy @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test class SafeNumberXmlSlurperTest { @Test - void testSafetyWhenConvertingToNumbers() { + void safetyWhenConvertingToNumbers() { def xmlText = ''' <someNumberValues> <someBigDecimal>123.4</someBigDecimal> diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/StaxBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StaxBuilderTest.groovy index 11ca94b93d..ab7bcbdacd 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/StaxBuilderTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StaxBuilderTest.groovy @@ -32,7 +32,7 @@ import javax.xml.stream.XMLOutputFactory class StaxBuilderTest { @Test - void testJava6() { + void java6() { def factory = XMLOutputFactory.newInstance() def writer = new StringWriter() def builder = new StaxBuilder(factory.createXMLStreamWriter(writer)) @@ -48,7 +48,7 @@ class StaxBuilderTest { } // @Grab('org.codehaus.jettison:jettison:1.2') -// void testJettison() { +// void jettison() { // def conv = new MappedNamespaceConvention() // def writer = new StringWriter() // def mappedWriter = new MappedXMLStreamWriter(conv, writer) diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy index 9fe3deaea3..753c17103e 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy @@ -29,7 +29,7 @@ import javax.xml.transform.stream.StreamResult class StreamingSAXBuilderTest { @Test - void testDefaultSerialization() { + void defaultSerialization() { def handler = TransformerFactory.newInstance().newTransformerHandler() def outstream = new ByteArrayOutputStream() handler.setResult(new StreamResult(outstream)) @@ -48,7 +48,7 @@ class StreamingSAXBuilderTest { } @Test - void testDefaultSerializationNamespaces() { + void defaultSerializationNamespaces() { def handler = TransformerFactory.newInstance().newTransformerHandler() def outstream = new ByteArrayOutputStream() handler.setResult(new StreamResult(outstream)) @@ -69,7 +69,7 @@ class StreamingSAXBuilderTest { } @Test - void testCustomHandler() { + void customHandler() { def visited = [] def handler = [ startDocument: {-> diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy index 00f03b6377..1f62fda8ab 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy @@ -18,7 +18,7 @@ */ package groovy.xml -// used by MarkupWithWriterTest.testWriterUseInScriptFile +// used by MarkupWithWriterTest.writerUseInScriptFile writer = new StringWriter() b = new MarkupBuilder(writer) diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy index 3c9068892c..7c6aabf08c 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test final class VerboseDOMTest extends TestXmlSupport { @Test - void testSmallTree() { + void smallTree() { def b = DOMBuilder.newInstance() def root = b.root1(['a':5, 'b':7], {-> @@ -42,7 +42,7 @@ final class VerboseDOMTest extends TestXmlSupport { } @Test - void testTree() { + void tree() { def b = DOMBuilder.newInstance() def root = b.root2(['a':5, 'b':7], { diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlNodePrinterTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlNodePrinterTest.groovy index a588e11273..c1d7d0ce74 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlNodePrinterTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlNodePrinterTest.groovy @@ -104,12 +104,12 @@ class XmlNodePrinterTest { } @Test - void testNamespacesDefault() { + void namespacesDefault() { checkRoundtrip namespaceInput, namespaceInput } @Test - void testNamespacesPreserving() { + void namespacesPreserving() { parser.trimWhitespace = false parser.keepIgnorableWhitespace = true setUpNoindentingPrinter() @@ -117,25 +117,25 @@ class XmlNodePrinterTest { } @Test - void testNamespacesDisabledOnParsing() { + void namespacesDisabledOnParsing() { parser = new XmlParser(false, false) parser.trimWhitespace = true checkRoundtrip namespaceInput, namespaceInput } @Test - void testNamespacesDisabledOnPrinting() { + void namespacesDisabledOnPrinting() { printer.namespaceAware = false checkRoundtrip namespaceInput, noNamespaceInputVerbose } @Test - void testWithoutNamespacesVerboseInDefaultOut() { + void withoutNamespacesVerboseInDefaultOut() { checkRoundtrip noNamespaceInputVerbose, noNamespaceInputVerbose } @Test - void testWithoutNamespacesVerbosePreserving() { + void withoutNamespacesVerbosePreserving() { parser.trimWhitespace = false parser.keepIgnorableWhitespace = true setUpNoindentingPrinter() @@ -143,64 +143,64 @@ class XmlNodePrinterTest { } @Test - void testWithoutNamespacesVerboseInPreserveOut() { + void withoutNamespacesVerboseInPreserveOut() { printer.preserveWhitespace = true checkRoundtrip noNamespaceInputVerbose, noNamespaceInputCompact } @Test - void testWithoutNamespacesCompactInPreserveOut() { + void withoutNamespacesCompactInPreserveOut() { printer.preserveWhitespace = true checkRoundtrip noNamespaceInputCompact, noNamespaceInputCompact } @Test - void testNoExpandOfEmptyElements() { + void noExpandOfEmptyElements() { checkRoundtrip emptyTagExpanded, emptyTagCompact } @Test - void testExpandEmptyElements() { + void expandEmptyElements() { printer.expandEmptyElements = true checkRoundtrip emptyTagExpanded, emptyTagExpanded } @Test - void testWithoutNamespacesCompactInDefaultOut() { + void withoutNamespacesCompactInDefaultOut() { checkRoundtrip noNamespaceInputCompact, noNamespaceInputVerbose } @Test - void testAttributeWithQuot() { + void attributeWithQuot() { printer = new XmlNodePrinter(pw, " ", "\"") checkRoundtrip attributeInput, attributeExpectedOutputQuot } @Test - void testAttributeWithApos() { + void attributeWithApos() { printer = new XmlNodePrinter(pw, " ", "'") checkRoundtrip attributeInput, attributeExpectedOutputApos } @Test - void testAttributeWithNewline() { + void attributeWithNewline() { checkRoundtrip attributeWithNewlineInput, attributeWithNewlineExpectedOutput } @Test - void testContentWithSpecialSymbolsApos() { + void contentWithSpecialSymbolsApos() { printer = new XmlNodePrinter(pw, " ", "'") checkRoundtrip tagWithSpecialChars, tagWithSpecialChars } @Test - void testContentWithSpecialSymbolsQuot() { + void contentWithSpecialSymbolsQuot() { printer = new XmlNodePrinter(pw, " ", "\"") checkRoundtrip tagWithSpecialChars, tagWithSpecialChars } @Test - void testAttributeWithNamespaceInput() { + void attributeWithNamespaceInput() { checkRoundtrip attributeWithNamespaceInput, attributeWithNamespaceInput } diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserFactoryTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserFactoryTest.groovy index 211dbafb1e..2ebc987c99 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserFactoryTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserFactoryTest.groovy @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test class XmlParserFactoryTest { @Test - void testCreateParser() { + void createParser() { def xml = '<root><old/></root>' def parser = XmlParserFactory.newParser() def root = parser.parseText(xml) diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserTest.groovy index dc32462cf7..1096cb6947 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlParserTest.groovy @@ -55,7 +55,7 @@ class XmlParserTest { """ @Test - void testNodePrinter() { + void nodePrinter() { def text = """ <p>Please read the <a href="index.html">Home</a> page</p> """ @@ -76,7 +76,7 @@ p() { } @Test - void testXmlNodePrinter() { + void xmlNodePrinter() { def text = """ <p>Please read the <a href="index.html">Home</a> page</p> """ @@ -97,7 +97,7 @@ p() { } @Test - void testXmlNodePrinterNamespaces() { + void xmlNodePrinterNamespaces() { def html = new XmlParser(trimWhitespace: true).parseText(bookXml) StringWriter sw = new StringWriter() new XmlNodePrinter(new PrintWriter(sw)).print(html) @@ -178,7 +178,7 @@ p() { } @Test - void testNamespaceGPath() { + void namespaceGPath() { def anyName = new QName("*", "*") def anyHtml = new QName("http://www.w3.org/HTML/1998/html4";, "*") def anyTitle = new QName("*", "title") @@ -205,7 +205,7 @@ p() { } @Test - void testElement() { + void element() { GpathSyntaxTestSupport.checkUpdateElementValue(getRoot) GpathSyntaxTestSupport.checkElement(getRoot) GpathSyntaxTestSupport.checkFindElement(getRoot) @@ -216,46 +216,46 @@ p() { } @Test - void testAttribute() { + void attribute() { GpathSyntaxTestSupport.checkAttribute(getRoot) GpathSyntaxTestSupport.checkAttributes(getRoot) GpathSyntaxTestSupport.checkAttributeTruth(getRoot) } @Test - void testNavigation() { + void navigation() { GpathSyntaxTestSupport.checkChildren(getRoot) GpathSyntaxTestSupport.checkParent(getRoot) GpathSyntaxTestSupport.checkNestedSizeExpressions(getRoot) } @Test - void testTraversal() { + void traversal() { TraversalTestSupport.checkDepthFirst(getRoot) TraversalTestSupport.checkBreadthFirst(getRoot) } @Test - void testIndices() { + void indices() { GpathSyntaxTestSupport.checkNegativeIndices(getRoot) GpathSyntaxTestSupport.checkRangeIndex(getRoot) } @Test - void testReplacementsAndAdditions() { + void replacementsAndAdditions() { GpathSyntaxTestSupport.checkReplaceNode(getRoot) GpathSyntaxTestSupport.checkReplaceMultipleNodes(getRoot) GpathSyntaxTestSupport.checkPlus(getRoot) } @Test - void testMixedMarkup() { + void mixedMarkup() { MixedMarkupTestSupport.checkMixedMarkup(getRoot) MixedMarkupTestSupport.checkMixedMarkupText(getRoot) } @Test - void testWhitespaceTrimming() { + void whitespaceTrimming() { def text = '<outer><inner> Here is some text </inner></outer>' def parser = new XmlParser(trimWhitespace: true) def outer = parser.parseText(text) @@ -266,7 +266,7 @@ p() { } @Test - void testUpdate() { + void update() { def xml = '<root></root>' def parser = new XmlParser() def root = parser.parseText(xml) @@ -296,7 +296,7 @@ p() { } @Test - void testReplaceNode() { + void replaceNode() { def xml = '<root><old/></root>' def parser = new XmlParser() def root = parser.parseText(xml) @@ -319,14 +319,14 @@ p() { } @Test - void testXmlParserExtensionPoints() { + void xmlParserExtensionPoints() { def html = new CustomXmlParser().parseText(bookXml) assert html.getClass() == CustomNode assert html.name() == new Integer(42) } @Test - void testCloning() { + void cloning() { def xml = '<root><foo bar="baz"><inner/></foo></root>' def parser = new XmlParser() def root = parser.parseText(xml) @@ -345,7 +345,7 @@ p() { } @Test - void testNamedParameterConstruction() { + void namedParameterConstruction() { def xml = '<root><item name="test">value</item></root>' // named parameters via setters diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperFactoryTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperFactoryTest.groovy index c25d111eaf..237e858644 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperFactoryTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperFactoryTest.groovy @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test class XmlSlurperFactoryTest { @Test - void testCreateParser() { + void createParser() { def xml = '<root><old/></root>' def slurper = XmlSlurperFactory.newSlurper(true, true) def root = slurper.parseText(xml) diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperTest.groovy index f12863b7a8..54e2905525 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlSlurperTest.groovy @@ -29,7 +29,7 @@ final class XmlSlurperTest { final Closure<GPathResult> getRoot = { String xml -> new XmlSlurper().parseText(xml) } @Test - void testWsdl() { + void wsdl() { def wsdl = ''' <definitions name="AgencyManagementService" xmlns:ns1="http://www.example.org/NS1"; @@ -58,7 +58,7 @@ final class XmlSlurperTest { } @Test - void testElement() { + void element() { // can't update value directly with XmlSlurper, use replaceNode instead // GpathSyntaxTestSupport.checkUpdateElementValue(getRoot) GpathSyntaxTestSupport.checkElement(getRoot) @@ -70,7 +70,7 @@ final class XmlSlurperTest { } @Test - void testAttribute() { + void attribute() { GpathSyntaxTestSupport.checkAttribute(getRoot) GpathSyntaxTestSupport.checkAttributes(getRoot) GpathSyntaxTestSupport.checkAttributeTruth(getRoot) @@ -78,7 +78,7 @@ final class XmlSlurperTest { // GROOVY-11667 @Test - void testAttribute2() { + void attribute2() { def xml = ''' <person> <name>John Doe</name> @@ -99,39 +99,39 @@ final class XmlSlurperTest { } @Test - void testNavigation() { + void navigation() { GpathSyntaxTestSupport.checkChildren(getRoot) GpathSyntaxTestSupport.checkParent(getRoot) GpathSyntaxTestSupport.checkNestedSizeExpressions(getRoot) } @Test - void testTraversal() { + void traversal() { TraversalTestSupport.checkDepthFirst(getRoot) TraversalTestSupport.checkBreadthFirst(getRoot) } @Test - void testIndices() { + void indices() { GpathSyntaxTestSupport.checkNegativeIndices(getRoot) GpathSyntaxTestSupport.checkRangeIndex(getRoot) } @Test - void testReplacementsAndAdditions() { + void replacementsAndAdditions() { GpathSyntaxTestSupport.checkReplaceNode(getRoot) GpathSyntaxTestSupport.checkReplaceMultipleNodes(getRoot) GpathSyntaxTestSupport.checkPlus(getRoot) } @Test - void testMixedMarkup() { + void mixedMarkup() { MixedMarkupTestSupport.checkMixedMarkup(getRoot) MixedMarkupTestSupport.checkMixedMarkupText(getRoot) } @Test - void testReplace() { + void replace() { def input = "<doc><sec>Hello<p>World</p></sec></doc>" def replaceSlurper = new XmlSlurper().parseText(input) replaceSlurper.sec.replaceNode { node -> @@ -143,7 +143,7 @@ final class XmlSlurperTest { } @Test - void testNamespacedName() { + void namespacedName() { def wsdl = ''' <definitions name="AgencyManagementService" xmlns:ns1="http://www.example.org/NS1"; @@ -165,7 +165,7 @@ final class XmlSlurperTest { // GROOVY-4637 @Test - void testNamespacedAttributes() { + void namespacedAttributes() { def xml = """ <RootElement xmlns="http://www.ivan.com/ns1"; xmlns:two="http://www.ivan.com/ns2";> <ChildElement ItemId="FirstItemId" two:ItemId="SecondItemId">Child element data</ChildElement> @@ -180,7 +180,7 @@ final class XmlSlurperTest { // GROOVY-6255 @Test - void testXmlNamespacedAttributes() { + void xmlNamespacedAttributes() { def xml = ''' <appendix version="5.0" xmlns="http://docbook.org/ns/docbook"; xmlns:xml="http://www.w3.org/XML/1998/namespace";> <section xml:id="a"/> @@ -194,7 +194,7 @@ final class XmlSlurperTest { // GROOVY-6356 @Test - void testSetAndRemoveAttributesWithNamespace() { + void setAndRemoveAttributesWithNamespace() { def xmlSource = '''<bob:root xmlns:bob="stuff" xmlns:gmi="http://www.isotc211.org/2005/gmi"; @@ -217,7 +217,7 @@ final class XmlSlurperTest { // GROOVY-6356 @Test - void testSetAndRemoveAttributesNamespaceUnaware() { + void setAndRemoveAttributesNamespaceUnaware() { def xmlSource = '''<bob:root xmlns:bob="stuff" xmlns:gmi="http://www.isotc211.org/2005/gmi"; @@ -237,7 +237,7 @@ final class XmlSlurperTest { // GROOVY-5931 @Test - void testIterableGPathResult() { + void iterableGPathResult() { def xml = ''' <RootElement> <ChildElement ItemId="FirstItemId">Child element data</ChildElement> @@ -256,7 +256,7 @@ final class XmlSlurperTest { // GROOVY-7781 @Test - void testNamespacedAttributesAccessedWithDifferentPrefix() { + void namespacedAttributesAccessedWithDifferentPrefix() { def xml = ''' <x:root xmlns:x="blah"> <x:child x:id="1">c</x:child> @@ -269,7 +269,7 @@ final class XmlSlurperTest { } @Test - void testParsePath() { + void parsePath() { File file = File.createTempFile('test','xml') file.deleteOnExit() file.text = ''' @@ -301,7 +301,7 @@ final class XmlSlurperTest { } @Test - void testNamedParameterConstruction() { + void namedParameterConstruction() { def xml = '<root><item name="test">value</item></root>' // named parameters via setters 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 64c2429a80..fc1517ffb2 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy @@ -40,7 +40,7 @@ class XmlUtilTest { // GROOVY-5158 @Test - void testSerializeOfGPathResultShouldRoundTrip() { + void serializeOfGPathResultShouldRoundTrip() { def source = new InputSource(new StringReader(xml)) source.encoding = "UTF-8" assertXmlEquals(xml, XmlUtil.serialize(new XmlSlurper().parse(source))) @@ -50,7 +50,7 @@ class XmlUtilTest { // GROOVY-10132 @Test - void testSerializeOfSurrogate() { + void serializeOfSurrogate() { def source = new InputSource(new StringReader(xml2)) source.encoding = "UTF-8" assertXmlEquals(xml2, XmlUtil.serialize(new XmlSlurper().parse(source))) @@ -58,7 +58,7 @@ class XmlUtilTest { // GROOVY-5361 @Test - void testSchemaValidationUtilityMethod() { + void schemaValidationUtilityMethod() { Locale dl = Locale.getDefault() Locale.setDefault(Locale.ENGLISH) @@ -106,7 +106,7 @@ class XmlUtilTest { // GROOVY-5775 @Test - void testEscaping() { + void escaping() { def ans = escapeControlCharacters(escapeXml('"bread" & "butter"\r\n\u0000\u001f')) assert ans == '"bread" & "butter" �' } diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/benchmark/BuilderPerfTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/benchmark/BuilderPerfTest.groovy index a3fc201024..17344e0785 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/benchmark/BuilderPerfTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/benchmark/BuilderPerfTest.groovy @@ -39,7 +39,7 @@ class BuilderPerfTest { } @Test - void testMe () { + void me () { long start = System.currentTimeMillis() def writer 5000.times({ diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy249_Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy249_Bug.groovy index 56facf857c..6ae10b8a9e 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy249_Bug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy249_Bug.groovy @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test class Groovy249_Bug { @Test - void testBug() { + void bug() { def t = new Bean249() t.b = "hello" @@ -44,7 +44,7 @@ class Groovy249_Bug { /** @todo don't know why this fails @Test - void testBugInScript() { + void bugInScript() { assertScript <<<EOF import groovy.xml.MarkupBuilder; diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy593_Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy593_Bug.groovy index 5a0a29d42c..701bf5362b 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy593_Bug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy593_Bug.groovy @@ -44,7 +44,7 @@ class Groovy593_Bug { </chars>""" @Test - void testBug() { + void bug() { // XML characters to test with chars.chars { ampersand(a: "&", "&") diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy_2473Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy_2473Bug.groovy index cf1790a3b2..e172ed0231 100755 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy_2473Bug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/Groovy_2473Bug.groovy @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals class Groovy_2473Bug { @Test - void testBug() { + void bug() { def w = new StringWriter() def b = new StreamingMarkupBuilder() diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/MarkupInScriptBug.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/MarkupInScriptBug.java index 326d6876ef..852573b67b 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/MarkupInScriptBug.java +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/MarkupInScriptBug.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; final class MarkupInScriptBug extends TestSupport { @Test - void testBug() throws Exception { + void bug() throws Exception { assertScriptFile("src/test/groovy/groovy/xml/script/AtomTestScript.groovy"); } } diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java index 48073347ad..d879dbf4a4 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java @@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test; final class SeansBug { @Test - void testBug() throws Exception { + void bug() throws Exception { String code = "for (i in 1..10) \n{\n println(i)\n}"; GroovyShell shell = new GroovyShell(); shell.evaluate(code); } @Test - void testMarkupBug() throws Exception { + void markupBug() throws Exception { String[] lines = { "package groovy.xml", diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/StaticMarkupBug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/StaticMarkupBug.groovy index 0f72e6d0fa..7eda2c7120 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/StaticMarkupBug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/StaticMarkupBug.groovy @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test class StaticMarkupBug { @Test - void testBug() { + void bug() { doMarkup(new MarkupBuilder()) } diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/TedsClosureBug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/TedsClosureBug.groovy index 68d2226ad5..1c75d88cd2 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/TedsClosureBug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/TedsClosureBug.groovy @@ -52,7 +52,7 @@ class TedsClosureBug { </atom>''' @Test - void testBug() { + void bug() { def f = new Feed() f.author = new Person(name:'Ted Leung',url:'http://www.sauria.com/blog', email:'[email protected]') f.entries = [ new Entry(title:'one',summary:'first post'), new Entry(title:'two',summary:'the second post'), new Entry(title:'three', summary:'post the third'), new Entry(title:'four',summary:'the ponderous fourth post') ] diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy index ece7e0b56d..b4e3ea9163 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy @@ -40,7 +40,7 @@ class DOMCategoryTest { } @Test - void testReplacementsAndAdditions() { + void replacementsAndAdditions() { use(DOMCategory) { GpathSyntaxTestSupport.checkReplaceNode(getRoot) GpathSyntaxTestSupport.checkReplaceMultipleNodes(getRoot) @@ -49,7 +49,7 @@ class DOMCategoryTest { } @Test - void testMixedMarkup() { + void mixedMarkup() { use(DOMCategory) { MixedMarkupTestSupport.checkMixedMarkup(getRoot) MixedMarkupTestSupport.checkMixedMarkupText(getRoot) @@ -57,7 +57,7 @@ class DOMCategoryTest { } @Test - void testElement() { + void element() { use(DOMCategory) { GpathSyntaxTestSupport.checkUpdateElementValue(getRoot) GpathSyntaxTestSupport.checkElement(getRoot) @@ -70,7 +70,7 @@ class DOMCategoryTest { } @Test - void testAttribute() { + void attribute() { use(DOMCategory) { GpathSyntaxTestSupport.checkAttribute(getRoot) GpathSyntaxTestSupport.checkAttributes(getRoot) @@ -79,7 +79,7 @@ class DOMCategoryTest { } @Test - void testIndices() { + void indices() { use(DOMCategory) { GpathSyntaxTestSupport.checkNegativeIndices(getRoot) GpathSyntaxTestSupport.checkRangeIndex(getRoot) @@ -87,7 +87,7 @@ class DOMCategoryTest { } @Test - void testNavigation() { + void navigation() { use(DOMCategory) { GpathSyntaxTestSupport.checkChildren(getRoot) GpathSyntaxTestSupport.checkParent(getRoot) @@ -96,7 +96,7 @@ class DOMCategoryTest { } @Test - void testTraversal() { + void traversal() { use(DOMCategory) { TraversalTestSupport.checkDepthFirst(getRoot) TraversalTestSupport.checkBreadthFirst(getRoot) @@ -104,7 +104,7 @@ class DOMCategoryTest { } @Test - void testGetOnMapWithDomCategory() { + void getOnMapWithDomCategory() { Map ids = [:] ids.put("try", "sample1") assert ids.get("try") == "sample1" @@ -119,7 +119,7 @@ class DOMCategoryTest { } @Test - void testGetOnNonNodesWithDomCategory() { + void getOnNonNodesWithDomCategory() { def myFoo = new Foo() assert myFoo.get("bar") == 3 use(DOMCategory) { @@ -129,7 +129,7 @@ class DOMCategoryTest { /** Test for GROOVY-3109 */ @Test - void testAccessToUnknownPropertyInAScriptWithDomCategory() { + void accessToUnknownPropertyInAScriptWithDomCategory() { assertScript """ import groovy.xml.dom.DOMCategory @@ -146,7 +146,7 @@ class DOMCategoryTest { /** Test for GROOVY-3109 */ @Test - void testAccessToUnknownPropertyInAClassWithDomCategory() { + void accessToUnknownPropertyInAClassWithDomCategory() { assertScript """ import groovy.xml.dom.DOMCategory @@ -169,7 +169,7 @@ class DOMCategoryTest { } @Test - void testXPathWithDomCategory() { + void xPathWithDomCategory() { def reader = new StringReader('<a><b>B1</b><b>B2</b><c a1="4" a2="true">C</c></a>') def root = DOMBuilder.parse(reader).documentElement use(DOMCategory) { @@ -184,7 +184,7 @@ class DOMCategoryTest { } @Test - void testDomCategoryNameWithNodes() { + void domCategoryNameWithNodes() { def reader = new StringReader('<a><b>B1</b><b>B2</b></a>') def a = DOMBuilder.parse(reader).documentElement use(DOMCategory) { @@ -197,7 +197,7 @@ class DOMCategoryTest { } @Test - void testReplaceNode() { + void replaceNode() { def readerOld = new StringReader('<root><old/></root>') def oldDoc = DOMBuilder.parse(readerOld) def oldRoot = oldDoc.documentElement diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy index dccef911cd..9020a8a429 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy @@ -28,7 +28,7 @@ class DOMTest { def benchmark = false @Test - void testDOMParser() { + void domParser() { def xml = new StringReader("<html><head><title class='mytitle'>Test</title></head><body><p class='mystyle'>This is a test.</p></body></html>") def doc = DOMBuilder.parse(xml) def html = doc.documentElement @@ -36,7 +36,7 @@ class DOMTest { } @Test - void testDOMBuilder() { + void domBuilder() { def html = DOMBuilder.newInstance(). html { head { @@ -50,7 +50,7 @@ class DOMTest { } @Test - void testDOMBuilderWithNullValue() { + void domBuilderWithNullValue() { def html = DOMBuilder.newInstance(). html { head { @@ -63,7 +63,7 @@ class DOMTest { } @Test - void testStreamingDOMBuilder() { + void streamingDomBuilder() { def builder = new StreamingDOMBuilder() def make = builder.bind { html { @@ -100,9 +100,9 @@ class DOMTest { def mydomtest = new DOMTest() def standard = 0 mydomtest.benchmark = true - [{ mydomtest.testDOMParser() }, - { mydomtest.testDOMBuilder() }, - { mydomtest.testStreamingDOMBuilder() }].eachWithIndex { testMethod, index -> + [{ mydomtest.dOMParser() }, + { mydomtest.domBuilder() }, + { mydomtest.streamingDomBuilder() }].eachWithIndex { testMethod, index -> // Run the method once to fill any caches and to load classes testMethod() def start = System.currentTimeMillis() 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 b0d44f7b85..00abbf6889 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 @@ -62,7 +62,7 @@ final class NamespaceDOMTest extends TestXmlSupport { ''' @Test - void testXsdSchemaWithBuilderHavingAutoPrefix() { + void xsdSchemaWithBuilderHavingAutoPrefix() { def builder = DOMBuilder.newInstance() def xsd = NamespaceBuilder.newInstance(builder, 'http://www.w3.org/2001/XMLSchema', 'xsd') def root = xsd.schema { @@ -82,7 +82,7 @@ final class NamespaceDOMTest extends TestXmlSupport { } @Test - void testXsdSchemaWithBuilderHavingMultipleNamespaces() { + void xsdSchemaWithBuilderHavingMultipleNamespaces() { def builder = DOMBuilder.newInstance() def multi = NamespaceBuilder.newInstance(builder) multi.namespace('http://example.org/ord') @@ -91,7 +91,7 @@ final class NamespaceDOMTest extends TestXmlSupport { } @Test - void testXsdSchemaWithBuilderHavingDeclareNamespace() { + void xsdSchemaWithBuilderHavingDeclareNamespace() { def builder = DOMBuilder.newInstance() def multi = NamespaceBuilder.newInstance(builder) multi.declareNamespace( diff --git a/subprojects/groovy-xml/src/test/groovy/org/apache/groovy/xml/tools/DomToGroovyTest.groovy b/subprojects/groovy-xml/src/test/groovy/org/apache/groovy/xml/tools/DomToGroovyTest.groovy index 2563389399..a5478859dd 100644 --- a/subprojects/groovy-xml/src/test/groovy/org/apache/groovy/xml/tools/DomToGroovyTest.groovy +++ b/subprojects/groovy-xml/src/test/groovy/org/apache/groovy/xml/tools/DomToGroovyTest.groovy @@ -92,14 +92,14 @@ class DomToGroovyTest { protected File dir = new File("build/generated-groovyxml") @Test - void testConversion() { + void conversion() { convert("test1.xml", "test1.groovy") convert("po.xsd", "poSchema.groovy") convert("swing.xml", "swing.groovy") } @Test - void testConversionFormat() { + void conversionFormat() { checkConversion(TEST_XML_1, EXPECTED_BUILDER_SCRIPT_1) checkConversion(TEST_XML_2, EXPECTED_BUILDER_SCRIPT_2) checkConversion(TEST_XML_3, EXPECTED_BUILDER_SCRIPT_3)
