[1/2] brooklyn-server git commit: BROOKLYN-272: fix dependsOnMethods in ApplicationResourceTest

2016-05-26 Thread sjcorbett 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master c5f3235b0 -> 9a5413c7e


BROOKLYN-272: fix dependsOnMethods in ApplicationResourceTest

This broke testDeleteApplicaiton, which had dependsOnMethods=...
that included the now-disabled testFetchApplicationsAndEntity

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e6c7cdad
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e6c7cdad
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e6c7cdad

Branch: refs/heads/master
Commit: e6c7cdad131a324db5dc6e905a980b35d77716bd
Parents: c5f3235
Author: Aled Sage 
Authored: Thu May 26 09:11:09 2016 +0100
Committer: Aled Sage 
Committed: Thu May 26 09:11:09 2016 +0100

--
 .../brooklyn/rest/resources/ApplicationResourceTest.java| 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6c7cdad/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
--
diff --git 
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
 
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
index 1adf7fc..ea49b47 100644
--- 
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
+++ 
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
@@ -350,8 +350,7 @@ public class ApplicationResourceTest extends 
BrooklynRestResourceTest {
 
 /**
  * TODO BROOKLYN-272, Disabled, because fails non-deterministically in 
jenkins (windows),
- *  as commented by Svet in 
https://github.com/apache/brooklyn-library/pull/39
- * 
+ *  as commented by Svet in 
https://github.com/apache/brooklyn-library/pull/39.
  * 
testFetchApplicationsAndEntity(org.apache.brooklyn.rest.resources.ApplicationResourceTest)
  Time elapsed: 0.073 sec  <<< FAILURE!
  * java.lang.AssertionError: expected [4] but found [3]
  * at org.testng.Assert.fail(Assert.java:94)
@@ -360,6 +359,8 @@ public class ApplicationResourceTest extends 
BrooklynRestResourceTest {
  * at org.testng.Assert.assertEquals(Assert.java:370)
  * at org.testng.Assert.assertEquals(Assert.java:380)
  * at 
org.apache.brooklyn.rest.resources.ApplicationResourceTest.testFetchApplicationsAndEntity(ApplicationResourceTest.java:387)
+ * 
+ * When re-enabling, be sure to add it back to dependsOnMethods in 
testDeleteApplication.
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 @Test(dependsOnMethods = "testDeployApplication", groups={"Broken"})
@@ -595,7 +596,9 @@ public class ApplicationResourceTest extends 
BrooklynRestResourceTest {
 assertEquals(details.get("leafEntityCount"), 2);
 }
 
-@Test(dependsOnMethods = {"testListEffectors", 
"testFetchApplicationsAndEntity", "testTriggerSampleEffector", 
"testListApplications","testReadEachSensor","testPolicyWhichCapitalizes","testLocatedLocation"})
+
+// TODO BROOKLYN-272: testFetchApplicationsAndEntity is temporarily 
disabled; therefore removed from dependsOnMethod list
+@Test(dependsOnMethods = {"testListEffectors", 
/*"testFetchApplicationsAndEntity",*/ "testTriggerSampleEffector", 
"testListApplications","testReadEachSensor","testPolicyWhichCapitalizes","testLocatedLocation"})
 public void testDeleteApplication() throws TimeoutException, 
InterruptedException {
 waitForPageFoundResponse("/applications/simple-app", 
ApplicationSummary.class);
 Collection apps = 
getManagementContext().getApplications();

[2/2] brooklyn-server git commit: This closes #158

2016-05-26 Thread sjcorbett 
This closes #158

BROOKLYN-272: fix dependsOnMethods in ApplicationResourceTest


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9a5413c7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9a5413c7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9a5413c7

Branch: refs/heads/master
Commit: 9a5413c7e436b02a455e4d6dafb4689888245b10
Parents: c5f3235 e6c7cda
Author: Sam Corbett 
Authored: Thu May 26 16:09:13 2016 +0100
Committer: Sam Corbett 
Committed: Thu May 26 16:09:13 2016 +0100

--
 .../brooklyn/rest/resources/ApplicationResourceTest.java| 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--