AGDIGGER-60 - Fetching artifacts (no upstream changes)

Author: wtrocki

pom.xml

@@ -9,6 +9,11 @@
     <version>1.0.0</version>
     <packaging>jar</packaging>
 
+  <properties>
+    <junit.version>4.11</junit.version>
+    <mockito-core.version>1.9.5</mockito-core.version>
+  </properties>
+
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -38,6 +43,19 @@
         <artifactId>slf4j-log4j12</artifactId>
         <version>1.7.21</version>
       </dependency>
+      <!-- Testing -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito-core.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
     <repositories>
         <repository>

src/main/java/com/redhat/digkins/DiggerClient.java

@@ -118,7 +118,7 @@ public long build(String jobName) throws DiggerClientException {
    * @param artifactName - name of the artifact to fetch - can be regexp
    * @return InputStream with file contents
    */
-  public InputStream fetchArtifact(String jobName, long buildNumber, String artifactName) {
+  public InputStream fetchArtifact(String jobName, int buildNumber, String artifactName) {
     ArtifactsService artifactsService = new ArtifactsService(jenkins);
     return artifactsService.fetchArtifact(jobName,buildNumber,artifactName);
   }

src/main/java/com/redhat/digkins/services/ArtifactsService.java

@@ -4,6 +4,7 @@
 import com.offbytwo.jenkins.model.Artifact;
 import com.offbytwo.jenkins.model.Build;
 import com.offbytwo.jenkins.model.BuildWithDetails;
+import com.offbytwo.jenkins.model.JobWithDetails;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 import org.slf4j.Logger;
@@ -39,9 +40,10 @@ public ArtifactsService(JenkinsServer jenkins) {
    * @param artifactName - name of the artifact to fetch - can be regexp
    * @return InputStream with file contents
    */
-  public InputStream fetchArtifact(String jobName, long buildNumber, String artifactName) {
+  public InputStream fetchArtifact(String jobName, int buildNumber, String artifactName) {
     try {
-      Build build = jenkins.getBuild(jobName, buildNumber);
+      JobWithDetails job = jenkins.getJob(jobName);
+      Build build = job.getBuildByNumber(buildNumber);
       if (build instanceof BuildWithDetails) {
         BuildWithDetails buildWithDetails = ((BuildWithDetails) build);
         List<Artifact> artifacts = buildWithDetails.getArtifacts();

src/test/java/digkins/services/ArtifactsServiceTests.java

@@ -0,0 +1,58 @@
+package digkins.services;
+
+import com.offbytwo.jenkins.JenkinsServer;
+import com.offbytwo.jenkins.client.JenkinsHttpClient;
+import com.offbytwo.jenkins.model.*;
+import com.redhat.digkins.services.ArtifactsService;
+import org.junit.Test;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class ArtifactsServiceTests {
+  private String jobLocation = "http://localhost/job/artifact/";
+  private JenkinsServer server = mock(JenkinsServer.class);
+
+  @Test
+  public void testGetNoArtifacts() throws Exception {
+    ArtifactsService artifactsService = new ArtifactsService(server);
+    JobWithDetails job = mock(JobWithDetails.class);
+    BuildWithDetails build = mock(BuildWithDetails.class);
+    given(job.getBuildByNumber(anyInt())).willReturn(build);
+
+    InputStream artifact = artifactsService.fetchArtifact("artifact", 1,"test");
+    assertNull(artifact);
+  }
+
+  @Test
+  public void testGetArtifacts() throws Exception {
+    ArtifactsService artifactsService = new ArtifactsService(server);
+    JobWithDetails job = mock(JobWithDetails.class);
+    BuildWithDetails build = mock(BuildWithDetails.class);
+    given(server.getJob(anyString())).willReturn(job);
+    given(job.getBuildByNumber(anyInt())).willReturn(build);
+   // given(client.get(eq(jobLocation), eq(Job.class))).willReturn(job);
+    Artifact artifact = mock(Artifact.class);
+    given(build.getArtifacts()).willReturn(Arrays.asList(artifact));
+    FileInputStream fs = mock(FileInputStream.class);
+    given(build.downloadArtifact(artifact)).willReturn(fs);
+    String artifactName = "test";
+    given(artifact.getFileName()).willReturn(artifactName);
+    InputStream artifactStream = artifactsService.fetchArtifact("artifact", 1,artifactName);
+
+   // verify(client).get("/job/artifact", JobWithDetails.class);
+    assertNotNull(artifactStream);
+  }
+
+
+
+
+}