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.

3 files changed, 5 insertions, 3 deletions

diff --git a/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java b/src/test/java/io/trygvis/esper/testing/jenkins/CreateMissingMavenModuleJobsApp.java
index bdf4018..2b2cecd 100644..100755
--- 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
index 4337758..62e27d2 100644..100755
--- 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
index 25e629c..2224ba0 100644..100755
--- 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.*;