You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/28 04:21:09 UTC
[04/44] git commit: SLIDER-35 regression: TestPublisherRestResources
broken with the move to multi-configsets
SLIDER-35 regression: TestPublisherRestResources broken with the move to multi-configsets
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ea16c7be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ea16c7be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ea16c7be
Branch: refs/heads/master
Commit: ea16c7be43a7a1b1b19f91b6d2585dc12a90bbda
Parents: edbd55d
Author: Steve Loughran <st...@hortonworks.com>
Authored: Wed May 21 15:58:20 2014 +0100
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Wed May 21 15:58:20 2014 +0100
----------------------------------------------------------------------
.../web/rest/publisher/PublisherResource.java | 2 +-
.../publisher/TestPublisherRestResources.groovy | 23 +++++++++++---------
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea16c7be/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
index b139f74..e6b2664 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
@@ -150,7 +150,7 @@ public class PublisherResource {
}
@GET
- @Path("/" + CONFIG+ ".json")
+ @Path("/" + CONFIG + ".json")
@Produces({MediaType.APPLICATION_JSON})
public String getConfigurationContentJson(
@PathParam("setname") String setname,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea16c7be/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index 0100d7a..bc7c79a 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -101,32 +101,35 @@ class TestPublisherRestResources extends AgentTestBase {
Client client = createTestClient();
// test the available GET URIs
- WebResource webResource = client.resource(publisher_url + "/dummy-site");
+ String sliderConfigset = publisher_url +"/"+ RestPaths.SLIDER_CONFIGSET + "/"
+ WebResource webResource
+ webResource = client.resource(sliderConfigset);
+ webResource = client.resource(sliderConfigset + "dummy-site");
PublishedConfiguration config = webResource.type(MediaType.APPLICATION_JSON)
.get(PublishedConfiguration.class);
assert config != null
Map<String,String> entries = config.entries
log.info("entries are {}", entries)
- assert entries.get("prop1").equals("val1")
- assert entries.get("prop2").equals("val2")
+ assert entries.get("prop1") =="val1"
+ assert entries.get("prop2")== "val2"
- webResource = client.resource(publisher_url + "/dummy-site/prop1");
+ webResource = client.resource(sliderConfigset + "dummy-site/prop1");
Map<String,String> val = webResource.type(MediaType.APPLICATION_JSON).get(Map.class);
assert "val1".equals(val.get("prop1"))
// some negative tests...
- webResource = client.resource(appendToURL(publisher_url,
- "/foobar-site"));
+ webResource = client.resource(appendToURL(sliderConfigset,
+ "foobar-site"));
ClientResponse response = webResource.type(MediaType.APPLICATION_JSON)
.get(ClientResponse.class);
- assert response.getStatus() == 404
+ assert 404 == response.status
- webResource = client.resource(publisher_url + "/dummy-site/missing.prop");
+ webResource = client.resource(sliderConfigset + "dummy-site/missing.prop");
response = webResource.type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
- assert response.getStatus() == 404
+ assert 404 == response.status
- }
+ }
}