Add new phases to test entity drivers
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ca6a619d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ca6a619d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ca6a619d Branch: refs/heads/master Commit: ca6a619d0ef422584e93db63d86be340301bbecd Parents: d5293bd Author: Andrew Kennedy <grk...@apache.org> Authored: Mon Oct 6 01:24:31 2014 +0100 Committer: Andrew Kennedy <grk...@apache.org> Committed: Mon Oct 6 11:49:20 2014 +0100 ---------------------------------------------------------------------- .../basic/EmptySoftwareProcessSshDriver.java | 27 ++++++++++++++--- .../entity/basic/SoftwareProcessEntityTest.java | 31 ++++++++++++++++++-- .../testing/mocks/RestMockSimpleEntity.java | 3 ++ 3 files changed, 55 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ca6a619d/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessSshDriver.java index 516c8e7..5c320c3 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessSshDriver.java @@ -37,12 +37,31 @@ public class EmptySoftwareProcessSshDriver extends AbstractSoftwareProcessSshDri } @Override - public void install() { - } + public void install() { } @Override - public void customize() { - } + public void customize() { } + + @Override + public void setup() { } + + @Override + public void copyInstallResources() { } + + @Override + public void copyRuntimeResources() { } + + @Override + public void runPreInstallCommand(String command) { } + + @Override + public void runPostInstallCommand(String command) { } + + @Override + public void runPreLaunchCommand(String command) { } + + @Override + public void runPostLaunchCommand(String command) { } @Override public void launch() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ca6a619d/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index 485edf2..e6de298 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -168,7 +168,7 @@ public class SoftwareProcessEntityTest extends BrooklynAppUnitTestSupport { SimulatedDriver d = (SimulatedDriver) entity.getDriver(); Assert.assertTrue(d.isRunning()); entity.stop(); - Assert.assertEquals(d.events, ImmutableList.of("install", "customize", "launch", "stop")); + Assert.assertEquals(d.events, ImmutableList.of("setup", "copyInstallResources", "install", "customize", "copyRuntimeResources", "launch", "stop")); Assert.assertFalse(d.isRunning()); } @@ -345,7 +345,34 @@ public class SoftwareProcessEntityTest extends BrooklynAppUnitTestSupport { launched = true; entity.setAttribute(Startable.SERVICE_UP, true); } - + + @Override + public void setup() { + events.add("setup"); + } + + @Override + public void copyInstallResources() { + events.add("copyInstallResources"); + } + + @Override + public void copyRuntimeResources() { + events.add("copyRuntimeResources"); + } + + @Override + public void runPreInstallCommand(String command) { } + + @Override + public void runPostInstallCommand(String command) { } + + @Override + public void runPreLaunchCommand(String command) { } + + @Override + public void runPostLaunchCommand(String command) { } + @Override protected String getInstallLabelExtraSalt() { return (String)getEntity().getConfigRaw(ConfigKeys.newStringConfigKey("salt"), true).or((String)null); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ca6a619d/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index d1c6cb2..1f66a0b 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -97,5 +97,8 @@ public class RestMockSimpleEntity extends SoftwareProcessImpl { public void install() {} public void customize() {} public void launch() {} + public void setup() { } + public void copyInstallResources() { } + public void copyRuntimeResources() { } } }
