From f73a46289ca7f81aaa4ca408f687c5fc6c968028 Mon Sep 17 00:00:00 2001
From: Daniel Spilker <mail@daniel-spilker.com>
Date: Sun, 28 May 2017 11:48:01 +0200
Subject: [PATCH] increased test coverage

---
 .../jobdsl/dsl/views/SectionedViewSpec.groovy | 195 +++---------------
 ...ctionedViewSpec-complexListViewSection.xml |  31 +++
 .../SectionedViewSpec-complexTextSection.xml  |  19 ++
 ...ctionedViewSpec-complexViewListSection.xml |  24 +++
 .../dsl/views/SectionedViewSpec-defaults.xml  |   7 +
 ...tionedViewSpec-minimalJobGraphsSection.xml |  17 ++
 ...ctionedViewSpec-minimalListViewSection.xml |  18 ++
 ...ionedViewSpec-minimalTestResultSection.xml |  17 ++
 .../SectionedViewSpec-minimalTextSection.xml  |  19 ++
 ...ctionedViewSpec-minimalViewListSection.xml |  19 ++
 10 files changed, 199 insertions(+), 167 deletions(-)
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexListViewSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexTextSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexViewListSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-defaults.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalJobGraphsSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalListViewSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTestResultSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTextSection.xml
 create mode 100644 job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalViewListSection.xml

