From 33170e1d19f49159ba597910bd6e503a8bedf76c Mon Sep 17 00:00:00 2001
From: Michal Vanco <michal.vanco@gooddata.com>
Date: Wed, 16 Sep 2015 08:39:43 +0200
Subject: [PATCH] Support test trend graph in Build Flow Test Aggregator

Support for configurable test trend graph was added at version 1.2 of
https://wiki.jenkins-ci.org/display/JENKINS/Build+Flow+Test+Aggregator+Plugin.

Change-Id: I5d01fe839cfa4f685f36c3ca0d2418691c4b7ec9
---
 jenkins_jobs/modules/publishers.py                 | 14 +++++++++-----
 ...-flow-tests.xml => aggregate-flow-tests001.xml} |  4 +++-
 ...low-tests.yaml => aggregate-flow-tests001.yaml} |  0
 .../fixtures/aggregate-flow-tests002.xml           |  8 ++++++++
 .../fixtures/aggregate-flow-tests002.yaml          |  3 +++
 5 files changed, 23 insertions(+), 6 deletions(-)
 rename tests/publishers/fixtures/{aggregate-flow-tests.xml => aggregate-flow-tests001.xml} (52%)
 rename tests/publishers/fixtures/{aggregate-flow-tests.yaml => aggregate-flow-tests001.yaml} (100%)
 create mode 100644 tests/publishers/fixtures/aggregate-flow-tests002.xml
 create mode 100644 tests/publishers/fixtures/aggregate-flow-tests002.yaml

diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index 1ecb461bd..e6738766e 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -1959,16 +1959,20 @@ def aggregate_flow_tests(parser, xml_parent, data):
     Requires the Jenkins :jenkins-wiki:`Build Flow Test Aggregator Plugin
     <Build+Flow+Test+Aggregator+Plugin>`.
 
+    :arg bool show-test-results-trend: whether to show test results
+        trend graph (default true)
+
     Example:
 
-    .. literalinclude:: \
-    /../../tests/publishers/fixtures/aggregate-flow-tests.yaml
+    .. literalinclude::
+        /../../tests/publishers/fixtures/aggregate-flow-tests002.yaml
        :language: yaml
 
     """
-    XML.SubElement(xml_parent,
-                   'org.zeroturnaround.jenkins.'
-                   'flowbuildtestaggregator.FlowTestAggregator')
+    agg_flow = XML.SubElement(xml_parent, 'org.zeroturnaround.jenkins.'
+                              'flowbuildtestaggregator.FlowTestAggregator')
+    XML.SubElement(agg_flow, 'showTestResultTrend').text = str(
+        data.get('show-test-results-trend', True)).lower()
 
 
 def cppcheck(parser, xml_parent, data):
diff --git a/tests/publishers/fixtures/aggregate-flow-tests.xml b/tests/publishers/fixtures/aggregate-flow-tests001.xml
similarity index 52%
rename from tests/publishers/fixtures/aggregate-flow-tests.xml
rename to tests/publishers/fixtures/aggregate-flow-tests001.xml
index f60c724f1..a0bfc0d47 100644
--- a/tests/publishers/fixtures/aggregate-flow-tests.xml
+++ b/tests/publishers/fixtures/aggregate-flow-tests001.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <publishers>
-    <org.zeroturnaround.jenkins.flowbuildtestaggregator.FlowTestAggregator/>
+    <org.zeroturnaround.jenkins.flowbuildtestaggregator.FlowTestAggregator>
+      <showTestResultTrend>true</showTestResultTrend>
+    </org.zeroturnaround.jenkins.flowbuildtestaggregator.FlowTestAggregator>
   </publishers>
 </project>
diff --git a/tests/publishers/fixtures/aggregate-flow-tests.yaml b/tests/publishers/fixtures/aggregate-flow-tests001.yaml
similarity index 100%
rename from tests/publishers/fixtures/aggregate-flow-tests.yaml
rename to tests/publishers/fixtures/aggregate-flow-tests001.yaml
diff --git a/tests/publishers/fixtures/aggregate-flow-tests002.xml b/tests/publishers/fixtures/aggregate-flow-tests002.xml
new file mode 100644
index 000000000..5c4b3ad4d
--- /dev/null
+++ b/tests/publishers/fixtures/aggregate-flow-tests002.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <publishers>
+    <org.zeroturnaround.jenkins.flowbuildtestaggregator.FlowTestAggregator>
+      <showTestResultTrend>false</showTestResultTrend>
+    </org.zeroturnaround.jenkins.flowbuildtestaggregator.FlowTestAggregator>
+  </publishers>
+</project>
diff --git a/tests/publishers/fixtures/aggregate-flow-tests002.yaml b/tests/publishers/fixtures/aggregate-flow-tests002.yaml
new file mode 100644
index 000000000..58a5fa656
--- /dev/null
+++ b/tests/publishers/fixtures/aggregate-flow-tests002.yaml
@@ -0,0 +1,3 @@
+publishers:
+  - aggregate-flow-tests:
+      show-test-results-trend: false