Parsing invalid serialized Bind throws IllegalArgumentException

albers · albers · commit ed92136784df · 2014-09-28T14:01:32.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -38,6 +38,7 @@ public boolean isReadOnly() {
 	 * 
 	 * @param serialized the specification, e.g. <code>/host:/container:ro</code>
 	 * @return a {@link Bind} matching the specification
+	 * @throws IllegalArgumentException if the specification cannot be parsed
 	 */
 	public static Bind parse(String serialized) {
 		try {
@@ -52,16 +53,14 @@ public static Bind parse(String serialized) {
 				else if ("ro".equals(parts[2].toLowerCase()))
 					return new Bind(parts[0], Volume.parse(parts[1]), true);
 				else
-					throw new RuntimeException("Error parsing Bind '"
-							+ serialized + "'");
+					throw new IllegalArgumentException();
 			}
 			default: {
-				throw new RuntimeException("Error parsing Bind '" + serialized
-						+ "'");
+				throw new IllegalArgumentException();
 			}
 			}
 		} catch (Exception e) {
-			throw new RuntimeException("Error parsing Bind '" + serialized
+			throw new IllegalArgumentException("Error parsing Bind '" + serialized
 					+ "'");
 		}
 	}
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -30,9 +30,22 @@ public void parseReadOnly() {
 		assertEquals(bind.isReadOnly(), true);
 	}
 
-	@Test(expectedExceptions = RuntimeException.class)
+	@Test(expectedExceptions = IllegalArgumentException.class,
+			expectedExceptionsMessageRegExp = "Error parsing Bind.*")
 	public void parseInvalidAccessMode() {
 		Bind.parse("/host:/container:xx");
 	}
-	
+
+	@Test(expectedExceptions = IllegalArgumentException.class, 
+			expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
+	public void parseInvalidInput() {
+		Bind.parse("nonsense");
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class, 
+			expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
+	public void parseNull() {
+		Bind.parse(null);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public boolean isReadOnly() {`
`38`	`38`	`*`
`39`	`39`	`* @param serialized the specification, e.g. <code>/host:/container:ro</code>`
`40`	`40`	`* @return a {@link Bind} matching the specification`
	`41`	`+ * @throws IllegalArgumentException if the specification cannot be parsed`
`41`	`42`	`*/`
`42`	`43`	`public static Bind parse(String serialized) {`
`43`	`44`	`try {`
`@@ -52,16 +53,14 @@ public static Bind parse(String serialized) {`
`52`	`53`	`else if ("ro".equals(parts[2].toLowerCase()))`
`53`	`54`	`return new Bind(parts[0], Volume.parse(parts[1]), true);`
`54`	`55`	`else`
`55`		`- throw new RuntimeException("Error parsing Bind '"`
`56`		`- + serialized + "'");`
	`56`	`+ throw new IllegalArgumentException();`
`57`	`57`	`}`
`58`	`58`	`default: {`
`59`		`- throw new RuntimeException("Error parsing Bind '" + serialized`
`60`		`- + "'");`
	`59`	`+ throw new IllegalArgumentException();`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`	`} catch (Exception e) {`
`64`		`- throw new RuntimeException("Error parsing Bind '" + serialized`
	`63`	`+ throw new IllegalArgumentException("Error parsing Bind '" + serialized`
`65`	`64`	`+ "'");`
`66`	`65`	`}`
`67`	`66`	`}`