Skip to content

Commit 8cfb286

Browse files
committed
fix merge conflict
1 parent 636476b commit 8cfb286

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

src/test/java/com/google/gcloud/storage/ListResultTest.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,26 @@
2222

2323
import org.junit.Test;
2424

25+
import java.util.Collections;
26+
2527
public class ListResultTest {
2628

2729
@Test
2830
public void testListResult() throws Exception {
2931
ImmutableList<String> values = ImmutableList.of("1", "2");
30-
ListResult<String> result = new ListResult("c", values);
32+
final ListResult<String> nextResult =
33+
new ListResult<>(null, "c", Collections.<String>emptyList());
34+
ListResult.NextPageFetcher fetcher = new ListResult.NextPageFetcher<String>() {
35+
36+
@Override
37+
public ListResult nextPage() {
38+
return nextResult;
39+
}
40+
};
41+
ListResult<String> result = new ListResult(fetcher, "c", values);
42+
assertEquals(nextResult, result.nextPage());
3143
assertEquals("c", result.nextPageCursor());
3244
assertEquals(values, ImmutableList.copyOf(result.iterator()));
45+
3346
}
3447
}

0 commit comments

Comments
 (0)