You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/03 16:52:10 UTC
[26/29] git commit: make test which requires being online an
integration test, and tidy reporting of errors
make test which requires being online an integration test, and tidy reporting of errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/139822a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/139822a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/139822a9
Branch: refs/heads/master
Commit: 139822a9c3ac5c38ef52ab0ddbfac88a509ad46d
Parents: 4de0dc9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Oct 30 22:49:16 2014 -0500
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Oct 31 09:39:51 2014 -0500
----------------------------------------------------------------------
.../main/java/brooklyn/location/basic/HostLocationResolver.java | 2 +-
.../java/brooklyn/location/basic/HostLocationResolverTest.java | 5 +++++
.../common/src/main/java/brooklyn/util/text/KeyValueParser.java | 3 +--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/139822a9/core/src/main/java/brooklyn/location/basic/HostLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/HostLocationResolver.java b/core/src/main/java/brooklyn/location/basic/HostLocationResolver.java
index 6bd70c1..2bb5b4b 100644
--- a/core/src/main/java/brooklyn/location/basic/HostLocationResolver.java
+++ b/core/src/main/java/brooklyn/location/basic/HostLocationResolver.java
@@ -64,7 +64,7 @@ public class HostLocationResolver extends AbstractLocationResolver {
Maybe<Location> testResolve = managementContext.getLocationRegistry().resolve(target, false, null);
if (!testResolve.isPresent()) {
throw new IllegalArgumentException("Invalid target location '" + target + "' for location '"+HOST+"': "+
- Exceptions.collapseText( ((Absent<?>)testResolve).getException() ));
+ Exceptions.collapseText( ((Absent<?>)testResolve).getException() ), ((Absent<?>)testResolve).getException());
}
return managementContext.getLocationManager().createLocation(LocationSpec.create(SingleMachineProvisioningLocation.class)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/139822a9/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java
index 8347e55..8ea9df0 100644
--- a/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java
+++ b/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java
@@ -68,6 +68,11 @@ public class HostLocationResolverTest {
public void resolveHosts() {
resolve("host:(\"1.1.1.1\")");
resolve("host:(\"localhost\")");
+ }
+
+ @Test(groups="Integration")
+ public void resolveRealHosts() {
+ // must be online to resolve this
resolve("host:(\"www.foo.com\")");
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/139822a9/utils/common/src/main/java/brooklyn/util/text/KeyValueParser.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/KeyValueParser.java b/utils/common/src/main/java/brooklyn/util/text/KeyValueParser.java
index f2f59db..76a4532 100644
--- a/utils/common/src/main/java/brooklyn/util/text/KeyValueParser.java
+++ b/utils/common/src/main/java/brooklyn/util/text/KeyValueParser.java
@@ -58,11 +58,10 @@ public class KeyValueParser {
StringBuilder result = new StringBuilder();
for (Map.Entry<String, String> entry : parts.entrySet()) {
+ if (result.length()>0) result.append(", ");
result.append(tokenizer.quoteToken(entry.getKey()));
if (entry.getValue() != null) result.append("="+tokenizer.quoteToken(entry.getValue()));
- result.append(", ");
}
- if (result.length() > 0) result.deleteCharAt(result.length()-1);
return result.toString();
}