diff --git a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/SectionedViewSpec.groovy b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/SectionedViewSpec.groovy
index 2c78b8874..fa3b43223 100644
--- a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/SectionedViewSpec.groovy
+++ b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/SectionedViewSpec.groovy
@@ -20,7 +20,7 @@ class SectionedViewSpec extends Specification {
         String xml = view.xml
 
         then:
-        compareXML(defaultXml, xml).similar()
+        compareXML(getXml('SectionedViewSpec-defaults.xml'), xml).similar()
     }
 
     def 'minimal job graphs section'() {
@@ -32,7 +32,7 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(minimalJobGraphsSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-minimalJobGraphsSection.xml'), view.xml).similar()
     }
 
     def 'minimal list view section'() {
@@ -44,7 +44,7 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(minimalListViewSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-minimalListViewSection.xml'), view.xml).similar()
     }
 
     def 'complex list view section'() {
@@ -71,7 +71,7 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(complexListViewSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-complexListViewSection.xml'), view.xml).similar()
     }
 
     def 'minimal test result section'() {
@@ -83,7 +83,7 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(minimalTestResultSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-minimalTestResultSection.xml'), view.xml).similar()
     }
 
     def 'minimal text section'() {
@@ -95,7 +95,21 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(minimalTextSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-minimalTextSection.xml'), view.xml).similar()
+    }
+
+    def 'complex text section'() {
+        when:
+        view.sections {
+            text {
+                name('test')
+                style('INFO')
+                text('lorem ipsum')
+            }
+        }
+
+        then:
+        compareXML(getXml('SectionedViewSpec-complexTextSection.xml'), view.xml).similar()
     }
 
     def 'minimal view list section'() {
@@ -107,179 +121,26 @@ class SectionedViewSpec extends Specification {
         }
 
         then:
-        compareXML(minimalViewListSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-minimalViewListSection.xml'), view.xml).similar()
     }
 
-    def 'view list section'() {
+    def 'complex view list section'() {
         when:
         view.sections {
             viewListing {
                 name('test')
-                view('view-b')
                 view('view-a')
+                view('view-b')
+                views('view-c', 'view-d')
                 columns(2)
             }
         }
 
         then:
-        compareXML(viewListSectionXml, view.xml).similar()
+        compareXML(getXml('SectionedViewSpec-complexViewListSection.xml'), view.xml).similar()
     }
 
-    def defaultXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class="hudson.model.View$PropertyList"/>
-    <sections/>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def minimalJobGraphsSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.JobGraphsSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-        </hudson.plugins.sectioned__view.JobGraphsSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def minimalListViewSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.ListViewSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-            <columns></columns>
-        </hudson.plugins.sectioned__view.ListViewSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def complexListViewSectionXml = ''' <hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.ListViewSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-                <string>foo</string>
-            </jobNames>
-            <jobFilters>
-                <hudson.views.JobStatusFilter>
-                    <includeExcludeTypeString>includeMatched</includeExcludeTypeString>
-                    <unstable>true</unstable>
-                    <failed>false</failed>
-                    <aborted>false</aborted>
-                    <disabled>false</disabled>
-                    <stable>false</stable>
-                </hudson.views.JobStatusFilter>
-            </jobFilters>
-            <name>test</name>
-            <includeRegex>test-.*</includeRegex>
-            <width>HALF</width>
-            <alignment>LEFT</alignment>
-            <columns>
-                <hudson.views.StatusColumn></hudson.views.StatusColumn>
-                <hudson.views.JobColumn></hudson.views.JobColumn>
-            </columns>
-        </hudson.plugins.sectioned__view.ListViewSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def minimalTestResultSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.TestResultViewSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-        </hudson.plugins.sectioned__view.TestResultViewSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def minimalTextSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.TextSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-            <text></text>
-            <style>NONE</style>
-        </hudson.plugins.sectioned__view.TextSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def minimalViewListSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.ViewListingSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-            <views></views>
-            <columns>1</columns>
-        </hudson.plugins.sectioned__view.ViewListingSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
-
-    def viewListSectionXml = '''<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.sectioned__view.SectionedView>
-    <filterExecutors>false</filterExecutors>
-    <filterQueue>false</filterQueue>
-    <properties class='hudson.model.View$PropertyList'></properties>
-    <sections>
-        <hudson.plugins.sectioned__view.ViewListingSection>
-            <jobNames>
-                <comparator class='hudson.util.CaseInsensitiveComparator'></comparator>
-            </jobNames>
-            <jobFilters></jobFilters>
-            <name>test</name>
-            <width>FULL</width>
-            <alignment>CENTER</alignment>
-            <views>
-                <string>view-a</string>
-                <string>view-b</string>
-            </views>
-            <columns>2</columns>
-        </hudson.plugins.sectioned__view.ViewListingSection>
-    </sections>
-</hudson.plugins.sectioned__view.SectionedView>'''
+    private static String getXml(String resourceName) {
+        SectionedViewSpec.getResourceAsStream(resourceName).getText('UTF-8')
+    }
 }
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexListViewSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexListViewSection.xml
new file mode 100644
index 000000000..5e168a754
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexListViewSection.xml
@@ -0,0 +1,31 @@
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.ListViewSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+                <string>foo</string>
+            </jobNames>
+            <jobFilters>
+                <hudson.views.JobStatusFilter>
+                    <includeExcludeTypeString>includeMatched</includeExcludeTypeString>
+                    <unstable>true</unstable>
+                    <failed>false</failed>
+                    <aborted>false</aborted>
+                    <disabled>false</disabled>
+                    <stable>false</stable>
+                </hudson.views.JobStatusFilter>
+            </jobFilters>
+            <name>test</name>
+            <includeRegex>test-.*</includeRegex>
+            <width>HALF</width>
+            <alignment>LEFT</alignment>
+            <columns>
+                <hudson.views.StatusColumn/>
+                <hudson.views.JobColumn/>
+            </columns>
+        </hudson.plugins.sectioned__view.ListViewSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexTextSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexTextSection.xml
new file mode 100644
index 000000000..6eafc1bd4
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexTextSection.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.TextSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+            <text>lorem ipsum</text>
+            <style>INFO</style>
+        </hudson.plugins.sectioned__view.TextSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexViewListSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexViewListSection.xml
new file mode 100644
index 000000000..ac0091d47
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-complexViewListSection.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.ViewListingSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+            <views>
+                <string>view-a</string>
+                <string>view-b</string>
+                <string>view-c</string>
+                <string>view-d</string>
+            </views>
+            <columns>2</columns>
+        </hudson.plugins.sectioned__view.ViewListingSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-defaults.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-defaults.xml
new file mode 100644
index 000000000..f9e7067df
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-defaults.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class="hudson.model.View$PropertyList"/>
+    <sections/>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalJobGraphsSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalJobGraphsSection.xml
new file mode 100644
index 000000000..731e5be1a
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalJobGraphsSection.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.JobGraphsSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+        </hudson.plugins.sectioned__view.JobGraphsSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalListViewSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalListViewSection.xml
new file mode 100644
index 000000000..9cec99e70
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalListViewSection.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.ListViewSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+            <columns/>
+        </hudson.plugins.sectioned__view.ListViewSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTestResultSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTestResultSection.xml
new file mode 100644
index 000000000..d8ce1fb20
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTestResultSection.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.TestResultViewSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+        </hudson.plugins.sectioned__view.TestResultViewSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTextSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTextSection.xml
new file mode 100644
index 000000000..2b47dc567
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalTextSection.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.TextSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+            <text/>
+            <style>NONE</style>
+        </hudson.plugins.sectioned__view.TextSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>
diff --git a/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalViewListSection.xml b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalViewListSection.xml
new file mode 100644
index 000000000..87c97a46e
--- /dev/null
+++ b/job-dsl-core/src/test/resources/javaposse/jobdsl/dsl/views/SectionedViewSpec-minimalViewListSection.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.plugins.sectioned__view.SectionedView>
+    <filterExecutors>false</filterExecutors>
+    <filterQueue>false</filterQueue>
+    <properties class='hudson.model.View$PropertyList'/>
+    <sections>
+        <hudson.plugins.sectioned__view.ViewListingSection>
+            <jobNames>
+                <comparator class='hudson.util.CaseInsensitiveComparator'/>
+            </jobNames>
+            <jobFilters/>
+            <name>test</name>
+            <width>FULL</width>
+            <alignment>CENTER</alignment>
+            <views/>
+            <columns>1</columns>
+        </hudson.plugins.sectioned__view.ViewListingSection>
+    </sections>
+</hudson.plugins.sectioned__view.SectionedView>