You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/06/25 23:15:20 UTC
svn commit: r958119 - in /incubator/clerezza/trunk/scala-scripting:
script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala
Author: reto
Date: Fri Jun 25 21:15:20 2010
New Revision: 958119
URL: http://svn.apache.org/viewvc?rev=958119&view=rev
Log:
CLEREZZA-244: fixed rethrowing of previous compilation exception
Modified:
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
incubator/clerezza/trunk/scala-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala
Modified: incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala?rev=958119&r1=958118&r2=958119&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala (original)
+++ incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala Fri Jun 25 21:15:20 2010
@@ -234,6 +234,7 @@ class ScriptEngineFactory() extends Jav
val sources: List[SourceFile] = List(new BatchSourceFile("<script>", classCode))
(new compiler.Run).compileSources(sources)
if (compiler.reporter.hasErrors) {
+ compiler.reporter.reset
throw new ScriptException(msgWriter.toString, "script", -1);
}
new CompiledScript() {
Modified: incubator/clerezza/trunk/scala-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala?rev=958119&r1=958118&r2=958119&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala (original)
+++ incubator/clerezza/trunk/scala-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala Fri Jun 25 21:15:20 2010
@@ -159,6 +159,20 @@ s"""
val compiledScript = engine.compile(script)
}
+
+ def compileNormalAfterErrorScript(): Unit = {
+ val script = "this is not real scala !"
+ val engine = factory.getScriptEngine.asInstanceOf[Compilable]
+ try {
+ val compiledScript = engine.compile(script)
+ } catch {
+ case e => Assert.assertEquals(classOf[ScriptException], e.getClass)
+ }
+ val string = "hello"
+ val script2 = "\""+string+"\""
+ val compiledScript2 = engine.compile(script2)
+ Assert.assertEquals(string, compiledScript2.eval())
+ }
//This seems hard to realize before https://lampsvn.epfl.ch/trac/scala/ticket/3513 is fixed
/*@Test
def checkException(): Unit = {
@@ -187,7 +201,7 @@ object ScriptEngineFactoryTest {
webProfile(),
junitBundles(),
frameworks(
- felix()),
+ felix()),
systemProperty("org.osgi.service.http.port").value(
Integer.toString(testHttpPort)));
}