svn commit: r1303175 - /lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java

[sa...@apache.org]

Author: sarowe
Date: Tue Mar 20 22:20:58 2012
New Revision: 1303175

URL: http://svn.apache.org/viewvc?rev=1303175&view=rev
Log:
SOLR-3260: Expand the exception message testing assumptions that allows tests to be skipped when there is no scripting support

Modified:
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java

Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java?rev=1303175&r1=1303174&r2=1303175&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java Tue Mar 20 22:20:58 2012
@@ -55,7 +55,10 @@ public class TestScriptTransformer exten
       sep.applyTransformer(map);
       assertEquals(map.get("name"), "Hello Scott");
     } catch (DataImportHandlerException e) {
-      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)", e.getMessage().startsWith("<script> can be used only in java 6 or above"));
+      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)",
+          e.getMessage().startsWith("<script> can be used only in java 6 or above")
+              || e.getMessage().startsWith("Cannot load Script Engine for language:")
+              || e.getMessage().startsWith("'eval' failed with language:"));
       throw e;
     }
   }
@@ -87,7 +90,10 @@ public class TestScriptTransformer exten
       sep.applyTransformer(map);
       assertEquals(map.get("name"), "Hello Scott");
     } catch (DataImportHandlerException e) {
-      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)", e.getMessage().startsWith("<script> can be used only in java 6 or above"));
+      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)",
+          e.getMessage().startsWith("<script> can be used only in java 6 or above")
+              || e.getMessage().startsWith("Cannot load Script Engine for language:")
+              || e.getMessage().startsWith("'eval' failed with language:"));
       throw e;
     }
   }
@@ -103,7 +109,10 @@ public class TestScriptTransformer exten
               .item(0));
       assertTrue(config.script.text.indexOf("checkNextToken") > -1);
     } catch (DataImportHandlerException e) {
-      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)", e.getMessage().startsWith("<script> can be used only in java 6 or above"));
+      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)",
+          e.getMessage().startsWith("<script> can be used only in java 6 or above")
+              || e.getMessage().startsWith("Cannot load Script Engine for language:")
+              || e.getMessage().startsWith("'eval' failed with language:"));
       throw e;
     }
   }
@@ -131,7 +140,10 @@ public class TestScriptTransformer exten
       sep.applyTransformer(map);
       assertNull(map.get("$hasMore"));
     } catch (DataImportHandlerException e) {
-      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)", e.getMessage().startsWith("<script> can be used only in java 6 or above"));
+      assumeFalse("JRE does not contain a JavaScript engine (OpenJDK)",
+          e.getMessage().startsWith("<script> can be used only in java 6 or above")
+              || e.getMessage().startsWith("Cannot load Script Engine for language:")
+              || e.getMessage().startsWith("'eval' failed with language:"));
       throw e;
     }
   }