svn commit: r1584883 - /lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

[us...@apache.org]

Author: uschindler
Date: Fri Apr  4 20:17:41 2014
New Revision: 1584883

URL: http://svn.apache.org/r1584883
Log:
Make Exception more readable (those coming from -Dtests.directory=NonExistentDir). We have Rethrow calss for that!

Modified:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1584883&r1=1584882&r2=1584883&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri Apr  4 20:17:41 2014
@@ -772,7 +772,7 @@ public abstract class LuceneTestCase ext
         }
       } catch (Exception e) {
         // Should not happen?
-        throw new RuntimeException(e);
+        Rethrow.rethrow(e);
       }
 
       if (setIndexerThreadPoolMethod == null) {
@@ -791,7 +791,7 @@ public abstract class LuceneTestCase ext
           c.setMaxThreadStates(maxNumThreadStates);
         }
       } catch (Exception e) {
-        throw new RuntimeException(e);
+        Rethrow.rethrow(e);
       }
     }
 
@@ -984,7 +984,8 @@ public abstract class LuceneTestCase ext
       }
       return wrapped;
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      Rethrow.rethrow(e);
+      throw null; // dummy to prevent compiler failure
     }
   }
 
@@ -1165,7 +1166,8 @@ public abstract class LuceneTestCase ext
       // try empty ctor
       return clazz.newInstance();
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      Rethrow.rethrow(e);
+      throw null; // dummy to prevent compiler failure
     }
   }
   
@@ -1310,7 +1312,7 @@ public abstract class LuceneTestCase ext
         try {
           r = maybeWrapReader(r);
         } catch (IOException e) {
-          throw new AssertionError(e);
+          Rethrow.rethrow(e);
         }
       }
       // TODO: this whole check is a coverage hack, we should move it to tests for various filterreaders.
@@ -1321,7 +1323,7 @@ public abstract class LuceneTestCase ext
         try {
           TestUtil.checkReader(r);
         } catch (IOException e) {
-          throw new AssertionError(e);
+          Rethrow.rethrow(e);
         }
       }
       final IndexSearcher ret;