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 2020/09/17 13:29:26 UTC
[groovy] 03/04: Prettify MarkupBuilderTest code indentation
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 e67c3465ea44d1823956941ecff1cfbe708b5805
Author: Simon Tost <si...@tngtech.com>
AuthorDate: Fri Sep 11 22:53:49 2020 +0200
Prettify MarkupBuilderTest code indentation
---
.../groovy/groovy/xml/MarkupBuilderTest.groovy | 125 ++++++++++++---------
1 file changed, 69 insertions(+), 56 deletions(-)
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
index eeadaae..916ba58 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
@@ -75,35 +75,48 @@ class MarkupBuilderTest extends BuilderTestSupport {
}
}
assertExpectedXml m, '''\
-<root1 a='5' b='7'>hello1<elem1 c='4'>hello2<elem2 d='4'>hello3</elem2>
-</elem1>
-<elem1 c='4'>hello2<elem2>hello3</elem2>
-<elem2 d='4'>hello3</elem2>
-</elem1>
-<elem1 c='4'>hello2<elem2 d='4'>hello3</elem2>
-<elem2>hello3</elem2>
-</elem1>
-<elem1 c='4'>hello2<elem2 d='4' />
-<elem2 d='4'>hello3</elem2>
-</elem1>
-<elem1 c='4'>hello2<elem2 d='4'>hello3</elem2>
-<elem2 d='4' />
-</elem1>
-<elem1>hello2<elem2 d='4'>hello3</elem2>
-<elem2 d='4' />
-</elem1>
-</root1>'''
+ <root1 a='5' b='7'>
+ hello1
+ <elem1 c='4'>
+ hello2
+ <elem2 d='4'>hello3</elem2>
+ </elem1>
+ <elem1 c='4'>
+ hello2
+ <elem2>hello3</elem2>
+ <elem2 d='4'>hello3</elem2>
+ </elem1>
+ <elem1 c='4'>
+ hello2
+ <elem2 d='4'>hello3</elem2>
+ <elem2>hello3</elem2>
+ </elem1>
+ <elem1 c='4'>
+ hello2
+ <elem2 d='4' />
+ <elem2 d='4'>hello3</elem2>
+ </elem1>
+ <elem1 c='4'>
+ hello2
+ <elem2 d='4'>hello3</elem2>
+ <elem2 d='4' />
+ </elem1>
+ <elem1>hello2<elem2 d='4'>hello3</elem2>
+ <elem2 d='4' />
+ </elem1>
+ </root1>
+ '''
}
void testMarkupWithColonsAndNamespaces() {
def expectedXml = '''\
-<ns1:customer-description>
- <last-name>Laforge</last-name>
- <first-name>
- <first>Guillaume</first>
- <initial-letters>A.J.</initial-letters>
- </first-name>
-</ns1:customer-description>'''
+ <ns1:customer-description>
+ <last-name>Laforge</last-name>
+ <first-name>
+ <first>Guillaume</first>
+ <initial-letters>A.J.</initial-letters>
+ </first-name>
+ </ns1:customer-description>'''.stripIndent()
xml."ns1:customer-description"{
"last-name"("Laforge")
"first-name"{
@@ -121,23 +134,23 @@ class MarkupBuilderTest extends BuilderTestSupport {
*/
void testBuilder() {
String expectedXml = '''\
-<chars>
- <ampersand a='&'>&</ampersand>
- <quote attr='"'>"</quote>
- <apostrophe attr='''>'</apostrophe>
- <lessthan attr='value'>chars: & < > '</lessthan>
- <element attr='value 1 & 2'>chars: & < > " in middle</element>
- <greaterthan>></greaterthan>
- <emptyElement />
- <null />
- <nullAttribute t1='' />
- <emptyWithAttributes attr1='set' />
- <emptyAttribute t1='' />
- <parent key='value'>
- <label for='usernameId'>Username: </label>
- <input name='test' id='1' />
- </parent>
-</chars>'''
+ <chars>
+ <ampersand a='&'>&</ampersand>
+ <quote attr='"'>"</quote>
+ <apostrophe attr='''>'</apostrophe>
+ <lessthan attr='value'>chars: & < > '</lessthan>
+ <element attr='value 1 & 2'>chars: & < > " in middle</element>
+ <greaterthan>></greaterthan>
+ <emptyElement />
+ <null />
+ <nullAttribute t1='' />
+ <emptyWithAttributes attr1='set' />
+ <emptyAttribute t1='' />
+ <parent key='value'>
+ <label for='usernameId'>Username: </label>
+ <input name='test' id='1' />
+ </parent>
+ </chars>'''.stripIndent()
// Generate the markup.
xml.chars {
@@ -166,15 +179,15 @@ class MarkupBuilderTest extends BuilderTestSupport {
*/
void testBuilderWithDoubleQuotes() {
String expectedXml = '''\
-<chars>
- <ampersand a="&">&</ampersand>
- <quote attr=""">"</quote>
- <apostrophe attr="'">'</apostrophe>
- <lessthan attr="value">chars: & < > '</lessthan>
- <element attr="value 1 & 2">chars: & < > " in middle</element>
- <greaterthan>></greaterthan>
- <emptyElement />
-</chars>'''
+ <chars>
+ <ampersand a="&">&</ampersand>
+ <quote attr=""">"</quote>
+ <apostrophe attr="'">'</apostrophe>
+ <lessthan attr="value">chars: & < > '</lessthan>
+ <element attr="value 1 & 2">chars: & < > " in middle</element>
+ <greaterthan>></greaterthan>
+ <emptyElement />
+ </chars>'''.stripIndent()
// Generate the markup.
xml.doubleQuotes = true
@@ -250,11 +263,11 @@ class MarkupBuilderTest extends BuilderTestSupport {
mkp.yieldUnescaped("\n <inside>wow</inside>")
}
String expectedXml = '''\
-<?xml version='1.0' encoding='UTF-8'?>
-<element><>
- <inner>foobar</inner>
- <inside>wow</inside>
-</element>'''
+ <?xml version='1.0' encoding='UTF-8'?>
+ <element><>
+ <inner>foobar</inner>
+ <inside>wow</inside>
+ </element>'''.stripIndent()
assertEquals expectedXml, fixEOLs(writer.toString())
}