Repository: incubator-groovy Updated Branches: refs/heads/master 0079080e4 -> baefe9d32
tidy up some legacy parts of the build (additional changes) Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/baefe9d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/baefe9d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/baefe9d3 Branch: refs/heads/master Commit: baefe9d32b6e6de90533d20302c500c4b437e358 Parents: 0079080 Author: Paul King <pa...@asert.com.au> Authored: Sat May 16 00:41:51 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Sat May 16 00:41:51 2015 +1000 ---------------------------------------------------------------------- security/groovy.policy | 17 ++++++++--------- .../groovy/runtime/FileLeftShiftTest.groovy | 9 +++++---- 2 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/baefe9d3/security/groovy.policy ---------------------------------------------------------------------- diff --git a/security/groovy.policy b/security/groovy.policy index 470d79a..25cb7a5 100644 --- a/security/groovy.policy +++ b/security/groovy.policy @@ -43,7 +43,7 @@ grant codeBase "file:${user.dir}/target/instrumented-classes/-" { permission java.security.AllPermission; }; -grant codeBase "file:${user.dir}/target/test-classes/-" { +grant codeBase "file:${user.dir}/target/classes/test/-" { permission java.security.AllPermission; }; @@ -216,12 +216,12 @@ grant codeBase "file:${user.dir}/src/test/groovy/bugs/ConstructorBug.groovy" { }; grant codeBase "file:${user.dir}/src/test/groovy/bugs/ForAndSqlBug.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}*", "read, write"; + permission java.io.FilePermission "target${/}classes${/}test${/}*", "read, write"; }; grant codeBase "file:${user.dir}/src/test/groovy/bugs/ForLoopBug.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}*", "read, write"; - permission java.io.FilePermission "target${/}test-classes${/}*", "read, write"; + permission java.io.FilePermission "target${/}classes${/}test${/}*", "read, write"; + permission java.io.FilePermission "target${/}classes${/}test${/}*", "read, write"; }; grant codeBase "file:${user.dir}/src/test/groovy/bugs/Groovy303_Bug.groovy" { @@ -239,11 +239,11 @@ grant codeBase "file:${user.dir}/src/test/groovy/script/EvalInScript.groovy" { }; grant codeBase "file:${user.dir}/src/test/groovy/sql/PersonTest.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}groovy${/}sql${/}-", "read"; + permission java.io.FilePermission "target${/}classes${/}test${/}groovy${/}sql${/}-", "read"; }; grant codeBase "file:${user.dir}/src/test/groovy/sql/SqlCompleteTest.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}groovy${/}sql${/}-", "read"; + permission java.io.FilePermission "target${/}classes${/}test${/}groovy${/}sql${/}-", "read"; }; grant codeBase "file:${user.dir}/src/test/groovy/sql/-" { @@ -257,7 +257,7 @@ grant codeBase "file:${user.dir}/src/test/groovy/sql/SqlCompleteWithoutDataSourc }; grant codeBase "file:${user.dir}/src/test/groovy/sql/SqlTest.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}groovy${/}sql${/}-", "read"; + permission java.io.FilePermission "target${/}classes${/}test${/}groovy${/}sql${/}-", "read"; }; grant codeBase "file:${user.dir}/src/test/groovy/util/AntTest.groovy" { @@ -265,6 +265,5 @@ grant codeBase "file:${user.dir}/src/test/groovy/util/AntTest.groovy" { }; grant codeBase "file:${user.dir}/src/test/org/codehaus/groovy/classgen/MetaClassTest.groovy" { - permission java.io.FilePermission "target${/}test-classes${/}-", "read"; + permission java.io.FilePermission "target${/}classes${/}test${/}-", "read"; }; - http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/baefe9d3/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy b/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy index b2d8d5f..3e93d1f 100644 --- a/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy +++ b/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy @@ -20,9 +20,10 @@ package org.codehaus.groovy.runtime class FileLeftShiftTest extends GroovyTestCase { void testFileLeftShift() { - new File("target/test-classes/MyFileLeftShiftTest.txt").delete() - new File("target/test-classes/MyFileLeftShiftTest.txt") << "This is " << "groovy" - assertEquals(new File("target/test-classes/MyFileLeftShiftTest.txt").text, "This is groovy") - new File("target/test-classes/MyFileLeftShiftTest.txt").delete() + def base = new File("target/classes/test/") + new File(base, "MyFileLeftShiftTest.txt").delete() + new File(base, "MyFileLeftShiftTest.txt") << "This is " << "groovy" + assertEquals(new File(base, "MyFileLeftShiftTest.txt").text, "This is groovy") + new File(base, "MyFileLeftShiftTest.txt").delete() } }