You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/06/02 14:02:23 UTC
git commit: Improved error messages in preconditions
Repository: jclouds-labs
Updated Branches:
refs/heads/master 9f4b28a9b -> 867574c3f
Improved error messages in preconditions
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/867574c3
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/867574c3
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/867574c3
Branch: refs/heads/master
Commit: 867574c3f4a8e6c13077d472edb56459ca5819a9
Parents: 9f4b28a
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri May 30 12:16:35 2014 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jun 2 14:00:13 2014 +0200
----------------------------------------------------------------------
.../jclouds/digitalocean/compute/util/LocationNamingUtils.java | 6 ++++--
.../digitalocean/compute/util/LocationNamingUtilsTest.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/867574c3/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java
index abbf4dc..bca8e9c 100644
--- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java
+++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java
@@ -39,7 +39,8 @@ public class LocationNamingUtils {
checkNotNull(location, "location cannot be null");
String regionIdAndName = location.getDescription();
int index = regionIdAndName.indexOf('/');
- checkArgument(index >= 0, "location description should be in the form 'regionId/regionName'");
+ checkArgument(index >= 0, "location description should be in the form 'regionId/regionName' but was: %s",
+ regionIdAndName);
return Integer.parseInt(regionIdAndName.substring(0, index));
}
@@ -53,7 +54,8 @@ public class LocationNamingUtils {
checkNotNull(location, "location cannot be null");
String regionIdAndName = location.getDescription();
int index = regionIdAndName.indexOf('/');
- checkArgument(index >= 0, "location description should be in the form 'regionId/regionName'");
+ checkArgument(index >= 0, "location description should be in the form 'regionId/regionName' but was: %s",
+ regionIdAndName);
return regionIdAndName.substring(index + 1);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/867574c3/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java
index 4f5ec06..724f0ad 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java
@@ -55,7 +55,7 @@ public class LocationNamingUtilsTest {
extractRegionId(null);
}
- @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName'")
+ @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName' but was: foobar")
public void testExtractRegionIdWithoutEncodedForm() {
extractRegionId(location("foobar"));
}
@@ -79,7 +79,7 @@ public class LocationNamingUtilsTest {
extractRegionId(null);
}
- @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName'")
+ @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName' but was: foobar")
public void testExtractRegionNameWithoutEncodedForm() {
extractRegionId(location("foobar"));
}