diff options
author | Xavier Ducrohet <xav@google.com> | 2013-11-05 17:04:42 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@google.com> | 2013-11-05 17:04:42 -0800 |
commit | ee9e07b0f137af069af7b0e3a3541a20458e3e77 (patch) | |
tree | f278b86072452cfb14dd50b0257330491863ddd4 | |
parent | fd6b06291686091f579c9f1f42a231092510664b (diff) | |
download | build-ee9e07b0f137af069af7b0e3a3541a20458e3e77.tar.gz |
Revert "Disabled test that does not run on CI server or workstation."
This reverts commit f695a7d3cfa35c0fcfa4cf0c14d71fcf3f22aca7.
-rw-r--r-- | gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java b/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java index 1b9dca2..af0bd32 100644 --- a/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java +++ b/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java @@ -31,11 +31,9 @@ import javax.imageio.ImageIO; * Android Source tree under out/host/<platform>/sdk/... (result of 'make sdk') */ public class ManualBuildTest extends BuildTest { - public void testDummy() { - // JUnit won't complain that this test class does not have test methods. - } - public void DISABLEDtestOverlay1Content() throws Exception { + + public void testOverlay1Content() throws Exception { File project = buildProject("overlay1", BasePlugin.GRADLE_MIN_VERSION); File drawableOutput = new File(project, "build/res/all/debug/drawable"); @@ -43,7 +41,7 @@ public class ManualBuildTest extends BuildTest { checkImageColor(drawableOutput, "type_overlay.png", (int) 0xFF00FF00); } - public void DISABLEDtestOverlay2Content() throws Exception { + public void testOverlay2Content() throws Exception { File project = buildProject("overlay2", BasePlugin.GRADLE_MIN_VERSION); File drawableOutput = new File(project, "build/res/all/one/debug/drawable"); @@ -53,7 +51,7 @@ public class ManualBuildTest extends BuildTest { checkImageColor(drawableOutput, "type_flavor_overlay.png", (int) 0xFF00FF00); } - public void DISABLEDtestRepo() { + public void testRepo() { File repo = new File(testDir, "repo"); try { @@ -73,7 +71,7 @@ public class ManualBuildTest extends BuildTest { } // test whether a library project has its fields ProGuarded - public void DISABLEDtestLibProguard() throws Exception { + public void testLibProguard() throws Exception { File project = new File(testDir, "libProguard"); File fileOutput = new File(project, "build/proguard/release"); @@ -84,7 +82,7 @@ public class ManualBuildTest extends BuildTest { } // test whether proguard.txt has been correctly merged - public void DISABLEDtestLibProguardConsumerFile() throws Exception { + public void testLibProguardConsumerFile() throws Exception { File project = new File(testDir, "libProguardConsumerFiles"); File debugFileOutput = new File(project, "build/bundles/debug"); File releaseFileOutput = new File(project, "build/bundles/release"); @@ -95,7 +93,7 @@ public class ManualBuildTest extends BuildTest { checkFile(releaseFileOutput, "proguard.txt", new String[]{"A", "B", "C"}); } - public void DISABLEDtest3rdPartyTests() throws Exception { + public void test3rdPartyTests() throws Exception { // custom because we want to run deviceCheck even without devices, since we use // a fake DeviceProvider that doesn't use a device, but only record the calls made // to the DeviceProvider and the DeviceConnector. |