FIXUP

j2objc-contrib · Jan 12, 2016 · dc979fb · dc979fb
1 parent 08c76c7
commit dc979fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/main/groovy/com/github/j2objccontrib/j2objcgradle/J2objcConfig.groovy b/src/main/groovy/com/github/j2objccontrib/j2objcgradle/J2objcConfig.groovy
@@ -20,7 +20,6 @@ import com.github.j2objccontrib.j2objcgradle.tasks.Utils
 import com.google.common.annotations.VisibleForTesting
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
-import org.gradle.api.DefaultTask
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -856,7 +855,7 @@ class J2objcConfig {
     }
 
     protected void configureNativeCompilationForUnsupported() {
-        nativeCompilation.applyForUnsupported()
+        nativeCompilation.applyWhenUnsupported()
     }
 
     protected void convertDeps() {

diff --git a/src/main/groovy/com/github/j2objccontrib/j2objcgradle/NativeCompilation.groovy b/src/main/groovy/com/github/j2objccontrib/j2objcgradle/NativeCompilation.groovy
@@ -124,8 +124,8 @@ class NativeCompilation {
 
     // Creates fake tasks to satisfy dependencies for J2objcPlugin.apply(...)
     // Should only be used as an alternative to NativeComplication.apply(...) when
-    // the Gradle Version is unsupported and no build can be done.
-    void applyForUnsupported() {
+    // the Gradle Version is unsupported and no J2ObjC is possible.
+    void applyWhenUnsupported() {
         project.with {
             tasks.create(name: 'debugTestJ2objcExecutable', type: DefaultTask)
             tasks.create(name: 'releaseTestJ2objcExecutable', type: DefaultTask)

diff --git a/src/test/groovy/com/github/j2objccontrib/j2objcgradle/tasks/UtilsTest.groovy b/src/test/groovy/com/github/j2objccontrib/j2objcgradle/tasks/UtilsTest.groovy
@@ -57,32 +57,35 @@ class UtilsTest {
         Utils.setFakeOSNone()
     }
 
-    @Test
-    void testCheckGradleVersion_invalid() {
-        assert Utils.checkGradleVersion(GradleVersion.version('2.3'), false)
-        assert Utils.checkGradleVersion(GradleVersion.version('2.9'), false)
-    }
-
     @Test
     void testCheckGradleVersion_valid() {
         assert !Utils.checkGradleVersion(GradleVersion.version('2.4'), false)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.4.1'), false)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.5'), false)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.8'), false)
+    }
 
+    @Test
+    void testCheckGradleVersion_validAndThrowIfUnsupported() {
         assert !Utils.checkGradleVersion(GradleVersion.version('2.4'), true)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.4.1'), true)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.5'), true)
         assert !Utils.checkGradleVersion(GradleVersion.version('2.8'), true)
     }
 
+    @Test
+    void testCheckGradleVersion_invalid() {
+        assert Utils.checkGradleVersion(GradleVersion.version('2.3'), false)
+        assert Utils.checkGradleVersion(GradleVersion.version('2.9'), false)
+    }
+
     @Test(expected=InvalidUserDataException)
-    void testCheckGradleVersion_belowMinimumException() {
+    void testCheckGradleVersion_invalidBelowMinimum() {
         Utils.checkGradleVersion(GradleVersion.version('2.3'), true)
     }
 
     @Test(expected=InvalidUserDataException)
-    void testCheckGradleVersion_aboveMaximum() {
+    void testCheckGradleVersion_invalidAboveMaximum() {
         Utils.checkGradleVersion(GradleVersion.version('2.9'), true)
     }