Don't read global properties for tests My custom config should't influence the tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e87c49c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e87c49c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e87c49c1 Branch: refs/heads/master Commit: e87c49c13eee82102854b6c4e7204f40371a6e0b Parents: 8793e9d Author: Svetoslav Neykov <[email protected]> Authored: Tue Jan 27 18:15:04 2015 +0200 Committer: Svetoslav Neykov <[email protected]> Committed: Tue Jan 27 18:29:16 2015 +0200 ---------------------------------------------------------------------- .../src/test/java/brooklyn/launcher/BrooklynWebServerTest.java | 2 +- .../launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e87c49c1/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java index b069676..d40d1a4 100644 --- a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java @@ -58,7 +58,7 @@ public class BrooklynWebServerTest { @BeforeMethod(alwaysRun=true) public void setUp(){ - brooklynProperties = BrooklynProperties.Factory.newDefault(); + brooklynProperties = BrooklynProperties.Factory.newEmpty(); } @AfterMethod(alwaysRun=true) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e87c49c1/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java index 23018c3..cc44db7 100644 --- a/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java +++ b/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java @@ -145,6 +145,7 @@ public class WebAppRunnerTest { TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/hello-world.war"); BrooklynLauncher launcher = BrooklynLauncher.newInstance() + .globalBrooklynPropertiesFile(null) .brooklynProperties("brooklyn.webconsole.security.provider","brooklyn.rest.security.provider.AnyoneSecurityProvider") .webapp("/hello", "hello-world.war") .start();
