Permalink
Browse files

Merge Erik's changes

  • Loading branch information...
aalmiray committed Feb 17, 2012
2 parents f058f00 + daa5f60 commit 3e6d46d3c44be454ae70f1804dbc2fd12d09c491
View
@@ -4,7 +4,7 @@ The Jython plugin enables compiling and running Jython code on your Griffon appl
## Installation
-The current version of *griffon-jython-plugin* is *0.1*
+The current version of *griffon-jython-plugin* is *0.2*
To install just issue the following command:
@@ -21,8 +21,8 @@ griffon.project.dependency.resolution = {
// flatDir name: "jythonLibDir", dirs: ["${basePath}lib"]
}
dependencies {
- build 'org.python:jython:2.5.0'
- compile 'org.python:jython:2.5.0'
+ build 'org.python:jython-standalone:2.5.2'
+ compile 'org.python:jython-standalone:2.5.2'
compile("org.springframework:org.springframework.core:$springVersion") {
transitive = false
@@ -4,14 +4,14 @@ import griffon.test.AbstractCliTestCase
* Test case for the "create-jython-class" Griffon command.
*/
class CreateJythonClassTests extends AbstractCliTestCase {
- void testDefault() {
- execute(["create-jython-class griffonjython.Test"])
-
- assertEquals 0, waitForProcess()
- verifyHeader()
-
- // Make sure that the script was found.
- assertFalse "CreateJythonClass script not found.", output.contains("Script not found:")
+ void testDefault() {
+ execute(["create-jython-class griffonjython.Test"])
+
+ assertEquals 0, waitForProcess()
+ verifyHeader()
+
+ // Make sure that the script was found.
+ assertFalse "CreateJythonClass script not found.", output.contains("Script not found:")
def newJythonClassPath = 'src/jython/griffonjython/Test.py'
def newJythonClassFile = new File(newJythonClassPath)
@@ -20,5 +20,5 @@ class CreateJythonClassTests extends AbstractCliTestCase {
}
newJythonClassFile.delete()
(new File('src/jython/griffonjython')).delete()
- }
+ }
}
@@ -4,20 +4,20 @@ import griffon.test.AbstractCliTestCase
* Test case for the "create-jython-script" Griffon command.
*/
class CreateJythonScriptTests extends AbstractCliTestCase {
- void testDefault() {
- execute(["create-jython-script TestScript"])
+ void testDefault() {
+ execute(["create-jython-script TestScript"])
- assertEquals 0, waitForProcess()
- verifyHeader()
+ assertEquals 0, waitForProcess()
+ verifyHeader()
- // Make sure that the script was found.
- assertFalse "CreateJythonScript script not found.", output.contains("Script not found:")
+ // Make sure that the script was found.
+ assertFalse "CreateJythonScript script not found.", output.contains("Script not found:")
- def newJythonScriptPath = 'griffon-app/resources/TestScript.py'
+ def newJythonScriptPath = 'griffon-app/resources/jython/TestScript.py'
def newJythonScriptFile = new File(newJythonScriptPath)
if (!newJythonScriptFile.exists()) {
fail "Expected new Jython script ${newJythonScriptPath}"
}
newJythonScriptFile.delete()
- }
+ }
}
@@ -5,7 +5,7 @@ import griffon.test.AbstractCliTestCase
*/
class JythonReplTests extends AbstractCliTestCase {
void testDefault() {
- execute([ "jython-repl" ])
+ execute(["jython-repl"])
assertEquals 0, waitForProcess()
verifyHeader()

0 comments on commit 3e6d46d

Please sign in to comment.