From a463b12f29c77303d39b9ef53c9dcba608698893 Mon Sep 17 00:00:00 2001
From: Dong Ma <winterma.dong@gmail.com>
Date: Tue, 13 Sep 2016 11:21:03 +0800
Subject: [PATCH] Update junit plugin

- update junit plugin to use convert xml
- update docstring of junit plugin

Change-Id: I47e5ebd159bca869a297cf5f0b85a3d63bb264ac
---
 jenkins_jobs/modules/publishers.py     | 30 +++++++++++++-------------
 tests/publishers/fixtures/junit001.xml |  1 -
 tests/publishers/fixtures/junit002.xml |  1 -
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index eb2e0d965..fb91b9fe6 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -1066,16 +1066,16 @@ def junit(registry, xml_parent, data):
     """yaml: junit
     Publish JUnit test results.
 
-    :arg str results: results filename
+    :arg str results: results filename (required)
     :arg bool keep-long-stdio: Retain long standard output/error in test
-      results (default true).
+        results (default true).
     :arg bool allow-empty-results: Do not fail builds if no junit reports
-       are found (default false)
+        are found (default false)
     :arg float health-scale-factor: Amplification factor to apply to test
-      failures when computing the test result contribution to the build health
-      score. (default 1.0)
+        failures when computing the test result contribution to the build
+        health score. (default 1.0)
     :arg bool allow-empty-results: Do not fail the build if the JUnit files are
-      missing (default false).
+        missing (default false).
     :arg bool test-stability: Add historical information about test
         results stability (default false).
         Requires the Jenkins :jenkins-wiki:`Test stability Plugin
@@ -1102,15 +1102,15 @@ def junit(registry, xml_parent, data):
     junitresult = XML.SubElement(xml_parent,
                                  'hudson.tasks.junit.JUnitResultArchiver')
     junitresult.set('plugin', 'junit')
-    XML.SubElement(junitresult, 'testResults').text = data['results']
-    XML.SubElement(junitresult, 'keepLongStdio').text = str(
-        data.get('keep-long-stdio', True)).lower()
-    XML.SubElement(junitresult, 'allowEmptyResults').text = str(
-        data.get('allow-empty-results', False)).lower()
-    XML.SubElement(junitresult, 'healthScaleFactor').text = str(
-        data.get('health-scale-factor', '1.0'))
-    XML.SubElement(junitresult, 'allowEmptyResults').text = str(
-        data.get('allow-empty-results', False)).lower()
+    mapping = [
+        ('results', 'testResults', None),
+        ('keep-long-stdio', 'keepLongStdio', True),
+        ('health-scale-factor', 'healthScaleFactor', '1.0'),
+        ('allow-empty-results', 'allowEmptyResults', False),
+    ]
+    helpers.convert_mapping_to_xml(
+        junitresult, data, mapping, fail_required=True)
+
     datapublisher = XML.SubElement(junitresult, 'testDataPublishers')
     if str(data.get('test-stability', False)).lower() == 'true':
         XML.SubElement(datapublisher,
diff --git a/tests/publishers/fixtures/junit001.xml b/tests/publishers/fixtures/junit001.xml
index 04a424d8d..fc1db95b1 100644
--- a/tests/publishers/fixtures/junit001.xml
+++ b/tests/publishers/fixtures/junit001.xml
@@ -4,7 +4,6 @@
     <hudson.tasks.junit.JUnitResultArchiver plugin="junit">
       <testResults>nosetests.xml</testResults>
       <keepLongStdio>true</keepLongStdio>
-      <allowEmptyResults>false</allowEmptyResults>
       <healthScaleFactor>1.0</healthScaleFactor>
       <allowEmptyResults>false</allowEmptyResults>
       <testDataPublishers/>
diff --git a/tests/publishers/fixtures/junit002.xml b/tests/publishers/fixtures/junit002.xml
index 33153e756..cb1686266 100644
--- a/tests/publishers/fixtures/junit002.xml
+++ b/tests/publishers/fixtures/junit002.xml
@@ -4,7 +4,6 @@
     <hudson.tasks.junit.JUnitResultArchiver plugin="junit">
       <testResults>nosetests-example.xml</testResults>
       <keepLongStdio>false</keepLongStdio>
-      <allowEmptyResults>true</allowEmptyResults>
       <healthScaleFactor>2.0</healthScaleFactor>
       <allowEmptyResults>true</allowEmptyResults>
       <testDataPublishers>