Merge "Fix tests."

3 files changed, 16 insertions, 7 deletions

diff --git a/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java b/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
index a666eab..0af75cc 100644
--- a/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
+++ b/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
@@ -49,7 +49,7 @@ import java.util.Set;
 
 public class AndroidProjectTest extends TestCase {
 
-    private final static String MODEL_VERSION = "0.6.2-SNAPSHOT";
+    private final static String MODEL_VERSION = "0.7.0-SNAPSHOT";
 
     private static final Map<String, ProjectData> sProjectModelMap = Maps.newHashMap();
 
@@ -210,7 +210,7 @@ public class AndroidProjectTest extends TestCase {
         assertTrue("Debug signed check", debugMainInfo.isSigned());
         assertEquals("Debug signingConfig name", "myConfig", debugMainInfo.getSigningConfigName());
         assertEquals("Debug sourceGenTask", "generateDebugSources", debugMainInfo.getSourceGenTaskName());
-        assertEquals("Debug javaCompileTask", "compileDebug", debugMainInfo.getJavaCompileTaskName());
+        assertEquals("Debug javaCompileTask", "compileDebugJava", debugMainInfo.getJavaCompileTaskName());
 
         // this variant is tested.
         ArtifactInfo debugTestInfo = debugVariant.getTestArtifactInfo();
@@ -221,7 +221,7 @@ public class AndroidProjectTest extends TestCase {
         assertTrue("Test signed check", debugTestInfo.isSigned());
         assertEquals("Test signingConfig name", "myConfig", debugTestInfo.getSigningConfigName());
         assertEquals("Test sourceGenTask", "generateTestSources", debugTestInfo.getSourceGenTaskName());
-        assertEquals("Test javaCompileTask", "compileTest", debugTestInfo.getJavaCompileTaskName());
+        assertEquals("Test javaCompileTask", "compileTestJava", debugTestInfo.getJavaCompileTaskName());
 
         // release variant, not tested.
         Variant releaseVariant = variants.get("Release");
@@ -234,7 +234,7 @@ public class AndroidProjectTest extends TestCase {
         assertFalse("Release signed check", relMainInfo.isSigned());
         assertNull("Release signingConfig name", relMainInfo.getSigningConfigName());
         assertEquals("Release sourceGenTask", "generateReleaseSources", relMainInfo.getSourceGenTaskName());
-        assertEquals("Release javaCompileTask", "compileRelease", relMainInfo.getJavaCompileTaskName());
+        assertEquals("Release javaCompileTask", "compileReleaseJava", relMainInfo.getJavaCompileTaskName());
 
         ArtifactInfo relTestInfo = releaseVariant.getTestArtifactInfo();
         assertNull("Release test info null-check", relTestInfo);
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
index ed4f651..6ca387c 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
@@ -17,6 +17,7 @@
 package com.android.build.gradle.internal.dsl
 import com.android.annotations.NonNull
 import com.android.annotations.Nullable
+import com.android.annotations.VisibleForTesting
 import com.android.builder.BuilderConstants
 import com.android.builder.DefaultBuildType
 import com.android.builder.NdkConfig
@@ -36,7 +37,7 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable {
 
     private final NdkConfigDsl ndkConfig
 
-    BuildTypeDsl(@NonNull String name,
+    public BuildTypeDsl(@NonNull String name,
                  @NonNull FileResolver fileResolver,
                  @NonNull Instantiator instantiator) {
         super(name)
@@ -44,6 +45,14 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable {
         ndkConfig = instantiator.newInstance(NdkConfigDsl.class)
     }
 
+    @VisibleForTesting
+    BuildTypeDsl(@NonNull String name,
+                 @NonNull FileResolver fileResolver) {
+        super(name)
+        this.fileResolver = fileResolver
+        ndkConfig = null
+    }
+
     @Override
     @Nullable
     public NdkConfig getNdkConfig() {
diff --git a/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
index c63b2e9..3744b79 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
@@ -74,7 +74,7 @@ public class BuildTypeDslTest extends BaseTest {
         Project project = ProjectBuilder.builder().withProjectDir(
                 new File(testDir, "basic")).build()
 
-        BuildTypeDsl object1 = new BuildTypeDsl("foo", project.fileResolver, project.instantiator)
+        BuildTypeDsl object1 = new BuildTypeDsl("foo", project.fileResolver)
 
         // change every value from their default.
         object1.setDebuggable(true)
@@ -87,7 +87,7 @@ public class BuildTypeDslTest extends BaseTest {
         object1.setSigningConfig(new SigningConfigDsl("blah"))
         object1.setZipAlign(false)
 
-        BuildTypeDsl object2 = new BuildTypeDsl(object1.name, project.fileResolver, project.instantiator)
+        BuildTypeDsl object2 = new BuildTypeDsl(object1.name, project.fileResolver)
         object2.initWith(object1)
 
         assertEquals(object1, object2)