More coverage

Author: bitwiseman

src/main/java/org/kohsuke/github/PaginatedEndpointItems.java

@@ -36,7 +36,7 @@ class PaginatedEndpointItems<Page extends GitHubPage<Item>, Item> implements Ite
      * hasNext() returns false.
      */
     public Page getCurrentPage() {
-        if (currentPage != null) {
+        if (currentPage == null) {
             peek();
         }
         return currentPage;

src/test/java/org/kohsuke/github/GHWorkflowRunTest.java

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import org.assertj.core.util.Objects;
 import org.awaitility.Awaitility;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,10 +18,13 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Scanner;
+import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -347,7 +351,12 @@ public void testArtifacts() throws IOException {
         checkArtifactProperties(artifactById, "artifact2");
 
         // Test GHRepository#listArtifacts() as we are sure we have artifacts around
-        List<GHArtifact> artifactsFromRepo = new ArrayList<>(repo.listArtifacts().withPageSize(2).items().nextPage());
+        var endpointItems = repo.listArtifacts().withPageSize(2).items();
+        var currentPage = endpointItems.getCurrentPage();
+        var firstPage = Objects.castIfBelongsToType(currentPage, GHArtifactsPage.class);
+        assertThat(firstPage.getTotalCount(), equalTo(69));
+
+        List<GHArtifact> artifactsFromRepo = new ArrayList<>(endpointItems.nextPage());
         artifactsFromRepo.sort((a1, a2) -> a1.getName().compareTo(a2.getName()));
 
         // We have at least the two artifacts we just added
@@ -523,9 +532,13 @@ public void testJobs() throws IOException {
                 latestPreexistingWorkflowRunId)
                 .orElseThrow(() -> new IllegalStateException("We must have a valid workflow run starting from here"));
 
-        List<GHWorkflowJob> jobs = workflowRun.listJobs()
-                .toList()
-                .stream()
+        var endpointItems = workflowRun.listJobs().items();
+        var currentPage = endpointItems.getCurrentPage();
+        var firstPage = Objects.castIfBelongsToType(currentPage, GHWorkflowJobsPage.class);
+        assertThat(firstPage.getTotalCount(), equalTo(2));
+
+        List<GHWorkflowJob> jobs = StreamSupport
+                .stream(Spliterators.spliteratorUnknownSize(endpointItems, Spliterator.ORDERED), false)
                 .sorted((j1, j2) -> j1.getName().compareTo(j2.getName()))
                 .collect(Collectors.toList());
 
@@ -762,9 +775,13 @@ public void testStartupFailureConclusion() throws IOException {
 
         GHWorkflow ghWorkflow = repo.getWorkflow("startup-failure-workflow.yml");
 
-        List<GHWorkflowRun> ghWorkflowRunList = ghWorkflow.listRuns().toList();
+        var endpointItems = ghWorkflow.listRuns().items();
+        var currentPage = endpointItems.getCurrentPage();
+        var firstPage = Objects.castIfBelongsToType(currentPage, GHWorkflowRunsPage.class);
+        assertThat(firstPage.getTotalCount(), equalTo(4));
 
-        List<GHWorkflowRun> list = ghWorkflowRunList.stream()
+        List<GHWorkflowRun> list = StreamSupport
+                .stream(Spliterators.spliteratorUnknownSize(endpointItems, Spliterator.ORDERED), false)
                 .filter(ghWorkflowRun -> ghWorkflowRun.getConclusion().equals(Conclusion.STARTUP_FAILURE))
                 .collect(Collectors.toList());
 

src/test/java/org/kohsuke/github/GHWorkflowTest.java

@@ -1,19 +1,23 @@
 package org.kohsuke.github;
 
+import org.assertj.core.util.Objects;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.notNullValue;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -184,7 +188,15 @@ public void testListWorkflowRuns() throws IOException {
      */
     @Test
     public void testListWorkflows() throws IOException {
-        List<GHWorkflow> workflows = repo.listWorkflows().toList();
+
+        var endpointItems = repo.listWorkflows().items();
+        var currentPage = endpointItems.getCurrentPage();
+        var firstPage = Objects.castIfBelongsToType(currentPage, GHWorkflowsPage.class);
+        assertThat(firstPage.getTotalCount(), equalTo(1));
+
+        List<GHWorkflow> workflows = StreamSupport
+                .stream(Spliterators.spliteratorUnknownSize(endpointItems, Spliterator.ORDERED), false)
+                .collect(Collectors.toList());
 
         GHWorkflow workflow = workflows.get(0);
         assertThat(workflow.getId(), equalTo(6817859L));