diff options
author | Ben Gruver <bgruv@google.com> | 2015-03-17 21:14:24 -0700 |
---|---|---|
committer | Ben Gruver <bgruv@google.com> | 2015-03-17 21:14:24 -0700 |
commit | d4bce2e7684624a0d915c435d7abb2e84338e307 (patch) | |
tree | 475669391ef67845b12d9a1e86fc608b5a57f075 | |
parent | 1e0677617c975e8ee47334db862b4c07422a674c (diff) | |
download | smali-d4bce2e7684624a0d915c435d7abb2e84338e307.tar.gz |
Don't propagate exceptions from RoundtripTest.runTest()
-rw-r--r-- | baksmali/src/test/java/org/jf/baksmali/LambdaTest.java | 5 | ||||
-rw-r--r-- | baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java | 35 |
2 files changed, 23 insertions, 17 deletions
diff --git a/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java b/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java index a1a24c09..5431df54 100644 --- a/baksmali/src/test/java/org/jf/baksmali/LambdaTest.java +++ b/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/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java b/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java index 7c1ef5d3..ba15603c 100644 --- a/baksmali/src/test/java/org/jf/baksmali/RoundtripTest.java +++ b/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 |