Add support for combination filters

eclipse-cbi · Jan 12, 2018 · 92a9ccf · 92a9ccf
1 parent 3b74876
commit 92a9ccf
Show file tree

Hide file tree

Showing 4 changed files with 565 additions and 0 deletions.
diff --git a/src/main/resources/xsl/config.job.xsl b/src/main/resources/xsl/config.job.xsl
@@ -38,6 +38,7 @@
         <axes>
           <xsl:apply-templates select="project-properties/entry [string/text() = 'axes']"/>
         </axes>
+        <xsl:apply-templates select="project-properties/entry [string/text() = 'combinationFilter']"/>
       </xsl:if>
       <xsl:apply-templates select="project-properties/entry [string/text() = 'customWorkspace']"/>
       <xsl:if test="/maven2-moduleset">
@@ -208,6 +209,13 @@
     <xsl:copy-of select="*/originalValue/*" />
   </xsl:template>
 
+  <!-- Combination filter -->
+  <xsl:template match="/*/project-properties/entry [string/text() = 'combinationFilter']">
+    <xsl:element name="combinationFilter">
+      <xsl:copy-of select="*/originalValue/text()" />
+    </xsl:element>
+  </xsl:template>
+
   <!-- String, Int, Boolean, etc -->
   <xsl:template match="/*/project-properties/entry [(*/originalValue/@class = 'string' or */originalValue/@class = 'int' or */originalValue/@class = 'boolean' or */originalValue/@class = '') and not(string/text() = 'cleanWorkspaceRequired')]">
     <xsl:variable name="tagName">

diff --git a/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java b/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java
@@ -327,6 +327,14 @@ public void configJobTest_andmore() {
         transformAndCompare("andmore", "config.job.hudson", "matrix-project");
     }
 
+    /**
+     * Tests that combination filters are transformed correctly 
+     */
+    @Test
+    public void configJobTest_recommenders() {
+        transformAndCompare("recommenders", "config.job.hudson", "matrix-project");
+    }
+
     @Test
     public void copyViewsTest_positive() {
         testCopyViews("config.main.jenkins-cbi.xml", "config.main.hudson-cbi.xml");