You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/15 00:44:14 UTC
[2/3] git commit: Fix ApiDocResourceTest.testCatalogDetails
Fix ApiDocResourceTest.testCatalogDetails
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0439bc87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0439bc87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0439bc87
Branch: refs/heads/master
Commit: 0439bc879df92c9760a3e6e0c48a7d9351d8c1b2
Parents: 0956ebe
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jul 14 23:37:48 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jul 14 23:37:48 2014 +0100
----------------------------------------------------------------------
.../brooklyn/rest/resources/ApiDocResourceTest.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0439bc87/usage/rest-server/src/test/java/brooklyn/rest/resources/ApiDocResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/ApiDocResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/ApiDocResourceTest.java
index c1a0779..a46e48c 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/ApiDocResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/ApiDocResourceTest.java
@@ -32,8 +32,10 @@ import brooklyn.rest.BrooklynRestApi;
import brooklyn.rest.testing.BrooklynRestResourceTest;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.wordnik.swagger.core.Documentation;
import com.wordnik.swagger.core.DocumentationEndPoint;
+import com.wordnik.swagger.core.DocumentationOperation;
/**
* @author Adam Lowe
@@ -78,7 +80,7 @@ public class ApiDocResourceTest extends BrooklynRestResourceTest {
@Test
public void testCatalogDetails() throws Exception {
Documentation response = client().resource("/v1/apidoc/brooklyn.rest.resources.CatalogResource").get(Documentation.class);
- assertEquals(countOperations(response), 10);
+ assertEquals(countOperations(response), 11, "ops="+getOperations(response));
}
@SuppressWarnings("rawtypes")
@@ -104,9 +106,13 @@ public class ApiDocResourceTest extends BrooklynRestResourceTest {
/* Note in some cases we might have more than one Resource method per 'endpoint'
*/
private int countOperations(Documentation doc) throws Exception {
- int result = 0;
+ return getOperations(doc).size();
+ }
+
+ private List<DocumentationOperation> getOperations(Documentation doc) throws Exception {
+ List<DocumentationOperation> result = Lists.newArrayList();
for (DocumentationEndPoint endpoint : doc.getApis()) {
- result += endpoint.getOperations().size();
+ result.addAll(endpoint.getOperations());
}
return result;
}