From 56fe3b5892606f1101242374cbb6d36e94b520e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kimminich?= Date: Tue, 29 Apr 2014 14:29:46 +0200 Subject: [PATCH] simplified exception testing Former-commit-id: f43f211c4cc3133e5dfc466a4badfb3606a3be0c --- .../analyzer/AbstractSuppressionAnalyzerTest.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java index c82d91e0e..f91b4ff0b 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java @@ -18,9 +18,7 @@ package org.owasp.dependencycheck.analyzer; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; @@ -44,9 +42,6 @@ import static org.junit.Assert.assertNull; */ public class AbstractSuppressionAnalyzerTest extends BaseTest { - @Rule - public ExpectedException exception = ExpectedException.none(); - private AbstractSuppressionAnalyzer instance; @Before @@ -87,10 +82,9 @@ public class AbstractSuppressionAnalyzerTest extends BaseTest { assertEquals(expCount, result.size()); } - @Test + @Test(expected = SuppressionParseException.class) public void testFailureToLocateSuppressionFileInClasspath() throws Exception { Settings.setString(Settings.KEYS.SUPPRESSION_FILE, "doesnotexist.xml"); - exception.expect(SuppressionParseException.class); instance.initialize(); }