From 88b1e668eef75546289fa09d42b7fd56462869a6 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:45:32 -0500 Subject: [PATCH] made a broad catch even broader Former-commit-id: 909064cae6d9bac8a9630fb9b8cca13f73353bfb --- .../analyzer/AssemblyAnalyzerTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index facb498be..75f63669d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,20 +17,16 @@ */ package org.owasp.dependencycheck.analyzer; -import org.mortbay.log.Log; -import org.owasp.dependencycheck.analyzer.exception.AnalysisException; - import java.io.File; - import org.junit.After; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; - import org.junit.Assume; +import static org.junit.Assume.assumeFalse; import org.junit.Before; import org.junit.Test; +import org.mortbay.log.Log; +import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; @@ -52,11 +48,11 @@ public class AssemblyAnalyzerTest { * @throws Exception if anything goes sideways */ @Before - public void setUp() { + public void setUp() { try { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); - } catch (Exception e) { + } catch (Throwable e) { Log.warn("Exception setting up AssemblyAnalyzer. Tests will be incomplete"); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); }