Skip to content

Commit 5831f1e

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 1703 b: refs/heads/master c: df32901 h: refs/heads/master i: 1701: 30c5ca6 1699: d783ee2 1695: 62f0149
1 parent d41cbb2 commit 5831f1e

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6b322fa1a0cacb7c79b1709df78fe6163d48ce07
2+
refs/heads/master: df32901b0d711c15728d4dcf184f64903fc14f8f
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3

trunk/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private static String[] parseFields(String query) {
228228
return null;
229229
}
230230

231-
private static Map<String, Object> parseListOptions(String query) {
231+
private static Map<String, Object> parseListOptions(String query) throws IOException {
232232
Map<String, Object> options = new HashMap<>();
233233
if (query != null) {
234234
String[] args = query.split("&");
@@ -249,7 +249,9 @@ private static Map<String, Object> parseListOptions(String query) {
249249
break;
250250
case "pageSize":
251251
int pageSize = Integer.valueOf(argEntry[1]);
252-
checkArgument(pageSize > 0, "Page size must be greater than 0.");
252+
if (pageSize < 1) {
253+
throw new IOException("Page size must be greater than 0.");
254+
}
253255
options.put("pageSize", pageSize);
254256
break;
255257
}

trunk/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,17 @@ public void testList() {
297297
}
298298
}
299299

300+
@Test
301+
public void testInvalidListPaging() {
302+
Map<ResourceManagerRpc.Option, Object> rpcOptions = new HashMap<>();
303+
rpcOptions.put(ResourceManagerRpc.Option.PAGE_SIZE, -1);
304+
try {
305+
rpc.list(rpcOptions);
306+
} catch (Exception e) {
307+
assertEquals("Page size must be greater than 0.", e.getMessage());
308+
}
309+
}
310+
300311
@Test
301312
public void testListPaging() {
302313
Map<ResourceManagerRpc.Option, Object> rpcOptions = new HashMap<>();

0 commit comments

Comments
 (0)