Repository: incubator-groovy Updated Branches: refs/heads/GROOVY_2_4_X d81cac89f -> 4e67906d9
testfile() now deletes temporary files it creates Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/4e67906d Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/4e67906d Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/4e67906d Branch: refs/heads/GROOVY_2_4_X Commit: 4e67906d959e80a5302e74ce2c9507e7363b41b7 Parents: d81cac8 Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Sat Sep 26 12:04:13 2015 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Sat Sep 26 12:04:59 2015 +0200 ---------------------------------------------------------------------- .../src/test/groovy/groovy/json/JsonOutputTest.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4e67906d/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy index 4c4efb6..1ac5831 100644 --- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy +++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy @@ -417,16 +417,19 @@ class JsonOutputTest extends GroovyTestCase { } void testFile() { - def file = File.createTempFile('test', 'file-json') def unusedProp = ['class', 'metaclass', 'declaringClass', 'canonicalFile', 'absoluteFile', 'parentFile'] def removeUnused = { map -> unusedProp.each { map.remove(it)}; map } + def file = File.createTempFile('test', 'file-json') + file.deleteOnExit() assert toJson(file) == toJson(removeUnused(file.properties)) + def dir = File.createTempDir() + dir.deleteOnExit() assert toJson(dir) == toJson(removeUnused(dir.properties)) def objectWithFile = new JsonEmbeddedFile(name: 'testFile', file: file) - assert toJson(objectWithFile) == "{\"file\":${toJson(file)},\"name\":\"testFile\"}".toString() + assert toJson(objectWithFile) == "{\"file\":${toJson(file)},\"name\":\"testFile\"}" } }