From 587740ec757e46bc971110582e2e9f3f134b26b3 Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.openstack@zerebecki.de>
Date: Wed, 16 Oct 2019 14:53:15 +0200
Subject: Support nested views

Change-Id: I13532a16efc6e970ab5a7c021ec4d77be98d3de8
---
 tests/base.py                         | 32 ++++++++++++++++++++++++++++----
 tests/views/fixtures/view_nested.xml  | 24 ++++++++++++++++++++++++
 tests/views/fixtures/view_nested.yaml |  8 ++++++++
 tests/views/test_views.py             |  7 +++++++
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 tests/views/fixtures/view_nested.xml
 create mode 100644 tests/views/fixtures/view_nested.yaml

(limited to 'tests')

diff --git a/tests/base.py b/tests/base.py
index 660a3af7..f828c773 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -18,10 +18,12 @@
 # under the License.
 
 import doctest
+import configparser
 import io
 import json
 import logging
 import os
+import pkg_resources
 import re
 import xml.etree.ElementTree as XML
 
@@ -45,6 +47,7 @@ from jenkins_jobs.modules import project_multibranch
 from jenkins_jobs.modules import project_multijob
 from jenkins_jobs.modules import view_all
 from jenkins_jobs.modules import view_list
+from jenkins_jobs.modules import view_nested
 from jenkins_jobs.modules import view_pipeline
 from jenkins_jobs.parser import YamlParser
 from jenkins_jobs.registry import ModuleRegistry
@@ -169,7 +172,8 @@ class BaseScenariosTestCase(testscenarios.TestWithScenarios, BaseTestCase):
     scenarios = []
     fixtures_path = None
 
-    def test_yaml_snippet(self):
+    @mock.patch("pkg_resources.iter_entry_points")
+    def test_yaml_snippet(self, mock):
         if not self.in_filename:
             return
 
@@ -187,6 +191,24 @@ class BaseScenariosTestCase(testscenarios.TestWithScenarios, BaseTestCase):
             self.addDetail("plugins-info", text_content(str(plugins_info)))
 
         parser = YamlParser(jjb_config)
+        e = pkg_resources.EntryPoint.parse
+        d = pkg_resources.Distribution()
+        config = configparser.ConfigParser()
+        config.read(os.path.dirname(__file__) + "/../setup.cfg")
+        groups = {}
+        for key in config["entry_points"]:
+            groups[key] = list()
+            for line in config["entry_points"][key].split("\n"):
+                if "" == line.strip():
+                    continue
+                groups[key].append(e(line, dist=d))
+
+        def mock_iter_entry_points(group, name=None):
+            return (
+                entry for entry in groups[group] if name is None or name == entry.name
+            )
+
+        mock.side_effect = mock_iter_entry_points
         registry = ModuleRegistry(jjb_config, plugins_info)
         registry.set_parser_data(parser.data)
 
@@ -213,11 +235,13 @@ class BaseScenariosTestCase(testscenarios.TestWithScenarios, BaseTestCase):
 
         if "view-type" in yaml_content:
             if yaml_content["view-type"] == "all":
-                project = view_all.All(None)
+                project = view_all.All(registry)
             elif yaml_content["view-type"] == "list":
-                project = view_list.List(None)
+                project = view_list.List(registry)
+            elif yaml_content["view-type"] == "nested":
+                project = view_nested.Nested(registry)
             elif yaml_content["view-type"] == "pipeline":
-                project = view_pipeline.Pipeline(None)
+                project = view_pipeline.Pipeline(registry)
             else:
                 raise InvalidAttributeError("view-type", yaml_content["view-type"])
 
diff --git a/tests/views/fixtures/view_nested.xml b/tests/views/fixtures/view_nested.xml
new file mode 100644
index 00000000..757990ac
--- /dev/null
+++ b/tests/views/fixtures/view_nested.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hudson.plugins.nested__view.NestedView>
+  <name>NestedViewTest</name>
+  <description/>
+  <filterExecutors>false</filterExecutors>
+  <filterQueue>false</filterQueue>
+  <properties class="hudson.model.View$PropertyList"/>
+  <views>
+    <hudson.model.AllView>
+      <name>All</name>
+      <description/>
+      <filterExecutors>false</filterExecutors>
+      <filterQueue>false</filterQueue>
+      <properties class="hudson.model.View$PropertyList"/>
+    </hudson.model.AllView>
+  </views>
+  <defaultView>All</defaultView>
+  <columns>
+    <columns>
+      <hudson.views.StatusColumn/>
+      <hudson.views.WeatherColumn/>
+    </columns>
+  </columns>
+</hudson.plugins.nested__view.NestedView>
diff --git a/tests/views/fixtures/view_nested.yaml b/tests/views/fixtures/view_nested.yaml
new file mode 100644
index 00000000..6a33c3ac
--- /dev/null
+++ b/tests/views/fixtures/view_nested.yaml
@@ -0,0 +1,8 @@
+name: NestedViewTest
+view-type: nested
+views:
+  - name: All
+    view-type: all
+columns:
+  - status
+  - weather
diff --git a/tests/views/test_views.py b/tests/views/test_views.py
index 700b174d..62435590 100644
--- a/tests/views/test_views.py
+++ b/tests/views/test_views.py
@@ -15,6 +15,7 @@
 import os
 from jenkins_jobs.modules import view_all
 from jenkins_jobs.modules import view_list
+from jenkins_jobs.modules import view_nested
 from jenkins_jobs.modules import view_pipeline
 from tests import base
 
@@ -31,6 +32,12 @@ class TestCaseModuleViewList(base.BaseScenariosTestCase):
     klass = view_list.List
 
 
+class TestCaseModuleViewNested(base.BaseScenariosTestCase):
+    fixtures_path = os.path.join(os.path.dirname(__file__), "fixtures")
+    scenarios = base.get_scenarios(fixtures_path)
+    klass = view_nested.Nested
+
+
 class TestCaseModuleViewPipeline(base.BaseScenariosTestCase):
     fixtures_path = os.path.join(os.path.dirname(__file__), "fixtures")
     scenarios = base.get_scenarios(fixtures_path)
-- 
cgit