You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2015/02/06 17:58:25 UTC
[4/5] incubator-brooklyn git commit: AbstractBlueprintTest: make
fields/methods protected
AbstractBlueprintTest: make fields/methods protected
Make it more useful for sub-classing in downstream projects.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8d015a8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8d015a8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8d015a8f
Branch: refs/heads/master
Commit: 8d015a8f31147a4a03b043806d52d9f6a4f1aef8
Parents: 83aa2d6
Author: Aled Sage <al...@gmail.com>
Authored: Fri Feb 6 15:08:12 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Feb 6 15:08:12 2015 +0000
----------------------------------------------------------------------
.../blueprints/AbstractBlueprintTest.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8d015a8f/usage/launcher/src/test/java/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/test/java/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/usage/launcher/src/test/java/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
index e9df79c..ec084e9 100644
--- a/usage/launcher/src/test/java/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
+++ b/usage/launcher/src/test/java/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
@@ -54,12 +54,12 @@ public abstract class AbstractBlueprintTest {
private static final Logger LOG = LoggerFactory.getLogger(AbstractBlueprintTest.class);
- private File mementoDir;
- private ClassLoader classLoader = AbstractBlueprintTest.class.getClassLoader();
+ protected File mementoDir;
+ protected ClassLoader classLoader = AbstractBlueprintTest.class.getClassLoader();
- private ManagementContext mgmt;
- private SimpleYamlLauncherForTests launcher;
- private BrooklynLauncher viewer;
+ protected ManagementContext mgmt;
+ protected SimpleYamlLauncherForTests launcher;
+ protected BrooklynLauncher viewer;
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
@@ -117,6 +117,15 @@ public abstract class AbstractBlueprintTest {
assertNoFires(newApp);
}
+ protected void runTest(Reader yaml) throws Exception {
+ final Application app = launcher.launchAppYaml(yaml);
+
+ assertNoFires(app);
+
+ Application newApp = rebind();
+ assertNoFires(newApp);
+ }
+
protected void assertNoFires(final Entity app) {
EntityTestUtils.assertAttributeEqualsEventually(app, Attributes.SERVICE_UP, true);
EntityTestUtils.assertAttributeEqualsEventually(app, Attributes.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING);