Repository: ambari Updated Branches: refs/heads/trunk 30e5d2d12 -> 801eb6864
AMBARI-7817 - Make paging parameters available to individual resource handlers (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/801eb686 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/801eb686 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/801eb686 Branch: refs/heads/trunk Commit: 801eb6864ad1da898687c58d534662f55bc5240e Parents: 30e5d2d Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Oct 17 16:42:11 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Oct 17 16:42:11 2014 -0400 ---------------------------------------------------------------------- .../internal/ClusterControllerImplTest.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/801eb686/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java index a1e33e1..cfb2efb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java @@ -929,11 +929,17 @@ public class ClusterControllerImplTest { anyObject(Predicate.class))).andReturn( Collections.<Resource> emptySet()).anyTimes(); + expect(resourceProvider.checkPropertyIds(EasyMock.anyObject(Set.class))).andReturn( + new HashSet<String>()).anyTimes(); + // strict pageRequest mock to ensure that paging is not performed on // the result set PageRequest pageRequest = EasyMock.createStrictMock(PageRequest.class); - replay(providerModule, resourceProvider, pageRequest); + SortRequest sortRequest = EasyMock.createStrictMock(SortRequest.class); + expect(sortRequest.getPropertyIds()).andReturn(new ArrayList<String>()).atLeastOnce(); + + replay(providerModule, resourceProvider, pageRequest, sortRequest); ClusterControllerImpl controller = new ClusterControllerImpl(providerModule); @@ -943,12 +949,13 @@ public class ClusterControllerImplTest { // create a result set that we will use to ensure that the contents // were unmodified Set<Resource> providerResources = new LinkedHashSet<Resource>(); - providerResources.add(createNiceMock(Resource.class)); + providerResources.add(new ResourceImpl(Resource.Type.AlertHistory)); PageInfo pageInfo = new PageInfo(pageRequest); pageInfo.setResponsePaged(true); - SortInfo sortInfo = null; + SortInfo sortInfo = new SortInfo(sortRequest); + sortInfo.setResponseSorted(true); Request request = PropertyHelper.getReadRequest(propertyIds, null, null, pageInfo, sortInfo); @@ -958,9 +965,9 @@ public class ClusterControllerImplTest { "c6401.ambari.apache.org").toPredicate(); PageResponse pageResponse = controller.getPage(Resource.Type.AlertHistory, - providerResources, request, predicate, pageRequest, null); + providerResources, request, predicate, pageRequest, sortRequest); - verify(providerModule, resourceProvider, pageRequest); + verify(providerModule, resourceProvider, pageRequest, sortRequest); } public static class TestProviderModule implements ProviderModule {
