From a01bf8c8329f778fd04d0407ecafd674b1ac6a72 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Tue, 17 Mar 2015 21:14:24 -0700
Subject: [PATCH] Don't propagate exceptions from RoundtripTest.runTest()

---
 .../test/java/org/jf/baksmali/LambdaTest.java |  5 +--
 .../java/org/jf/baksmali/RoundtripTest.java   | 35 ++++++++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java
index a1a24c09..5431df54 100644
--- a/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java
+++ b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java
@@ -31,11 +31,8 @@
 
 package org.jf.baksmali;
 
-import org.antlr.runtime.RecognitionException;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class LambdaTest extends IdenticalRoundtripTest {
 
     private baksmaliOptions createOptions() {
@@ -46,7 +43,7 @@ public class LambdaTest extends IdenticalRoundtripTest {
     }
 
     @Test
-    public void testHelloWorldLambda() throws IOException, RecognitionException {
+    public void testHelloWorldLambda() {
         runTest("HelloWorldLambda", createOptions());
     }
 }
diff --git a/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java
index 7c1ef5d3..ba15603c 100644
--- a/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java
+++ b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java
@@ -70,20 +70,29 @@ public abstract class RoundtripTest {
         return String.format("%s%s%sOutput.smali", testDir, File.separatorChar, testName);
     }
 
-    protected void runTest(@Nonnull String testName, @Nonnull baksmaliOptions options)
-            throws IOException, RecognitionException {
-        // Load file from resources as a stream
-        String inputFilename = getInputFilename(testName);
-        String input = readResourceFully(getInputFilename(testName));
-        String output;
-        if (getOutputFilename(testName).equals(inputFilename)) {
-            output = input;
-        } else {
-            output = readResourceFully(getOutputFilename(testName));
-        }
+    protected void runTest(@Nonnull String testName) {
+        runTest(testName, new baksmaliOptions());
+    }
 
-        // Run smali, baksmali, and then compare strings are equal (minus comments/whitespace)
-        BaksmaliTestUtils.assertSmaliCompiledEquals(input, output, options, true);
+    protected void runTest(@Nonnull String testName, @Nonnull baksmaliOptions options) {
+        try {
+            // Load file from resources as a stream
+            String inputFilename = getInputFilename(testName);
+            String input = readResourceFully(getInputFilename(testName));
+            String output;
+            if (getOutputFilename(testName).equals(inputFilename)) {
+                output = input;
+            } else {
+                output = readResourceFully(getOutputFilename(testName));
+            }
+
+            // Run smali, baksmali, and then compare strings are equal (minus comments/whitespace)
+            BaksmaliTestUtils.assertSmaliCompiledEquals(input, output, options, true);
+        } catch (IOException ex) {
+            Assert.fail();
+        } catch (RecognitionException ex) {
+            Assert.fail();
+        }
     }
 
     @Nonnull