SLIDER-782 about to make RestAPI delegates independent of REST vs IPC client
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7e296990 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7e296990 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7e296990 Branch: refs/heads/develop Commit: 7e296990ca7a66c340d240c48742caa19a0df3f2 Parents: ddf06ab Author: Steve Loughran <[email protected]> Authored: Fri Feb 13 11:57:13 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Feb 13 11:57:13 2015 +0000 ---------------------------------------------------------------------- .../agent/rest/JerseyTestDelegates.groovy | 6 +++- .../rest/RestAPIClientTestDelegates.groovy | 29 ++++++-------------- 2 files changed, 13 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e296990/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy index a7a5432..5eb14e3 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy @@ -103,6 +103,8 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { (T) resource.method(method.verb, c); } catch (UniformInterfaceException ex) { uprateFaults(method, resource, ex); + // never reached as the uprate throws the new exception + return null; } } @@ -122,7 +124,7 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { * @param ex * @return */ - public uprateFaults( + public void uprateFaults( HttpVerb method, WebResource webResource, UniformInterfaceException ex) { @@ -170,6 +172,7 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { public void testJerseyGetConftree() throws Throwable { jGetApplicationResource(LIVE_RESOURCES, ConfTree.class); } + public void testCodahaleOperations() throws Throwable { describe "Codahale operations" @@ -466,6 +469,7 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { testCodahaleOperations() testMimeTypes() + testJerseyGetConftree() testLiveResources() testLiveContainers(); testRESTModel() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e296990/slider-core/src/test/groovy/org/apache/slider/agent/rest/RestAPIClientTestDelegates.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/rest/RestAPIClientTestDelegates.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/rest/RestAPIClientTestDelegates.groovy index dce26ce..4532808 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/rest/RestAPIClientTestDelegates.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/rest/RestAPIClientTestDelegates.groovy @@ -22,13 +22,12 @@ import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.WebResource import groovy.transform.CompileStatic import groovy.util.logging.Slf4j +import org.apache.slider.api.SliderApplicationApi import org.apache.slider.api.StateValues import org.apache.slider.api.types.ComponentInformation import org.apache.slider.api.types.ContainerInformation import org.apache.slider.client.rest.SliderApplicationApiRestClient -import org.apache.slider.core.conf.ConfTree import org.apache.slider.core.conf.ConfTreeOperations -import org.apache.slider.server.appmaster.web.rest.application.ApplicationResource import org.apache.slider.test.Outcome import javax.ws.rs.core.MediaType @@ -36,7 +35,8 @@ import javax.ws.rs.core.MediaType import static org.apache.slider.api.ResourceKeys.COMPONENT_INSTANCES import static org.apache.slider.api.StatusKeys.* import static org.apache.slider.common.SliderKeys.COMPONENT_AM -import static org.apache.slider.server.appmaster.web.rest.RestPaths.* +import static org.apache.slider.server.appmaster.web.rest.RestPaths.LIVE_CONTAINERS +import static org.apache.slider.server.appmaster.web.rest.RestPaths.SLIDER_PATH_APPLICATION /** * Uses the Slider Application API for the tests. @@ -46,18 +46,13 @@ import static org.apache.slider.server.appmaster.web.rest.RestPaths.* @Slf4j class RestAPIClientTestDelegates extends AbstractRestTestDelegate { - final String appmaster; - final String application; - final Client jersey; - final SliderApplicationApiRestClient appAPI; + + final SliderApplicationApi appAPI; RestAPIClientTestDelegates(String appmaster, Client jersey, boolean enableComplexVerbs = true) { super(enableComplexVerbs) - this.jersey = jersey - this.appmaster = appmaster - application = appendToURL(appmaster, SLIDER_PATH_APPLICATION) WebResource amResource = jersey.resource(appmaster) amResource.type(MediaType.APPLICATION_JSON) def appResource = amResource.path(SLIDER_PATH_APPLICATION); @@ -150,7 +145,6 @@ class RestAPIClientTestDelegates extends AbstractRestTestDelegate { } - /** * Test the rest model. For this to work the cluster has to be configured * with the global option @@ -159,10 +153,6 @@ class RestAPIClientTestDelegates extends AbstractRestTestDelegate { public void testRESTModel() { describe "model" - assertPathServesList(appmaster, - MODEL, - ApplicationResource.MODEL_ENTRIES) - def unresolvedConf = appAPI.getDesiredModel() // log.info "Unresolved \n$unresolvedConf" def unresolvedAppConf = unresolvedConf.appConfOperations @@ -174,12 +164,10 @@ class RestAPIClientTestDelegates extends AbstractRestTestDelegate { assert resolvedConf.appConfOperations.getComponentOpt( sam, TEST_GLOBAL_OPTION, "") == TEST_GLOBAL_OPTION_PRESENT - def unresolved = fetchTypeList(ConfTree, appmaster, - [MODEL_DESIRED_APPCONF, MODEL_DESIRED_RESOURCES]) + def unresolved = appAPI.getDesiredModel() assert null == - unresolved[MODEL_DESIRED_APPCONF].components[sam][TEST_GLOBAL_OPTION] - - + unresolved.resources.components[sam][TEST_GLOBAL_OPTION] + def resolvedAppconf = appAPI.getResolvedAppconf() assert TEST_GLOBAL_OPTION_PRESENT== @@ -230,7 +218,6 @@ class RestAPIClientTestDelegates extends AbstractRestTestDelegate { } public void testSuiteGetOperations() { - testGetDesiredModel() testGetResolvedModel() testLiveResources()
