Merge pull request #325 from brunobowden/fixup

CompileStatic for J2objcConfig and UtilsTest

Author: brunobowden

src/test/groovy/com/github/j2objccontrib/j2objcgradle/J2objcConfigTest.groovy

@@ -16,6 +16,8 @@
 
 package com.github.j2objccontrib.j2objcgradle
 
+import groovy.transform.CompileStatic
+import groovy.transform.TypeCheckingMode
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
@@ -26,6 +28,7 @@ import org.junit.Test
 /**
  * J2objcConfig tests.
  */
+@CompileStatic
 class J2objcConfigTest {
 
     private Project proj
@@ -77,6 +80,7 @@ class J2objcConfigTest {
     }
 
     @Test
+    @CompileStatic(TypeCheckingMode.SKIP)
     void testTranslateArgs() {
         J2objcConfig ext = new J2objcConfig(proj)
 

src/test/groovy/com/github/j2objccontrib/j2objcgradle/tasks/TestingUtils.groovy

@@ -83,7 +83,7 @@ class TestingUtils {
         J2objcConfig j2objcConfig = null
         if (config.applyJ2objcPlugin) {
             proj.pluginManager.apply(J2objcPlugin)
-            j2objcConfig = proj.extensions.getByName('j2objcConfig')
+            j2objcConfig = (J2objcConfig) proj.extensions.getByName('j2objcConfig')
         } else if (config.createJ2objcConfig) {
             // can't use the config from the J2objcPlugin:
             j2objcConfig = proj.extensions.create('j2objcConfig', J2objcConfig, proj)
@@ -95,7 +95,6 @@ class TestingUtils {
             assert reportsDir.mkdirs()
         }
 
-
         return [proj, j2objcHome, j2objcConfig]
     }
 

src/test/groovy/com/github/j2objccontrib/j2objcgradle/tasks/UtilsTest.groovy

@@ -16,6 +16,7 @@
 
 package com.github.j2objccontrib.j2objcgradle.tasks
 
+import groovy.transform.CompileStatic
 import org.apache.commons.io.output.TeeOutputStream
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
@@ -33,6 +34,7 @@ import org.junit.rules.ExpectedException
 /**
  * Utils tests.
  */
+@CompileStatic
 class UtilsTest {
 
     private Project proj
@@ -182,7 +184,7 @@ class UtilsTest {
                 'src/test/resources/com/github/j2objccontrib/j2objcgradle/tasks/prefixes.properties')
 
         List<String> translateArgs = new ArrayList<String>()
-        translateArgs.add("--prefixes ${prefixesProp.absolutePath}")
+        translateArgs.add('--prefixes ' + prefixesProp.absolutePath)
         Properties properties = Utils.packagePrefixes(proj, translateArgs)
 
         Properties expected = new Properties()
@@ -202,7 +204,7 @@ class UtilsTest {
         List<String> translateArgs = new ArrayList<String>()
         // prefix is overwritten by prefixes.properties
         translateArgs.add('--prefix com.example.parent=ParentPrefixArg')
-        translateArgs.add("--prefixes ${prefixesProp.absolutePath}")
+        translateArgs.add('--prefixes ' + prefixesProp.absolutePath)
         // prefix overwrites prefixes.properties
         translateArgs.add('--prefix com.example.parent.subdir=SubdirPrefixArg')
 
@@ -261,11 +263,13 @@ class UtilsTest {
     void testMatchRegexOutputStreams_MatchString() {
         ByteArrayOutputStream stdout = new ByteArrayOutputStream()
         ByteArrayOutputStream stderr = new ByteArrayOutputStream()
+
         stdout.write('written-stdout'.getBytes('utf-8'))
         stderr.write('written-stderr'.getBytes('utf-8'))
 
-        assert null != Utils.matchRegexOutputs(stdout, stderr, /(std+out)/).equals('stdout')
-        assert null != Utils.matchRegexOutputs(stdout, stderr, /(std+err)/).equals('stderr')
+        // Match each regex against both OutputStreams
+        assert 'stdout' == Utils.matchRegexOutputs(stdout, stderr, /(std+out)/)
+        assert 'stderr' == Utils.matchRegexOutputs(stdout, stderr, /(std+err)/)
     }
 
     @Test