Use o.g.u.TemporaryFolder rule for tests.

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy

@@ -22,7 +22,8 @@ import org.junit.Rule
 import spock.lang.Specification
 
 class CommonFileSystemTest extends Specification {
-    @Rule TemporaryFolder tmpDir = new TemporaryFolder()
+    @Rule TemporaryFolder tmpDir
+
     def fs = FileSystems.default
 
     def "unix permissions cannot be read on non existing file"() {

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandlerTest.groovy

@@ -16,22 +16,21 @@
 
 package org.gradle.internal.nativeplatform.filesystem
 
-import com.google.common.io.Files
 import org.jruby.ext.posix.FileStat
 import org.jruby.ext.posix.POSIX
 import spock.lang.Specification
+import org.junit.Rule
+import org.gradle.util.TemporaryFolder
 
 class ComposableFilePermissionHandlerTest extends Specification {
     final ComposableFilePermissionHandler.Chmod chmod = Mock()
     final POSIX posix = Mock()
     final ComposableFilePermissionHandler handler = new ComposableFilePermissionHandler(chmod, posix)
 
+    @Rule TemporaryFolder temporaryFolder;
     def "chmod calls are delegated to Chmod"(){
         setup:
-        def File dir = Files.createTempDir();
-        def File file = new File(dir, "f")
-        Files.touch(file)
-
+        def file = temporaryFolder.createFile("testfile");
         when:
         handler.chmod(file, 0744);
 
@@ -42,10 +41,7 @@ class ComposableFilePermissionHandlerTest extends Specification {
     def "getUnixMode calls are delegated to POSIX"(){
         setup:
         FileStat stat = Mock()
-        def File dir = Files.createTempDir();
-        def File file = new File(dir, "f")
-        Files.touch(file)
-
+        def file = temporaryFolder.createFile("testfile");
         posix.stat(file.getAbsolutePath()) >> stat
         stat.mode() >> 0754
 

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FallbackFileStatTest.groovy

@@ -18,23 +18,23 @@ package org.gradle.internal.nativeplatform.filesystem
 
 import spock.lang.Specification
 import org.junit.Rule
-import org.junit.rules.TemporaryFolder
+import org.gradle.util.TemporaryFolder
 
 class FallbackFileStatTest extends Specification {
 
     @Rule TemporaryFolder temporaryFolder;
 
     def "mode() returns FileSystem.DEFAULT_FILE_MODE for files"() {
         setup:
-        def testfile = temporaryFolder.newFile()
+        def testfile = temporaryFolder.createFile("testFile")
         FallbackFileStat fallbackFileStat = new FallbackFileStat(testfile.absolutePath)
         expect:
         FileSystem.DEFAULT_FILE_MODE == fallbackFileStat.mode()
     }
 
     def "mode() returns FileSystem.DEFAULT_DIR_MODE for directories"() {
         setup:
-        def testfolder = temporaryFolder.newFolder()
+        def testfolder = temporaryFolder.createDir()
         FallbackFileStat fallbackFileStat = new FallbackFileStat(testfolder.absolutePath)
         expect:
         FileSystem.DEFAULT_DIR_MODE == fallbackFileStat.mode()

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIXTest.groovy

@@ -17,8 +17,8 @@
 package org.gradle.internal.nativeplatform.filesystem
 
 import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 import spock.lang.Specification
+import org.gradle.util.TemporaryFolder
 
 class FallbackPOSIXTest extends Specification {
 
@@ -28,7 +28,7 @@ class FallbackPOSIXTest extends Specification {
 
     def "returns 0 on chmod calls"() {
         setup:
-        def testFile = tempFolder.newFile();
+        def testFile = tempFolder.createFile("testFile");
         expect:
         0 == posix.chmod(testFile.absolutePath, mode)
         where:
@@ -37,7 +37,7 @@ class FallbackPOSIXTest extends Specification {
 
     def "stat() returns instance of FallbackStat"() {
         setup:
-        def testFile = tempFolder.newFile();
+        def testFile = tempFolder.createDir();
         when:
         def stat = posix.stat(testFile.absolutePath)
         then:

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FilePermissionHandlerFactoryOnJdk7Test.groovy

@@ -20,7 +20,7 @@ import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 import spock.lang.Specification
 import org.junit.Rule
-import org.junit.rules.TemporaryFolder
+import org.gradle.util.TemporaryFolder
 
 @Requires(TestPrecondition.JDK7)
 class FilePermissionHandlerFactoryOnJdk7Test extends Specification {
@@ -37,7 +37,7 @@ class FilePermissionHandlerFactoryOnJdk7Test extends Specification {
 
     @Requires(TestPrecondition.WINDOWS)
     def "createDefaultFilePermissionHandler creates ComposedFilePermissionHandler with disabled Chmod on Windows OS"() {
-        def File file = temporaryFolder.newFile()
+        def File file = temporaryFolder.createFile("testFile")
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
         when:
         handler.chmod(file, mode);
@@ -58,7 +58,7 @@ class FilePermissionHandlerFactoryOnJdk7Test extends Specification {
     @Requires(TestPrecondition.UNKNOWN_OS)
     def "createDefaultFilePermissionHandler creates ComposedFilePermissionHandler with disabled Chmod on Unknown OS"() {
         setup:
-        def File file = temporaryFolder.newFile()
+        def File file = temporaryFolder.createFile("testFile")
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
         def originalMode = handler.getUnixMode(file);
         when:

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FilePermissionHandlerFactoryOnNonJdk7Test.groovy

@@ -20,8 +20,8 @@ package org.gradle.internal.nativeplatform.filesystem;
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 import spock.lang.Specification
-import org.junit.rules.TemporaryFolder
 import org.junit.Rule
+import org.gradle.util.TemporaryFolder
 
 @Requires(TestPrecondition.NOT_JDK7)
 public class FilePermissionHandlerFactoryOnNonJdk7Test extends Specification {
@@ -55,7 +55,7 @@ public class FilePermissionHandlerFactoryOnNonJdk7Test extends Specification {
     @Requires(TestPrecondition.FILE_PERMISSIONS)
     def "createDefaultFilePermissionHandler creates ComposedFilePermissionHandler with enabled Chmod on Unknown OS"() {
         setup:
-        def file = temporaryFolder.newFile()
+        def file = temporaryFolder.createFile("testFile")
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
         when:
         handler.chmod(file, mode);
@@ -69,7 +69,7 @@ public class FilePermissionHandlerFactoryOnNonJdk7Test extends Specification {
     def "Throws IOException for failed chmod calls"() {
         setup:
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
-        def notExistingFile = new File(temporaryFolder.newFolder(), "nonexisting.file");
+        def notExistingFile = new File(temporaryFolder.createDir(), "nonexisting.file");
         when:
         handler.chmod(notExistingFile, 622);
         then:
@@ -80,7 +80,7 @@ public class FilePermissionHandlerFactoryOnNonJdk7Test extends Specification {
     @Requires(TestPrecondition.UNKNOWN_OS)
     def "createDefaultFilePermissionHandler creates ComposedFilePermissionHandler with disabled Chmod on Unknown OS"() {
         setup:
-        def file = temporaryFolder.newFile()
+        def file = temporaryFolder.createFile("testFile")
 
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
         def originalMode = handler.getUnixMode(file);

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/PosixUtilTest.groovy

@@ -20,23 +20,23 @@ import spock.lang.Specification
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition;
 
-public class PosixUtilTest extends Specification{
+public class PosixUtilTest extends Specification {
 
     @Requires(TestPrecondition.UNKNOWN_OS)
-    def "PosixUtil.current returns FallbackPOSIX on Unknown OS"(){
+    def "PosixUtil.current returns FallbackPOSIX on Unknown OS"() {
         expect:
-            PosixUtil.current() instanceof FallbackPOSIX
+        PosixUtil.current() instanceof FallbackPOSIX
     }
 
     @Requires(TestPrecondition.WINDOWS)
-    def "PosixUtil.current returns FallbackPOSIX on WindowsOS"(){
+    def "PosixUtil.current returns FallbackPOSIX on WindowsOS"() {
         expect:
-            PosixUtil.current() instanceof FallbackPOSIX
+        PosixUtil.current() instanceof FallbackPOSIX
     }
 
     @Requires(TestPrecondition.FILE_PERMISSIONS)
-    def "PosixUtil.current returns no FallbackPOSIX on Macosx and Unix"(){
+    def "PosixUtil.current returns no FallbackPOSIX on Macosx and Unix"() {
         expect:
-            !(PosixUtil.current() instanceof FallbackPOSIX)
+        !(PosixUtil.current() instanceof FallbackPOSIX)
     }
 }

subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandlerTest.groovy

@@ -21,16 +21,18 @@ import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 import com.google.common.io.Files
 import org.gradle.internal.nativeplatform.filesystem.FilePermissionHandlerFactory
+import org.junit.Rule
+import org.gradle.util.TemporaryFolder
 
 
 class PosixJdk7FilePermissionHandlerTest extends Specification {
 
+    @Rule TemporaryFolder temporaryFolder
+
     @Requires(TestPrecondition.NOT_WINDOWS)
     def "test chmod on non windows platforms with JDK7"() {
         setup:
-        def File dir = Files.createTempDir();
-        def File file = new File(dir, "f")
-        Files.touch(file)
+        def file = temporaryFolder.createFile("testFile")
         def handler = FilePermissionHandlerFactory.createDefaultFilePermissionHandler()
         when:
         handler.chmod(file, mode);