Repository: incubator-brooklyn Updated Branches: refs/heads/master 177b57b16 -> a440080f4
fix cobertura build - BROOKLYN-134 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b1243359 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b1243359 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b1243359 Branch: refs/heads/master Commit: b1243359e14e6088b1e9aa9af37c2fb9ec44519c Parents: 177b57b Author: Alex Heneveld <[email protected]> Authored: Fri Feb 27 13:58:08 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Feb 27 14:06:41 2015 +0000 ---------------------------------------------------------------------- core/src/main/java/brooklyn/BrooklynVersion.java | 5 +++-- core/src/test/java/brooklyn/BrooklynVersionTest.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b1243359/core/src/main/java/brooklyn/BrooklynVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java index fb77cdc..ec71df7 100644 --- a/core/src/main/java/brooklyn/BrooklynVersion.java +++ b/core/src/main/java/brooklyn/BrooklynVersion.java @@ -216,9 +216,10 @@ public class BrooklynVersion { } while (paths.hasMoreElements()) { URL u = paths.nextElement(); - if (u.getPath().endsWith("core/target/classes/brooklyn/BrooklynVersion.class")) { + // running fram a classes directory (including coverage-classes for cobertura) triggers dev env + if (u.getPath().endsWith("classes/brooklyn/BrooklynVersion.class")) { try { - log.debug("Brooklyn debug environment detected; BrooklynVersion class is at: "+u); + log.debug("Brooklyn dev/src environment detected: BrooklynVersion class is at: "+u); return true; } catch (Exception e) { Exceptions.propagateIfFatal(e); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b1243359/core/src/test/java/brooklyn/BrooklynVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/BrooklynVersionTest.java b/core/src/test/java/brooklyn/BrooklynVersionTest.java index 9683600..3bc0a19 100644 --- a/core/src/test/java/brooklyn/BrooklynVersionTest.java +++ b/core/src/test/java/brooklyn/BrooklynVersionTest.java @@ -74,8 +74,9 @@ public class BrooklynVersionTest { if (sp==null) Assert.fail("Can't find test resources"); log.info("Test for dev env: "+"Dev env? "+BrooklynVersion.isDevelopmentEnvironment()+"; path "+sp); - Assert.assertEquals(sp.getPath().endsWith("classes/brooklyn/config/sample.properties"), BrooklynVersion.isDevelopmentEnvironment(), - "Dev env? "+BrooklynVersion.isDevelopmentEnvironment()+"; path "+sp); + boolean testResourcePathInClasses = sp.getPath().endsWith("classes/brooklyn/config/sample.properties"); + Assert.assertEquals(testResourcePathInClasses, BrooklynVersion.isDevelopmentEnvironment(), + "Dev env? "+BrooklynVersion.isDevelopmentEnvironment()+"; but resource path: "+sp); } }
