From 35ba1a6f765f72a1d91a5456c7556e6274f8c3a9 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Thu, 3 Jan 2013 15:09:43 +0100
Subject: o Moving Jenkins XML objects and parsing to it's own package. o
 Removing fields from JenkinsBuild that's read from the XML later on.

---
 .../esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java      | 1 +
 .../java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java  | 6 +++---
 src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java
 mode change 100644 => 100755 src/test/java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java
 mode change 100644 => 100755 src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java

(limited to 'src/test')

diff --git a/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java b/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java
old mode 100644
new mode 100755
index bdf4018..2b2cecd
--- a/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java
+++ b/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java
@@ -5,6 +5,7 @@ import fj.*;
 import fj.data.*;
 import io.trygvis.esper.testing.*;
 import io.trygvis.esper.testing.core.db.*;
+import io.trygvis.esper.testing.jenkins.xml.JenkinsJobXml;
 import io.trygvis.esper.testing.util.*;
 import org.apache.abdera.*;
 import org.codehaus.httpcache4j.cache.*;
diff --git a/src/test/java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java b/src/test/java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java
old mode 100644
new mode 100755
index 4337758..62e27d2
--- a/src/test/java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java
+++ b/src/test/java/io/trygvis/esper/testing/jenkins/JenkinsBuildXmlTest.java
@@ -6,10 +6,10 @@ import java.net.URI;
 
 import org.jdom2.Document;
 import org.joda.time.DateTime;
-import org.joda.time.LocalDateTime;
 import org.joda.time.chrono.ISOChronology;
 
 import fj.data.Option;
+import io.trygvis.esper.testing.jenkins.xml.JenkinsBuildXml;
 import io.trygvis.esper.testing.util.XmlParser;
 import junit.framework.TestCase;
 
@@ -31,7 +31,7 @@ public class JenkinsBuildXmlTest extends TestCase {
 
     public void testGitCommitParsing() throws IOException {
         try (InputStream is = getClass().getResourceAsStream("/jenkins/build/build-with-git-commits.xml")) {
-            Option<JenkinsBuildXml> option = JenkinsBuildXml.parse(parser.parseDocument(is).some().getRootElement());
+            Option<JenkinsBuildXml> option = parser.parseDocument(is).bind(JenkinsBuildXml.parse);
 
             assertTrue(option.isSome());
             JenkinsBuildXml build = option.some();
@@ -61,7 +61,7 @@ public class JenkinsBuildXmlTest extends TestCase {
 
     public void testSvnCommitParsing() throws IOException {
         try (InputStream is = getClass().getResourceAsStream("/jenkins/build/build-with-subversion-commits.xml")) {
-            Option<JenkinsBuildXml> option = JenkinsBuildXml.parse(parser.parseDocument(is).some().getRootElement());
+            Option<JenkinsBuildXml> option = parser.parseDocument(is).bind(JenkinsBuildXml.parse);
 
             assertTrue(option.isSome());
             JenkinsBuildXml build = option.some();
diff --git a/src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java b/src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java
old mode 100644
new mode 100755
index 25e629c..2224ba0
--- a/src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java
+++ b/src/test/java/io/trygvis/esper/testing/jenkins/SetJobTypeApp.java
@@ -4,6 +4,7 @@ import com.jolbox.bonecp.*;
 import fj.*;
 import fj.data.*;
 import io.trygvis.esper.testing.*;
+import io.trygvis.esper.testing.jenkins.xml.JenkinsJobXml;
 import io.trygvis.esper.testing.util.*;
 import org.apache.abdera.*;
 import org.codehaus.httpcache4j.cache.*;
-- 
cgit v1.2.3