From 6481938626a81d929649426b6915752f60e3d19d Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sun, 12 Oct 2014 18:27:03 +0200
Subject: [PATCH 1/2] Test for exceptions with ExpectedException

Former-commit-id: 47c6c559196b4c10a5deb3698805ff7276f0aa83
---
 .../dependencycheck/utils/ChecksumTest.java   | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
index 142448b83..d9d170605 100644
--- a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
+++ b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
@@ -20,12 +20,15 @@ package org.owasp.dependencycheck.utils;
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.owasp.dependencycheck.utils.Checksum;
 import org.owasp.dependencycheck.utils.Checksum;
 
@@ -51,6 +54,9 @@ public class ChecksumTest {
     public void tearDown() throws Exception {
     }
 
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
     /**
      * Test of getChecksum method, of class Checksum.
      *
@@ -83,13 +89,9 @@ public class ChecksumTest {
     public void testGetChecksum_FileNotFound() throws Exception {
         String algorithm = "MD5";
         File file = new File("not a valid file");
-        boolean exceptionThrown = false;
-        try {
-            byte[] result = Checksum.getChecksum(algorithm, file);
-        } catch (IOException ex) {
-            exceptionThrown = true;
-        }
-        Assert.assertTrue(exceptionThrown);
+
+        expectedException.expect(IOException.class);
+        Checksum.getChecksum(algorithm, file);
     }
 
     /**
@@ -102,13 +104,9 @@ public class ChecksumTest {
     public void testGetChecksum_NoSuchAlgorithm() throws Exception {
         String algorithm = "some unknown algorithm";
         File file = new File(this.getClass().getClassLoader().getResource("checkSumTest.file").getPath());
-        boolean exceptionThrown = false;
-        try {
-            byte[] result = Checksum.getChecksum(algorithm, file);
-        } catch (NoSuchAlgorithmException ex) {
-            exceptionThrown = true;
-        }
-        Assert.assertTrue(exceptionThrown);
+
+        expectedException.expect(NoSuchAlgorithmException.class);
+        Checksum.getChecksum(algorithm, file);
     }
 
     /**

From 8f9cbfe8069bccdaee1d61c7179671826bb81723 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sun, 12 Oct 2014 18:29:27 +0200
Subject: [PATCH 2/2] Unrelated: remove unused before/after

Former-commit-id: 68524208b8c0a197e9682aceec25cff0bc30ff56
---
 .../dependencycheck/utils/ChecksumTest.java   | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
index d9d170605..55b17ac6b 100644
--- a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
+++ b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java
@@ -21,11 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -38,22 +34,6 @@ import org.owasp.dependencycheck.utils.Checksum;
  */
 public class ChecksumTest {
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() throws Exception {
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
     @Rule
     public ExpectedException expectedException = ExpectedException.none();