minor fixes

Ajay Kannan · Ajay Kannan · commit 6b322fa1a0ca · 2016-02-18T08:30:30.000-08:00
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -248,7 +248,9 @@ private static Map<String, Object> parseListOptions(String query) {
             options.put("pageToken", argEntry[1]);
             break;
           case "pageSize":
-            options.put("pageSize", Integer.parseInt(argEntry[1]));
+            int pageSize = Integer.valueOf(argEntry[1]);
+            checkArgument(pageSize > 0, "Page size must be greater than 0.");
+            options.put("pageSize", pageSize);
             break;
         }
       }
@@ -363,10 +365,11 @@ Response list(Map<String, Object> options) {
     String pageToken = (String) options.get("pageToken");
     Integer pageSize = (Integer) options.get("pageSize");
     String nextPageToken = null;
-    for (Project p : projects.values()) {
-      if (pageToken != null && p.getProjectId().compareTo(pageToken) < 0) {
-        continue;
-      }
+    Map<String, Project> projectsToScan = projects;
+    if (pageToken != null) {
+      projectsToScan = projects.tailMap(pageToken);
+    }
+    for (Project p : projectsToScan.values()) {
       if (pageSize != null && count >= pageSize) {
         nextPageToken = p.getProjectId();
         break;
@@ -385,11 +388,13 @@ Response list(Map<String, Object> options) {
     StringBuilder responseBody = new StringBuilder();
     responseBody.append("{\"projects\": [");
     Joiner.on(",").appendTo(responseBody, projectsSerialized);
-    responseBody.append("]");
+    responseBody.append(']');
     if (nextPageToken != null) {
-      responseBody.append(", \"nextPageToken\": \"" + nextPageToken + "\"");
+      responseBody.append(", \"nextPageToken\": \"");
+      responseBody.append(nextPageToken);
+      responseBody.append('"');
     }
-    responseBody.append("}");
+    responseBody.append('}');
     return new Response(HTTP_OK, responseBody.toString());
   }
 
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java
@@ -316,6 +316,7 @@ public void testListPaging() {
     iterator = projects.y().iterator();
     compareReadWriteFields(PARTIAL_PROJECT, iterator.next());
     assertFalse(iterator.hasNext());
+    assertNull(projects.x());
   }
 
   @Test
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
@@ -183,7 +183,7 @@ public void testList() {
   }
 
   @Test
-  public void tsetListPaging() {
+  public void testListPaging() {
     RESOURCE_MANAGER.create(PARTIAL_PROJECT);
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
     Page<Project> page = RESOURCE_MANAGER.list(ProjectListOption.pageSize(1));
@@ -195,6 +195,7 @@ public void tsetListPaging() {
     iterator = page.values().iterator();
     compareReadWriteFields(PARTIAL_PROJECT, iterator.next());
     assertFalse(iterator.hasNext());
+    assertNull(page.nextPageCursor());
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,7 @@ public void testListPaging() {`
`316`	`316`	`iterator = projects.y().iterator();`
`317`	`317`	`compareReadWriteFields(PARTIAL_PROJECT, iterator.next());`
`318`	`318`	`assertFalse(iterator.hasNext());`
	`319`	`+ assertNull(projects.x());`
`319`	`320`	`}`
`320`	`321`
`321`	`322`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public void testList() {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`@Test`
`186`		`- public void tsetListPaging() {`
	`186`	`+ public void testListPaging() {`
`187`	`187`	`RESOURCE_MANAGER.create(PARTIAL_PROJECT);`
`188`	`188`	`RESOURCE_MANAGER.create(COMPLETE_PROJECT);`
`189`	`189`	`Page<Project> page = RESOURCE_MANAGER.list(ProjectListOption.pageSize(1));`
`@@ -195,6 +195,7 @@ public void tsetListPaging() {`
`195`	`195`	`iterator = page.values().iterator();`
`196`	`196`	`compareReadWriteFields(PARTIAL_PROJECT, iterator.next());`
`197`	`197`	`assertFalse(iterator.hasNext());`
	`198`	`+ assertNull(page.nextPageCursor());`
`198`	`199`	`}`
`199`	`200`
`200`	`201`	`@Test`