From e6c7cdad131a324db5dc6e905a980b35d77716bd Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Thu, 26 May 2016 09:11:09 +0100 Subject: [PATCH] BROOKLYN-272: fix dependsOnMethods in ApplicationResourceTest This broke testDeleteApplicaiton, which had dependsOnMethods=... that included the now-disabled testFetchApplicationsAndEntity --- .../brooklyn/rest/resources/ApplicationResourceTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 1adf7fc74f..ea49b47e47 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 void testGetApplicationOnFire() { /** * 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 void testGetApplicationOnFire() { * 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 void testLocatedLocation() { 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();