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..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 @@ -20,12 +20,11 @@ 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; @@ -35,21 +34,8 @@ 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(); /** * Test of getChecksum method, of class Checksum. @@ -83,13 +69,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 +84,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); } /**