You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/12 02:10:01 UTC

[4/6] incubator-brooklyn git commit: [BROOKLYN-161] Ignore tests until osgi test support is in place

[BROOKLYN-161] Ignore tests until osgi test support is in place


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

Branch: refs/heads/master
Commit: 190f5141c3d3ee8df820273a8c51ae2f3813604f
Parents: 89324db
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Aug 10 23:23:56 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Mon Aug 10 23:23:56 2015 -0400

----------------------------------------------------------------------
 .../brooklyn/catalog/CatalogYamlEntityTest.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/190f5141/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 5d3dc75..4731390 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
+    // @Test FIXME [BROOKLYN-161]
     public void testLoadResourceFromBundle() throws Exception {
         String id = "resource.test";
         addCatalogOSGiEntity(id, SIMPLE_ENTITY_TYPE);
@@ -594,7 +594,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
         }
     }
 
-    @Test
+    // @Test FIXME [BROOKLYN-161]
     public void testOsgiNotLeakingToParent() {
         addCatalogOSGiEntity(SIMPLE_ENTITY_TYPE);
         try {
@@ -611,7 +611,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
         }
     }
 
-    @Test
+    // @Test FIXME [BROOKLYN-161]
     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
+    // @Test FIXME [BROOKLYN-161]
     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
+    // @Test FIXME [BROOKLYN-161]
     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
+    // @Test FIXME [BROOKLYN-161]
     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
+    // @Test FIXME [BROOKLYN-161]
     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
+    // @Test FIXME [BROOKLYN-161]
     public void testExplicitFlagsAppliesToCatalogItemImpl() throws Exception {
         addCatalogOSGiEntity("test", TestEntityImpl.class.getName());
         String testName = "test-applies-config-on-catalog-item";