[tests] use expectedExceptions (docker-java#649)

tjlee · KostyaSha · commit 6195eb888f34 · 2016-08-01T20:43:25.000+03:00
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -45,14 +45,9 @@ public void testAuth() throws Exception {
     }
 
     // Disabled because of 500/InternalServerException
-    @Test(enabled = false)
+    @Test(enabled = false, expectedExceptions = UnauthorizedException.class, expectedExceptionsMessageRegExp = "Wrong login/password, please try again")
     public void testAuthInvalid() throws Exception {
 
-        try {
-            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
-            fail("Expected a UnauthorizedException caused by a bad password.");
-        } catch (UnauthorizedException e) {
-            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
-        }
+        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -68,13 +68,9 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.commitCmd("non-existent").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
-    }
 
+        dockerClient.commitCmd("non-existent").exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -67,13 +67,9 @@ public void testContainerDiff() throws DockerException {
         assertThat(testChangeLog, hasField("kind", equalTo(1)));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testContainerDiffWithNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.containerDiffCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
-    }
 
+        dockerClient.containerDiffCmd("non-existing").exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
@@ -70,13 +70,10 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -83,14 +83,10 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyToNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")
-                    .exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -62,12 +62,9 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -231,7 +231,7 @@ public void createContainerWithHostname() throws Exception {
         assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithName() throws DockerException {
 
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
@@ -245,12 +245,8 @@ public void createContainerWithName() throws DockerException {
 
         assertThat(inspectContainerResponse.getName(), equalTo("/container"));
 
-        try {
-            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
-            fail("Expected ConflictException");
-        } catch (ConflictException e) {
-        }
 
+        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -67,14 +67,10 @@ public void killContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void killNonExistingContainer() throws DockerException {
 
-        try {
-            dockerClient.killContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.killContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -68,13 +68,10 @@ public void removeContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -74,14 +74,10 @@ public void removeImage() throws DockerException, InterruptedException {
         assertThat(containers, matcher);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingImage() throws DockerException, InterruptedException {
-        try {
-            dockerClient.removeImageCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.removeImageCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
@@ -64,13 +64,10 @@ public void removeNetwork() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeNetworkCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeNetworkCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
@@ -41,7 +41,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeVolume() throws DockerException {
 
         String volumeName = "volume1";
@@ -55,11 +55,6 @@ public void removeVolume() throws DockerException {
 
         dockerClient.removeVolumeCmd(volumeName).exec();
 
-        try {
-            dockerClient.inspectVolumeCmd(volumeName).exec();
-            fail("Expected NotFoundException");
-        } catch (NotFoundException e) {
-            // just ignore
-        }
+        dockerClient.inspectVolumeCmd(volumeName).exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -71,14 +71,9 @@ public void restartContainer() throws DockerException {
         dockerClient.killContainerCmd(container.getId()).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void restartNonExistingContainer() throws DockerException, InterruptedException {
-        try {
-            dockerClient.restartContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.restartContainerCmd("non-existing").exec();
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -251,7 +251,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = InternalServerErrorException.class)
     public void startContainerWithConflictingPortBindings() throws DockerException {
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
@@ -268,13 +268,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.startContainerCmd(container.getId()).exec();
-            fail("expected InternalServerErrorException");
-        } catch (InternalServerErrorException e) {
-
-        }
-
+        dockerClient.startContainerCmd(container.getId()).exec();
     }
 
     @Test
@@ -412,13 +406,10 @@ public void startContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStartNonExistingContainer() throws DockerException {
-        try {
+
             dockerClient.startContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -76,14 +76,10 @@ public void testStopContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStopNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
 
-        }
+        dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -49,15 +49,11 @@ public void tagImage() throws Exception {
         dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void tagNonExistingImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
-        try {
-            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -68,13 +68,10 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.commitCmd("non-existent").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.commitCmd("non-existent").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
@@ -68,13 +68,10 @@ public void testContainerDiff() throws DockerException {
         assertThat(testChangeLog, hasField("kind", equalTo(1)));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testContainerDiffWithNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.containerDiffCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.containerDiffCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
@@ -70,13 +70,10 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
@@ -84,14 +84,10 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyToNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")
-                    .exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
@@ -62,12 +62,9 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java

Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,9 @@ public void testAuth() throws Exception {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Disabled because of 500/InternalServerException`
`48`		`- @Test(enabled = false)`
	`48`	`+ @Test(enabled = false, expectedExceptions = UnauthorizedException.class, expectedExceptionsMessageRegExp = "Wrong login/password, please try again")`
`49`	`49`	`public void testAuthInvalid() throws Exception {`
`50`	`50`
`51`		`- try {`
`52`		`- DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();`
`53`		`- fail("Expected a UnauthorizedException caused by a bad password.");`
`54`		`- } catch (UnauthorizedException e) {`
`55`		`- assertEquals(e.getMessage(), "Wrong login/password, please try again\n");`
`56`		`- }`
	`51`	`+ DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();`
`57`	`52`	`}`
`58`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,10 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- @Test`
	`86`	`+ @Test(expectedExceptions = NotFoundException.class)`
`87`	`87`	`public void copyToNonExistingContainer() throws Exception {`
`88`		`- try {`
`89`		`- dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")`
`90`		`- .exec();`
`91`		`- fail("expected NotFoundException");`
`92`		`- } catch (NotFoundException ignored) {`
`93`		`- }`
	`88`	`+`
	`89`	`+ dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,9 @@ public void copyFromContainer() throws Exception {`
`62`	`62`	`assertTrue(responseAsString.length() > 0);`
`63`	`63`	`}`
`64`	`64`
`65`		`- @Test`
	`65`	`+ @Test(expectedExceptions = NotFoundException.class)`
`66`	`66`	`public void copyFromNonExistingContainer() throws Exception {`
`67`		`- try {`
`68`		`- dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();`
`69`		`- fail("expected NotFoundException");`
`70`		`- } catch (NotFoundException ignored) {`
`71`		`- }`
	`67`	`+`
	`68`	`+ dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();`
`72`	`69`	`}`
`73`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,10 @@ public void killContainer() throws DockerException {`
`67`	`67`
`68`	`68`	`}`
`69`	`69`
`70`		`- @Test`
	`70`	`+ @Test(expectedExceptions = NotFoundException.class)`
`71`	`71`	`public void killNonExistingContainer() throws DockerException {`
`72`	`72`
`73`		`- try {`
`74`		`- dockerClient.killContainerCmd("non-existing").exec();`
`75`		`- fail("expected NotFoundException");`
`76`		`- } catch (NotFoundException e) {`
`77`		`- }`
	`73`	`+ dockerClient.killContainerCmd("non-existing").exec();`
`78`	`74`	`}`
`79`	`75`
`80`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,10 @@ public void removeContainer() throws DockerException {`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Test`
	`71`	`+ @Test(expectedExceptions = NotFoundException.class)`
`72`	`72`	`public void removeNonExistingContainer() throws DockerException {`
`73`		`- try {`
`74`		`- dockerClient.removeContainerCmd("non-existing").exec();`
`75`		`- fail("expected NotFoundException");`
`76`		`- } catch (NotFoundException e) {`
`77`		`- }`
	`73`	`+`
	`74`	`+ dockerClient.removeContainerCmd("non-existing").exec();`
`78`	`75`	`}`
`79`	`76`
`80`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,10 @@ public void removeImage() throws DockerException, InterruptedException {`
`74`	`74`	`assertThat(containers, matcher);`
`75`	`75`	`}`
`76`	`76`
`77`		`- @Test`
	`77`	`+ @Test(expectedExceptions = NotFoundException.class)`
`78`	`78`	`public void removeNonExistingImage() throws DockerException, InterruptedException {`
`79`		`- try {`
`80`		`- dockerClient.removeImageCmd("non-existing").exec();`
`81`		`- fail("expected NotFoundException");`
`82`		`- } catch (NotFoundException e) {`
`83`		`- }`
`84`	`79`
	`80`	`+ dockerClient.removeImageCmd("non-existing").exec();`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`}`