Update on 03/29/2018

qizongjun · Mar 29, 2018 · d362510 · d362510
1 parent 71545f6
commit d362510
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/epi_judge_java/epi/test_framework/GenericTest.java b/epi_judge_java/epi/test_framework/GenericTest.java
@@ -89,9 +89,9 @@ public static TestResult runTests(GenericTestHandler handler,
         testTimer = e.getTimer();
       } catch (StackOverflowError e) {
         result = TestResult.STACK_OVERFLOW;
-      } catch (RuntimeException e) {
+      } catch (RuntimeException | Error e) {
         throw e;
-      } catch (Throwable e) {
+      } catch (Exception e) {
         result = TestResult.UNKNOWN_EXCEPTION;
         testFailure =
             new TestFailure(e.getClass().getName())

diff --git a/epi_judge_java/epi/test_framework/GenericTestHandler.java b/epi_judge_java/epi/test_framework/GenericTestHandler.java
@@ -138,7 +138,7 @@ public void parseSignature(List<String> signature) {
    * type
    */
   public TestTimer runTest(long timeoutSeconds, List<String> testArgs)
-      throws Throwable {
+      throws Exception, Error {
     try {
       if (testArgs.size() !=
           paramParsers.length + (retValueParser != null ? 1 : 0)) {
@@ -172,9 +172,12 @@ public TestTimer runTest(long timeoutSeconds, List<String> testArgs)
     } catch (InvocationTargetException e) {
       Throwable t = e.getCause();
       if (t instanceof Exception) {
-        throw t;
+        throw (Exception)t;
+      } else if (t instanceof Error) {
+        throw (Error) t;
       } else {
-        throw new RuntimeException(t.getMessage());
+        // Improbable except for intended attempts to break the code, but anyway
+        throw new RuntimeException(t);
       }
     }
   }

diff --git a/test_data/is_tree_balanced.tsv b/test_data/is_tree_balanced.tsv
diff --git a/test_data/tree_exterior.tsv b/test_data/tree_exterior.tsv