You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/10/12 14:28:51 UTC

[1/2] brooklyn-server git commit: Destroy the management context after tests complete

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 0547ffab9 -> 1de3fb87b


Destroy the management context after tests complete


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

Branch: refs/heads/master
Commit: 733a24fddefe0277afad3b4639f3af7903ca92a9
Parents: a77b338
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Oct 12 13:04:46 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Oct 12 13:04:46 2016 +0300

----------------------------------------------------------------------
 .../core/objs/BasicSpecParameterFromClassTest.java       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/733a24fd/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
index 6cb33f7..3cdd66a 100644
--- a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
@@ -27,27 +27,20 @@ import java.util.Map;
 import org.apache.brooklyn.api.catalog.CatalogConfig;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.ImplementedBy;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.api.objs.SpecParameter;
 import org.apache.brooklyn.config.ConfigKey;
 import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.entity.AbstractEntity;
 import org.apache.brooklyn.core.entity.BrooklynConfigKeys;
-import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
 import org.apache.brooklyn.util.core.ClassLoaderUtils;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.reflect.TypeToken;
 
-public class BasicSpecParameterFromClassTest {
-    private ManagementContext mgmt;
-    @BeforeMethod(alwaysRun=true)
-    public void setUp() {
-        mgmt = LocalManagementContextForTests.newInstance();
-    }
+public class BasicSpecParameterFromClassTest extends BrooklynMgmtUnitTestSupport {
 
     public interface SpecParameterTestEntity extends Entity {
         @CatalogConfig(label="String Key", priority=3, pinned = false)


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

Posted by al...@apache.org.
This closes #380


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

Branch: refs/heads/master
Commit: 1de3fb87b723af16aa0cc587fa4ebf3f8b2fcbc7
Parents: 0547ffa 733a24f
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 12 15:28:35 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 12 15:28:35 2016 +0100

----------------------------------------------------------------------
 .../core/objs/BasicSpecParameterFromClassTest.java       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------