Merge "Fix tests for the flavors project."
diff --git a/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy
index d8cbda6..9dbe187 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy
@@ -112,12 +112,15 @@
return project.logger.isEnabled(LogLevel.DEBUG)
}
- AndroidBuilder getAndroidBuilder(Object key) {
- return builders.get(key)
- }
+ AndroidBuilder getAndroidBuilder(ApplicationVariant variant) {
+ AndroidBuilder androidBuilder = builders.get(variant)
- void setAndroidBuilder(Object key, AndroidBuilder androidBuilder) {
- builders.put(key, androidBuilder)
+ if (androidBuilder == null) {
+ androidBuilder = variant.createBuilder(this)
+ builders.put(variant, androidBuilder)
+ }
+
+ return androidBuilder
}
private void findSdk(Project project) {
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BaseAndroidTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/BaseAndroidTask.groovy
index 94cba8e..e75cb0e 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BaseAndroidTask.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BaseAndroidTask.groovy
@@ -30,13 +30,6 @@
Iterable<Object> configObjects
protected AndroidBuilder getBuilder() {
- AndroidBuilder androidBuilder = plugin.getAndroidBuilder(variant);
-
- if (androidBuilder == null) {
- androidBuilder = variant.createBuilder(plugin)
- plugin.setAndroidBuilder(variant, androidBuilder)
- }
-
- return androidBuilder
+ return plugin.getAndroidBuilder(variant);
}
}
diff --git a/testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityTest.java b/testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
similarity index 96%
rename from testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityTest.java
rename to testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
index 0a501cc..2c043ef 100644
--- a/testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityTest.java
+++ b/testapps/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
@@ -37,7 +37,7 @@
* See {@link com.example.android.apis.AllTests} for documentation on running
* all tests and individual tests in this application.
*/
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
+public class MainActivityGroup1Test extends ActivityInstrumentationTestCase2<MainActivity> {
private TextView mResOverLay;
private TextView mResOverLay1;
@@ -47,7 +47,7 @@
/**
* Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity.
*/
- public MainActivityTest() {
+ public MainActivityGroup1Test() {
super(MainActivity.class);
}
diff --git a/testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityTest.java b/testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
similarity index 96%
rename from testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityTest.java
rename to testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
index f1b1238..41e9ecf 100644
--- a/testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityTest.java
+++ b/testapps/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
@@ -37,7 +37,7 @@
* See {@link com.example.android.apis.AllTests} for documentation on running
* all tests and individual tests in this application.
*/
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
+public class MainActivityGroup1Test extends ActivityInstrumentationTestCase2<MainActivity> {
private TextView mResOverLay;
private TextView mResOverLay1;
@@ -47,7 +47,7 @@
/**
* Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity.
*/
- public MainActivityTest() {
+ public MainActivityGroup1Test() {
super(MainActivity.class);
}
diff --git a/testapps/flavors/src/testFA/java/com/android/tests/flavors/MainActivityTest.java b/testapps/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
similarity index 91%
rename from testapps/flavors/src/testFA/java/com/android/tests/flavors/MainActivityTest.java
rename to testapps/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
index c025bfb..0d0fee2 100644
--- a/testapps/flavors/src/testFA/java/com/android/tests/flavors/MainActivityTest.java
+++ b/testapps/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
@@ -37,7 +37,7 @@
* See {@link com.example.android.apis.AllTests} for documentation on running
* all tests and individual tests in this application.
*/
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
+public class MainActivityGroup2Test extends ActivityInstrumentationTestCase2<MainActivity> {
private TextView mResOverLay;
private TextView mResOverLay2;
@@ -47,7 +47,7 @@
/**
* Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity.
*/
- public MainActivityTest() {
+ public MainActivityGroup2Test() {
super(MainActivity.class);
}
@@ -82,17 +82,17 @@
public void testResOverlay() {
// because this group has lower priority, we check that the resource from
// this flavor is not used.
- assertNotEquals("FA", mResOverLay.getText());
+ assertFalse("FA".equals(mResOverLay.getText()));
assertEquals("FA", mResOverLay2.getText());
}
@MediumTest
public void testBuildConfig() {
- assertEquals("FA", mBuildConfig1.getText());
+ assertEquals("FA", mBuildConfig2.getText());
}
@MediumTest
public void testCodeOverlay() {
- assertEquals("FA", mCodeOverlay1.getText());
+ assertEquals("FA", mCodeOverlay2.getText());
}
}
diff --git a/testapps/flavors/src/testFB/java/com/android/tests/flavors/MainActivityTest.java b/testapps/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
similarity index 91%
rename from testapps/flavors/src/testFB/java/com/android/tests/flavors/MainActivityTest.java
rename to testapps/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
index 9a8b9a7..6f92adf 100644
--- a/testapps/flavors/src/testFB/java/com/android/tests/flavors/MainActivityTest.java
+++ b/testapps/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
@@ -37,7 +37,7 @@
* See {@link com.example.android.apis.AllTests} for documentation on running
* all tests and individual tests in this application.
*/
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
+public class MainActivityGroup2Test extends ActivityInstrumentationTestCase2<MainActivity> {
private TextView mResOverLay;
private TextView mResOverLay2;
@@ -47,7 +47,7 @@
/**
* Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity.
*/
- public MainActivityTest() {
+ public MainActivityGroup2Test() {
super(MainActivity.class);
}
@@ -82,17 +82,17 @@
public void testResOverlay() {
// because this group has lower priority, we check that the resource from
// this flavor is not used.
- assertNotEquals("FB", mResOverLay.getText());
+ assertFalse("FB".equals(mResOverLay.getText()));
assertEquals("FB", mResOverLay2.getText());
}
@MediumTest
public void testBuildConfig() {
- assertEquals("FB", mBuildConfig1.getText());
+ assertEquals("FB", mBuildConfig2.getText());
}
@MediumTest
public void testCodeOverlay() {
- assertEquals("FB", mCodeOverlay1.getText());
+ assertEquals("FB", mCodeOverlay2.getText());
}
}
