continue, tests are almost done

Author: gdy

build.gradle

@@ -18,7 +18,6 @@ dependencies {
     testCompile 'org.mockito:mockito-core:2.0.62-beta'
 	testCompile 'xmlunit:xmlunit:1.6'
 
-    
     compile 'commons-io:commons-io:2.4'
 	compile 'com.google.code.gson:gson:2.8.0'
 	compile 'org.apache.httpcomponents:httpclient:4.5.2'

src/main/java/com/projectkaiser/scm/jenkins/api/IJenkinsApi.java

@@ -10,9 +10,9 @@ public interface IJenkinsApi {
 
 	JobDetailed getJobDetailed(String jobName);
 
-	Long runJob(String jobName);
+	Long enqueueBuild(String jobName);
 
-	void updateJob(String jobName, String jobConfigXML);
+	void updateJobConfigXml(String jobName, String configXml);
 
 	void copyJob(String srcName, String dstName);
 

src/main/java/com/projectkaiser/scm/jenkins/api/JenkinsApi.java

@@ -19,12 +19,6 @@
 import com.projectkaiser.scm.jenkins.data.JobDetailed;
 import com.projectkaiser.scm.jenkins.data.JobListElement;
 
-/*
-    http://localhost:8080/hudson/job/toolkit/api/json
-    http://gmpxp:8080/hudson/api/json?tree=jobs[name]
-    http://localhost:8080/hudson/job/toolkit-2/config.xml
-*/
-
 public class JenkinsApi implements IJenkinsApi {
 
 	private IJenkinsApiFacade facade;
@@ -34,7 +28,7 @@ public JenkinsApi(String baseAddress, String user, String password) {
 	}
 
 	@Override
-	public Long runJob(String jobName) {
+	public Long enqueueBuild(String jobName) {
 		String url = "job/" + encodeUrl(jobName) + "/build";
 		HttpResponse resp = facade.getResponsePOST(url, null);
 		Header[] headers = resp.getHeaders("Location");
@@ -113,9 +107,9 @@ public String getJobConfigXml(String jobName) {
 	}
 
 	@Override
-	public void updateJobConfigXml(String jobName, String jobConfigXML) {
+	public void updateJobConfigXml(String jobName, String configXml) {
 		String url = "job/" + encodeUrl(jobName) + "/config.xml";
-		facade.getResponsePOST(url, jobConfigXML);
+		facade.getResponsePOST(url, configXml);
 	}
 
 	@Override

src/main/java/com/projectkaiser/scm/jenkins/api/facade/JenkinsApiHttpFacade.java

@@ -86,7 +86,6 @@ private HttpResponse getResponse (HttpRequestBase request) {
 				processResponse(response);
 				return response;
 			} finally {
-				EntityUtils.consume(response.getEntity());
 				request.releaseConnection();
 			}
 		} catch (Exception e) {

src/main/java/com/projectkaiser/scm/jenkins/data/JobDetailed.java

@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
 public class JobDetailed {
 
 	String displayName;

src/test/java/com/projectkaiser/scm/jenkins/api/JenkinsApiTest.java

@@ -1,14 +1,15 @@
 package com.projectkaiser.scm.jenkins.api;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -21,14 +22,11 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 import com.projectkaiser.scm.jenkins.data.JobDetailed;
-import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
 import com.sun.org.apache.xml.internal.serialize.OutputFormat;
 import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
 
 public class JenkinsApiTest  {
 
@@ -44,6 +42,8 @@ public class JenkinsApiTest  {
 		private static final String TEST_JOB_XML_FN = "TestJob.xml";
 
 		private static final String TEST_JOB_NAME = "pk_jenkins_test_job";
+
+		private static final String NEW_JOB_NAME = "pk_jenkins_new__test_job";
 
 		private String ethalonJobXML = readResource(this.getClass(), TEST_JOB_XML_FN);
 
@@ -63,6 +63,13 @@ public void setUp() {
 	public void tearDown() {
 		api.deleteJob(TEST_JOB_NAME);
 	}
+
+	@Test
+	public void testGetJobDetailed() {
+		JobDetailed job = api.getJobDetailed(TEST_JOB_NAME);
+		assertTrue(job != null);
+		assertTrue(job.getDisplayName().equals(TEST_JOB_NAME));
+	}
 
 	@Test
 	public void testCreateJob() throws Exception {
@@ -72,26 +79,48 @@ public void testCreateJob() throws Exception {
 	}
 
 	@Test
-	public void testRunJob() throws ParserConfigurationException, SAXException, IOException {
-		Long jobId = api.runJob(TEST_JOB_NAME);
+	public void testEnqueueBuild() throws Exception {
+		Long jobId = api.enqueueBuild(TEST_JOB_NAME);
 		assertTrue(jobId > 0);
-		
 	}
-	
+
 
 	public void JenkinsAPITest() throws ParserConfigurationException, SAXException, IOException {
 		String config = api.getJobConfigXml("test job");
 		api.createJob("newe4job", config);
 	}
 
+	
 	@Test
 	public void testChangeJob() throws ParserConfigurationException, SAXException, IOException {
-		api.getJobDetailed(jobName)
-		api.up
 		Document doc = getJobDocument(TEST_JOB_NAME);
 		NodeList nodes = doc.getElementsByTagName("disabled");
-        nodes.item(0).setNodeValue("true");
-        updateJob(jobName, doc);
+        nodes.item(0).setTextContent("true");
+        updateJob(TEST_JOB_NAME, doc);
+        
+        doc = getJobDocument(TEST_JOB_NAME);
+        nodes = doc.getElementsByTagName("disabled");
+        assertEquals(nodes.item(0).getTextContent(), "true");
+	}
+	
+	@Test
+	public void testCopyJob() {
+		api.copyJob(TEST_JOB_NAME, NEW_JOB_NAME);
+		try {
+			assertTrue(api.getJobsList().contains(NEW_JOB_NAME));
+		} finally {
+			api.deleteJob(NEW_JOB_NAME);
+		}
+	}
+	
+	@Test
+	public void testDeleteJob() {
+		api.deleteJob(TEST_JOB_NAME);
+		try {
+			assertFalse(api.getJobsList().contains(TEST_JOB_NAME));
+		} finally { 
+			api.createJob(TEST_JOB_NAME, ethalonJobXML);
+		}
 	}
 
 	private void updateJob(String jobName, Document doc) throws IOException {
@@ -108,12 +137,8 @@ private Document getJobDocument(String jobName) throws ParserConfigurationExcept
 		String xml = api.getJobConfigXml(jobName);
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db = dbf.newDocumentBuilder();
-        
-        StringReader sr = new StringReader(xml);
-        InputSource is = new InputSource(sr);
-        is.setEncoding("UTF-8");
-
-        Document doc = db.parse(is);
+        ByteArrayInputStream input =  new ByteArrayInputStream(xml.getBytes("UTF-8"));
+        Document doc = db.parse(input);
         return doc;
 	}