aboutsummaryrefslogtreecommitdiff
path: root/gradle/src/test
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2013-06-21 19:27:56 -0700
committerXavier Ducrohet <xav@android.com>2013-06-29 14:38:13 -0700
commit60a5b2383dc6c67f85edfdf0d0fd33db6ec9e715 (patch)
treeaec6a9184f3ae9e59756883a30f8c0c57306c906 /gradle/src/test
parent6dd1c8675adeaaa58cd0e9a8bc1fb779bd8fd331 (diff)
downloadbuild-60a5b2383dc6c67f85edfdf0d0fd33db6ec9e715.tar.gz
Improve model.
Since we are already changing the model in non compatible way, now is a good time to fix some issues. Refactoring all the properties of an artifact out of variant and into its own ArtifactInfo class, so that we can have both the main and test artifact in the variant in an elegant way. Also adding SigningConfig info to enable the creation of export wizard from the IDE. Change-Id: Ib6c48873ba0e5c5a61bc1e79b00a90e2be83652f
Diffstat (limited to 'gradle/src/test')
-rw-r--r--gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy3
-rw-r--r--gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy3
2 files changed, 4 insertions, 2 deletions
diff --git a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
index edbfa45..d840272 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
@@ -22,10 +22,11 @@ import com.android.build.gradle.internal.test.PluginHolder
import com.android.build.gradle.internal.variant.BaseVariantData
import com.android.builder.BuilderConstants
import com.android.builder.DefaultBuildType
+import com.android.builder.model.SigningConfig
import com.android.builder.signing.KeystoreHelper
-import com.android.builder.signing.SigningConfig
import org.gradle.api.Project
import org.gradle.testfixtures.ProjectBuilder
+
/**
* Tests for the internal workings of the app plugin ("android")
*/
diff --git a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
index 7dfb9c3..5dd9668 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
@@ -19,9 +19,10 @@ import com.android.annotations.NonNull
import com.android.build.gradle.api.LibraryVariant
import com.android.build.gradle.api.TestVariant
import com.android.build.gradle.internal.test.BaseTest
-import com.android.builder.signing.SigningConfig
+import com.android.builder.model.SigningConfig
import org.gradle.api.Project
import org.gradle.testfixtures.ProjectBuilder
+
/**
* Tests for the public DSL of the App plugin ("android-library")
*/