Commented the tests in the EntityControllerTest because even when disabled, they were still executed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/fc37686c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/fc37686c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/fc37686c Branch: refs/heads/0.4.0 Commit: fc37686cbe9cf20f46a72e56e83dfdbc20ef1b8c Parents: b9e25d8 Author: Peter Veentjer <[email protected]> Authored: Mon Aug 27 17:10:14 2012 +0300 Committer: Peter Veentjer <[email protected]> Committed: Mon Aug 27 17:10:14 2012 +0300 ---------------------------------------------------------------------- .../web/console/EntityControllerTest.groovy | 88 ++++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/fc37686c/usage/web-console/src/test/java/brooklyn/web/console/EntityControllerTest.groovy ---------------------------------------------------------------------- diff --git a/usage/web-console/src/test/java/brooklyn/web/console/EntityControllerTest.groovy b/usage/web-console/src/test/java/brooklyn/web/console/EntityControllerTest.groovy index c0c89e8..524df3c 100644 --- a/usage/web-console/src/test/java/brooklyn/web/console/EntityControllerTest.groovy +++ b/usage/web-console/src/test/java/brooklyn/web/console/EntityControllerTest.groovy @@ -24,51 +24,51 @@ public class EntityControllerTest extends grails.test.ControllerUnitTestCase { MyApp app Location loc - @BeforeMethod - public void setupController() { - super.setUp() - - entityService = new EntityService() - loc = new SimulatedLocation([latitude: 56, longitude: -2.5]); - app = new MyApp() - app.start([loc]) - entityService.managementContextService = app.managementContext - - controller.entityService = entityService - } - - @AfterMethod - public void tearDown() { - super.tearDown() - } - - @Test(enabled=false) - void testRetrievesEntityInfo() { - controller.params.id = app.id - controller.info() - Object result = new JsonSlurper().parseText(controller.response.contentAsString) - assertEquals(result.id, app.id) - assertEquals(result.displayName, app.displayName) - } - - @Test(enabled=false) - void testRetrievingEntityInfoForNonExistantEntityGives404() { - controller.params.id = "doesnotexist" - controller.info() - assertEquals(404, controller.response.status) - } +// @BeforeMethod +// public void setupController() { +// super.setUp() +// +// entityService = new EntityService() +// loc = new SimulatedLocation([latitude: 56, longitude: -2.5]); +// app = new MyApp() +// app.start([loc]) +// entityService.managementContextService = app.managementContext +// +// controller.entityService = entityService +// } +// +// @AfterMethod +// public void tearDown() { +// super.tearDown() +// } - // FIXME actually returns json of collection of SensorSummary objects, rather than map - @Test(enabled=false) - void testSerializeSensorOfTypeEnum() { - app.setAttribute(MyApp.MY_ENUM_SIMPLE, MyEnumSimple.B) - app.setAttribute(MyApp.MY_ENUM, MyEnumWithGetterMethod.A) - controller.params.id = app.id - controller.sensors() - Object result = new JsonSlurper().parseText(controller.response.contentAsString) - assertEquals(result.myenumWithGetterMethod, "A") - assertEquals(result.myenumSimple, "A") - } +// @Test(enabled=false) +// void testRetrievesEntityInfo() { +// controller.params.id = app.id +// controller.info() +// Object result = new JsonSlurper().parseText(controller.response.contentAsString) +// assertEquals(result.id, app.id) +// assertEquals(result.displayName, app.displayName) +// } +// +// @Test(enabled=false) +// void testRetrievingEntityInfoForNonExistantEntityGives404() { +// controller.params.id = "doesnotexist" +// controller.info() +// assertEquals(404, controller.response.status) +// } +// +// // FIXME actually returns json of collection of SensorSummary objects, rather than map +// @Test(enabled=false) +// void testSerializeSensorOfTypeEnum() { +// app.setAttribute(MyApp.MY_ENUM_SIMPLE, MyEnumSimple.B) +// app.setAttribute(MyApp.MY_ENUM, MyEnumWithGetterMethod.A) +// controller.params.id = app.id +// controller.sensors() +// Object result = new JsonSlurper().parseText(controller.response.contentAsString) +// assertEquals(result.myenumWithGetterMethod, "A") +// assertEquals(result.myenumSimple, "A") +// } } @InheritConstructors
