Revert "[BROOKLYN-161] Ignore tests until osgi test support is in place"
This reverts commit 190f5141c3d3ee8df820273a8c51ae2f3813604f. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/af63680c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/af63680c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/af63680c Branch: refs/heads/master Commit: af63680c68897280578cc3fb85c4ee7055b588da Parents: 97e4ab9 Author: Alex Heneveld <[email protected]> Authored: Thu Aug 20 13:42:45 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu Aug 20 13:42:45 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/catalog/CatalogYamlEntityTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af63680c/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index e71c142..383ffa6 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -529,7 +529,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { Assert.assertNotNull(spec); } - // @Test FIXME [BROOKLYN-161] + @Test public void testLoadResourceFromBundle() throws Exception { String id = "resource.test"; addCatalogOSGiEntity(id, SIMPLE_ENTITY_TYPE); @@ -594,7 +594,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { } } - // @Test FIXME [BROOKLYN-161] + @Test public void testOsgiNotLeakingToParent() { addCatalogOSGiEntity(SIMPLE_ENTITY_TYPE); try { @@ -611,7 +611,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { } } - // @Test FIXME [BROOKLYN-161] + @Test public void testConfigAppliedToCatalogItem() throws Exception { addCatalogOSGiEntity("test", TestEntity.class.getName()); String testName = "test-applies-config-on-catalog-item"; @@ -624,7 +624,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { assertEquals(testEntity.config().get(TestEntity.CONF_NAME), testName); } - // @Test FIXME [BROOKLYN-161] + @Test public void testFlagsAppliesToCatalogItem() throws Exception { addCatalogOSGiEntity("test", TestEntity.class.getName()); String testName = "test-applies-config-on-catalog-item"; @@ -636,7 +636,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { assertEquals(testEntity.config().get(TestEntity.CONF_NAME), testName); } - // @Test FIXME [BROOKLYN-161] + @Test public void testExplicitFlagsAppliesToCatalogItem() throws Exception { addCatalogOSGiEntity("test", TestEntity.class.getName()); String testName = "test-applies-config-on-catalog-item"; @@ -650,7 +650,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { } - // @Test FIXME [BROOKLYN-161] + @Test public void testConfigAppliedToCatalogItemImpl() throws Exception { addCatalogOSGiEntity("test", TestEntityImpl.class.getName()); String testName = "test-applies-config-on-catalog-item"; @@ -663,7 +663,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { assertEquals(testEntity.config().get(TestEntity.CONF_NAME), testName); } - // @Test FIXME [BROOKLYN-161] + @Test public void testFlagsAppliesToCatalogItemImpl() throws Exception { addCatalogOSGiEntity("test", TestEntityImpl.class.getName()); String testName = "test-applies-config-on-catalog-item"; @@ -675,7 +675,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { assertEquals(testEntity.config().get(TestEntity.CONF_NAME), testName); } - // @Test FIXME [BROOKLYN-161] + @Test public void testExplicitFlagsAppliesToCatalogItemImpl() throws Exception { addCatalogOSGiEntity("test", TestEntityImpl.class.getName()); String testName = "test-applies-config-on-catalog-item";
