From 762d8c21d0f78987d709cf8a92736d4f81e51222 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Sun, 30 Nov 2014 09:42:40 -0800
Subject: [PATCH] Move project matrix documentation into a test.

The test includes both a basic example and a user defined
axis example.

Change-Id: I88f7a17928c4f6b56814c3cc5c843b949358ac2d
---
 jenkins_jobs/modules/project_matrix.py        | 56 +--------------
 .../yamlparser/fixtures/project-matrix001.xml | 70 +++++++++++++++++++
 .../fixtures/project-matrix001.yaml           | 43 ++++++++++++
 3 files changed, 116 insertions(+), 53 deletions(-)
 create mode 100644 tests/yamlparser/fixtures/project-matrix001.xml
 create mode 100644 tests/yamlparser/fixtures/project-matrix001.yaml

diff --git a/jenkins_jobs/modules/project_matrix.py b/jenkins_jobs/modules/project_matrix.py
index ce82dd037..9857d208b 100644
--- a/jenkins_jobs/modules/project_matrix.py
+++ b/jenkins_jobs/modules/project_matrix.py
@@ -59,60 +59,10 @@ Example:
 Requires the Jenkins `ShiningPanda Plugin.
 <https://wiki.jenkins-ci.org/display/JENKINS/ShiningPanda+Plugin>`_
 
-Example::
+Example:
 
- - job:
-    name: matrix-test
-    project-type: matrix
-    execution-strategy:
-      combination-filter: |
-        !(os=="fedora11" && arch=="amd64")
-      sequential: true
-      touchstone:
-        expr: 'os == "fedora11"'
-        result: unstable
-    axes:
-      - axis:
-         type: label-expression
-         name: os
-         values:
-          - ubuntu12.04
-          - fedora11
-      - axis:
-         type: label-expression
-         name: arch
-         values:
-          - amd64
-          - i386
-      - axis:
-         type: slave
-         name: nodes
-         values:
-          - node1
-          - node2
-      - axis:
-         type: dynamic
-         name: config
-         values:
-          - config_list
-    builders:
-      - shell: make && make check
-
-Example using user-defined axis::
-
- - job:
-    name: matrix-user-defined
-    project-type: matrix
-    axes:
-      - axis:
-        type: user-defined
-        name: database
-        values:
-         - mysql
-         - postgresql
-         - sqlite
-    builders:
-     - shell: make "$database"
+  .. literalinclude::  /../../tests/yamlparser/fixtures/project-matrix001.yaml
+    :language: yaml
 
 """
 
diff --git a/tests/yamlparser/fixtures/project-matrix001.xml b/tests/yamlparser/fixtures/project-matrix001.xml
new file mode 100644
index 000000000..d32882c8f
--- /dev/null
+++ b/tests/yamlparser/fixtures/project-matrix001.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<matrix-project>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>true</runSequentially>
+    <touchStoneCombinationFilter>os == &quot;fedora11&quot;</touchStoneCombinationFilter>
+    <touchStoneResultCondition>
+      <name>UNSTABLE</name>
+      <ordinal>1</ordinal>
+      <color>YELLOW</color>
+    </touchStoneResultCondition>
+  </executionStrategy>
+  <combinationFilter>!(os==&quot;fedora11&quot; &amp;&amp; arch==&quot;amd64&quot;)</combinationFilter>
+  <axes>
+    <hudson.matrix.LabelExpAxis>
+      <name>os</name>
+      <values>
+        <string>ubuntu12.04</string>
+        <string>fedora11</string>
+      </values>
+    </hudson.matrix.LabelExpAxis>
+    <hudson.matrix.LabelExpAxis>
+      <name>arch</name>
+      <values>
+        <string>amd64</string>
+        <string>i386</string>
+      </values>
+    </hudson.matrix.LabelExpAxis>
+    <hudson.matrix.LabelAxis>
+      <name>nodes</name>
+      <values>
+        <string>node1</string>
+        <string>node2</string>
+      </values>
+    </hudson.matrix.LabelAxis>
+    <ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
+      <name>config</name>
+      <values>
+        <string>config_list</string>
+      </values>
+      <varName>config_list</varName>
+      <axisValues>
+        <string>default</string>
+      </axisValues>
+    </ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
+    <hudson.matrix.TextAxis>
+      <name>database</name>
+      <values>
+        <string>mysql</string>
+        <string>postgresql</string>
+        <string>sqlite</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>make &amp;&amp; make check</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</matrix-project>
\ No newline at end of file
diff --git a/tests/yamlparser/fixtures/project-matrix001.yaml b/tests/yamlparser/fixtures/project-matrix001.yaml
new file mode 100644
index 000000000..dfe28f20b
--- /dev/null
+++ b/tests/yamlparser/fixtures/project-matrix001.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: matrix-test
+    project-type: matrix
+    execution-strategy:
+      combination-filter: |
+        !(os=="fedora11" && arch=="amd64")
+      sequential: true
+      touchstone:
+        expr: 'os == "fedora11"'
+        result: unstable
+    axes:
+      - axis:
+         type: label-expression
+         name: os
+         values:
+          - ubuntu12.04
+          - fedora11
+      - axis:
+         type: label-expression
+         name: arch
+         values:
+          - amd64
+          - i386
+      - axis:
+         type: slave
+         name: nodes
+         values:
+          - node1
+          - node2
+      - axis:
+         type: dynamic
+         name: config
+         values:
+          - config_list
+      - axis:
+         type: user-defined
+         name: database
+         values:
+          - mysql
+          - postgresql
+          - sqlite
+    builders:
+      - shell: make && make check