You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/20 17:42:43 UTC
[1/2] brooklyn-server git commit: Use minimal management context in
AbstractYamlTest
Repository: brooklyn-server
Updated Branches:
refs/heads/master 9fb41938f -> fad6e99b9
Use minimal management context in AbstractYamlTest
Speeds tests up a lot. Subclasses can enable OSGi by overriding
disableOsgi.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/17be7217
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/17be7217
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/17be7217
Branch: refs/heads/master
Commit: 17be721706e0e469360486f06e225935cb011fa6
Parents: 3b746e3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Apr 20 16:21:32 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Apr 20 16:21:32 2016 +0100
----------------------------------------------------------------------
.../camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java | 2 +-
.../org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java | 8 ++++++--
.../apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java | 7 ++++++-
.../brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java | 7 ++++++-
.../brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java | 8 --------
.../camp/brooklyn/catalog/CatalogYamlEntityTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlLocationTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlPolicyTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlTemplateTest.java | 5 +++++
.../camp/brooklyn/catalog/SpecParameterParsingTest.java | 7 ++++++-
10 files changed, 45 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java
index 921615e..1fd0580 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java
@@ -46,7 +46,7 @@ public abstract class BrooklynCampPlatformLauncherAbstract {
if (getBrooklynMgmt()==null)
useManagementContext(newMgmtContext());
-
+
platform = new BrooklynCampPlatform(
PlatformRootSummary.builder().name("Brooklyn CAMP Platform").build(),
getBrooklynMgmt())
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java
index 4478f2b..ede7812 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java
@@ -81,8 +81,12 @@ public abstract class AbstractYamlTest {
}
protected LocalManagementContext newTestManagementContext() {
- // TODO they don't all need osgi, just a few do, so could speed it up by specifying when they do
- return LocalManagementContextForTests.newInstanceWithOsgi();
+ return LocalManagementContextForTests.builder(true).disableOsgi(disableOsgi()).build();
+ }
+
+ /** Override to enable OSGi in the management context for all tests in the class. */
+ protected boolean disableOsgi() {
+ return true;
}
@AfterMethod(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
index bb0ea90..d05da3e 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
@@ -31,7 +31,12 @@ import org.testng.annotations.Test;
import com.google.common.collect.Iterables;
public class ReferencedYamlTest extends AbstractYamlTest {
-
+
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@Test
public void testReferenceEntityYamlAsPlatformComponent() throws Exception {
String entityName = "Reference child name";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
index 5a26f7a..15ff38e 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
@@ -48,7 +48,12 @@ import com.google.common.collect.Iterables;
public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
private static final Logger log = LoggerFactory.getLogger(CatalogOsgiVersionMoreEntityTest.class);
-
+
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
private static String getLocalResource(String filename) {
return ResourceUtils.create(CatalogOsgiVersionMoreEntityTest.class).getResourceAsString(
"classpath:/"+CatalogOsgiVersionMoreEntityTest.class.getPackage().getName().replace('.', '/')+"/"+filename);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java
index 2deeb3d..10575c5 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java
@@ -22,8 +22,6 @@ import org.testng.annotations.Test;
import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest;
import org.apache.brooklyn.camp.brooklyn.ApplicationsYamlTest;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
-import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
/**
* Also see related tests in {@link ApplicationsYamlTest}.
@@ -31,12 +29,6 @@ import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
*/
public class CatalogYamlAppTest extends AbstractYamlTest {
- @Override
- protected LocalManagementContext newTestManagementContext() {
- // Don't need osgi
- return LocalManagementContextForTests.newInstance();
- }
-
/**
* "Contrived" example was encountered by a customer in a real use-case!
* I couldn't yet simplify it further while still reproducing the failure.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index cfa88d4..38e2941 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -54,6 +54,11 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
private static final String SIMPLE_ENTITY_TYPE = OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_ENTITY;
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@Test
public void testAddCatalogItemVerySimple() throws Exception {
String symbolicName = "my.catalog.app.id.load";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
index ae269a4..1e35af1 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
@@ -60,6 +60,11 @@ public class CatalogYamlLocationTest extends AbstractYamlTest {
private static final String LOCALHOST_LOCATION_TYPE = LocalhostMachineProvisioningLocation.class.getName();
private static final String SIMPLE_LOCATION_TYPE = "org.apache.brooklyn.test.osgi.entities.SimpleLocation";
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@AfterMethod
public void tearDown() {
for (RegisteredType ci : mgmt().getTypeRegistry().getMatching(RegisteredTypePredicates.IS_LOCATION)) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
index fbfe630..beb2840 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
@@ -36,6 +36,11 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest {
private static final String SIMPLE_POLICY_TYPE = "org.apache.brooklyn.test.osgi.entities.SimplePolicy";
private static final String SIMPLE_ENTITY_TYPE = "org.apache.brooklyn.test.osgi.entities.SimpleEntity";
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@Test
public void testAddCatalogItem() throws Exception {
assertEquals(countCatalogPolicies(), 0);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
index d83711c..3c9d8a4 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
@@ -54,6 +54,11 @@ public class CatalogYamlTemplateTest extends AbstractYamlTest {
private static final String SIMPLE_ENTITY_TYPE = OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_ENTITY;
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@Test
public void testAddCatalogItem() throws Exception {
RegisteredType item = makeItem();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/17be7217/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
index 869ebc0..ffb78d1 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
@@ -42,7 +42,12 @@ import com.google.common.collect.Iterables;
import com.google.common.reflect.TypeToken;
public class SpecParameterParsingTest extends AbstractYamlTest {
-
+
+ @Override
+ protected boolean disableOsgi() {
+ return false;
+ }
+
@Test
public void testYamlInputsParsed() {
String itemId = add(
[2/2] brooklyn-server git commit: Closes #118
Posted by sv...@apache.org.
Closes #118
Use minimal management context in AbstractYamlTest
Speeds tests up a lot. Subclasses can enable OSGi by overriding `disableOsgi`.
Build of `camp-brooklyn` took 2:38 before and 1:40 afterwards on my relatively snappy laptop. The improvement should be more noticeable in Jenkins builds.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fad6e99b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fad6e99b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fad6e99b
Branch: refs/heads/master
Commit: fad6e99b9823ff3d5eaa98ff96493e2e71413cd8
Parents: 9fb4193 17be721
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Apr 20 16:40:46 2016 +0100
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Apr 20 16:40:46 2016 +0100
----------------------------------------------------------------------
.../camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java | 2 +-
.../org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java | 8 ++++++--
.../apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java | 7 ++++++-
.../brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java | 7 ++++++-
.../brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java | 8 --------
.../camp/brooklyn/catalog/CatalogYamlEntityTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlLocationTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlPolicyTest.java | 5 +++++
.../camp/brooklyn/catalog/CatalogYamlTemplateTest.java | 5 +++++
.../camp/brooklyn/catalog/SpecParameterParsingTest.java | 7 ++++++-
10 files changed, 45 insertions(+), 14 deletions(-)
----------------------------------------------------------------------