You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/08/06 18:29:38 UTC
svn commit: r1369874 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor:
ScriptEngineTest.java StatelessScriptUpdateProcessorFactoryTest.java
Author: hossman
Date: Mon Aug 6 16:29:37 2012
New Revision: 1369874
URL: http://svn.apache.org/viewvc?rev=1369874&view=rev
Log:
SOLR-1725: fix test assumptions
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java?rev=1369874&r1=1369873&r2=1369874&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java Mon Aug 6 16:29:37 2012
@@ -25,6 +25,9 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import java.io.StringReader;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+
/**
* Sanity tests basic functionality of {@link ScriptEngineManager} and
* {@link ScriptEngine} w/o excercising any Lucene specific code.
@@ -33,6 +36,12 @@ public class ScriptEngineTest extends Lu
private ScriptEngineManager manager;
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ Assume.assumeNotNull((new ScriptEngineManager()).getEngineByExtension("js"));
+ Assume.assumeNotNull((new ScriptEngineManager()).getEngineByName("JavaScript"));
+ }
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -83,13 +92,17 @@ public class ScriptEngineTest extends Lu
assertEquals(3, result.intValue());
}
-// public void testJRuby() throws ScriptException, NoSuchMethodException { // Simply adding jruby.jar to Solr's lib/ directory gets this test passing
-// ScriptEngine engine = manager.getEngineByName("jruby");
-// assertNotNull(engine);
-// engine.eval("def add(a,b); a + b; end");
-// Long result = (Long) ((Invocable)engine).invokeFunction("add", 1, 2);
-// assertNotNull(result);
-// assertEquals(3, result.intValue());
-// }
+ public void testJRuby() throws ScriptException, NoSuchMethodException {
+ // Simply adding jruby.jar to Solr's lib/ directory gets this test passing
+ ScriptEngine engine = manager.getEngineByName("jruby");
+
+ Assume.assumeNotNull(engine);
+
+ assertNotNull(engine);
+ engine.eval("def add(a,b); a + b; end");
+ Long result = (Long) ((Invocable)engine).invokeFunction("add", 1, 2);
+ assertNotNull(result);
+ assertEquals(3, result.intValue());
+ }
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java?rev=1369874&r1=1369873&r2=1369874&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java Mon Aug 6 16:29:37 2012
@@ -45,9 +45,8 @@ public class StatelessScriptUpdateProces
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-script-updateprocessor.xml", "schema12.xml");
-
Assume.assumeNotNull((new ScriptEngineManager()).getEngineByExtension("js"));
+ initCore("solrconfig-script-updateprocessor.xml", "schema12.xml");
}
/**