diff options
author | Xavier Ducrohet <xav@android.com> | 2013-01-04 11:44:01 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2013-01-04 13:47:05 -0800 |
commit | 699b11b8fe52f3dd7b6f3350f7f3228aa306a213 (patch) | |
tree | 5aee5827ac624df3a3746f83a084824e4b96d564 | |
parent | aed769eef90077a9447cf31b40a38c9790bbebc3 (diff) | |
download | build-699b11b8fe52f3dd7b6f3350f7f3228aa306a213.tar.gz |
Add options to the test reporting.
Support for customized results and report location.
Queries the IDevice to construct a name.
Copied the flavorlib samples to flavorlibWithFailedTests and
removed the failing tests from flavorlib as it's still useful to
have as a project with no failing test.
Change-Id: Iea3f2ab0828ab93c2ace3ed41b4a5dda7554bbe3
53 files changed, 971 insertions, 39 deletions
@@ -12,6 +12,7 @@ tests/multiproject/*/build tests/tictactoe/*/build tests/applibtest/*/build tests/flavorlib/*/build +tests/flavorlibWithFailedTests/*/build tests/libsTest/*/build tests/repo/*/build /repo diff --git a/builder/src/main/java/com/android/builder/testing/CustomTestRunListener.java b/builder/src/main/java/com/android/builder/testing/CustomTestRunListener.java index 58fee3f..762d1e0 100644 --- a/builder/src/main/java/com/android/builder/testing/CustomTestRunListener.java +++ b/builder/src/main/java/com/android/builder/testing/CustomTestRunListener.java @@ -66,7 +66,7 @@ public class CustomTestRunListener extends XmlTestRunListener { @Override protected String getTestName(TestIdentifier testId) { - return String.format("%s-%s", testId.getTestName(), mDeviceName); + return String.format("%1$s[%2$s]", testId.getTestName(), mDeviceName); } @Override @@ -82,8 +82,8 @@ public class CustomTestRunListener extends XmlTestRunListener { public void testFailed(TestFailure status, TestIdentifier test, String trace) { if (mLogger != null) { mLogger.warning( - String.format("\n%1$s: %2$s > %3$s \033[31mFAILED \033[0m", mDeviceName, - test.getClassName(), test.getTestName())); + String.format("\n%1$s > %2$s[%3$s] \033[31mFAILED \033[0m", + test.getClassName(), test.getTestName(), mDeviceName)); mLogger.warning(getModifiedTrace(trace)); } @@ -98,8 +98,8 @@ public class CustomTestRunListener extends XmlTestRunListener { // if wasn't present in the list, then the test succeeded. if (mLogger != null) { mLogger.info( - String.format("\n%1$s: %2$s > %3$s \033[32mSUCCESS \033[0m", mDeviceName, - test.getClassName(), test.getTestName())); + String.format("\n%1$s > %2$s[%3$s] \033[32mSUCCESS \033[0m", + test.getClassName(), test.getTestName(), mDeviceName)); } } @@ -107,7 +107,6 @@ public class CustomTestRunListener extends XmlTestRunListener { super.testEnded(test, testMetrics); } - @Override public void testRunFailed(String errorMessage) { if (mLogger != null) { diff --git a/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy b/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy index 62f1ba0..1935fdb 100644 --- a/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy +++ b/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy @@ -132,10 +132,15 @@ class BuildTest extends BaseTest { void testOtherProjects() { File[] projects = testDir.listFiles() for (File project : projects) { + if (!project.isDirectory()) { + continue + } + String name = project.name if (name.startsWith(".")) { continue } + if (!builtProjects.contains(name)) { buildProject(name) } diff --git a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy index 349c69c..3b1e85a 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy @@ -14,12 +14,12 @@ * limitations under the License. */ package com.android.build.gradle - import com.android.build.gradle.internal.dsl.AaptOptionsImpl import com.android.build.gradle.internal.dsl.AndroidSourceSetFactory import com.android.build.gradle.internal.dsl.DexOptionsImpl import com.android.build.gradle.internal.dsl.GroupableProductFlavor import com.android.build.gradle.internal.dsl.ProductFlavorDsl +import com.android.build.gradle.internal.test.TestOptions import com.android.builder.ProductFlavor import org.gradle.api.Action import org.gradle.api.NamedDomainObjectContainer @@ -28,7 +28,6 @@ import org.gradle.api.artifacts.ConfigurationContainer import org.gradle.api.internal.DefaultDomainObjectSet import org.gradle.api.internal.project.ProjectInternal import org.gradle.internal.reflect.Instantiator - /** * Base android extension for all android plugins. */ @@ -39,6 +38,7 @@ public abstract class BaseExtension { final ProductFlavor defaultConfig final AaptOptionsImpl aaptOptions final DexOptionsImpl dexOptions + final TestOptions testOptions private final BasePlugin plugin private final DefaultDomainObjectSet<BuildVariant> buildVariants = @@ -58,6 +58,7 @@ public abstract class BaseExtension { aaptOptions = instantiator.newInstance(AaptOptionsImpl.class) dexOptions = instantiator.newInstance(DexOptionsImpl.class) + testOptions = instantiator.newInstance(TestOptions.class) sourceSetsContainer = project.container(AndroidSourceSet, new AndroidSourceSetFactory(instantiator, project.fileResolver)) @@ -113,6 +114,10 @@ public abstract class BaseExtension { action.execute(dexOptions) } + void test(Action<TestOptions> action) { + action.execute(testOptions) + } + public DefaultDomainObjectSet<BuildVariant> getBuildVariants() { plugin.createAndroidTasks() return buildVariants diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy index 3531aff..3e331a1 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -587,10 +587,18 @@ public abstract class BasePlugin { } runTestsTask.conventionMapping.resultsDir = { - project.file("$project.buildDir/test-results/$variant.flavorDirName") + String location = extension.testOptions.resultsDir != null ? + extension.testOptions.resultsDir : + "$project.buildDir/test-results/$variant.flavorDirName" + + project.file(location) } runTestsTask.conventionMapping.reportsDir = { - project.file("$project.buildDir/reports/tests/$variant.flavorDirName") + String location = extension.testOptions.reportDir != null ? + extension.testOptions.reportDir : + "$project.buildDir/reports/tests/$variant.flavorDirName" + + project.file(location) } variant.runTestsTask = runTestsTask } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/RunTestsTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/RunTestsTask.groovy index 1d00484..6a36248 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/RunTestsTask.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/RunTestsTask.groovy @@ -14,7 +14,10 @@ * limitations under the License. */ package com.android.build.gradle.internal.tasks + import com.android.SdkConstants +import com.android.annotations.NonNull +import com.android.annotations.Nullable import com.android.build.gradle.internal.ApplicationVariant import com.android.builder.internal.util.concurrent.WaitableExecutor import com.android.builder.testing.CustomTestRunListener @@ -59,6 +62,7 @@ public class RunTestsTask extends BaseTask { private static class DeviceTestRunner implements Callable<Boolean> { private final IDevice mDevice + private final String mDeviceName private final File mResultsDir private final File mTestApk private final ApplicationVariant mVariant @@ -66,9 +70,12 @@ public class RunTestsTask extends BaseTask { private final ApplicationVariant mTestedVariant private final ILogger mLogger - DeviceTestRunner(IDevice device, File testApk, ApplicationVariant variant, File testedApk, - ApplicationVariant testedVariant, File resultsDir, ILogger logger) { + DeviceTestRunner(@NonNull IDevice device, + @NonNull File testApk, @NonNull ApplicationVariant variant, + @Nullable File testedApk, @NonNull ApplicationVariant testedVariant, + @NonNull File resultsDir, @NonNull ILogger logger) { mDevice = device + mDeviceName = computeDeviceName(device) mResultsDir = resultsDir mTestApk = testApk mVariant = variant @@ -81,13 +88,11 @@ public class RunTestsTask extends BaseTask { Boolean call() throws Exception { try { if (mTestedApk != null) { - mLogger.info("Device '%s': installing %s", mDevice.serialNumber, - mTestedApk.absolutePath) + mLogger.info("Device '%s': installing %s", mDeviceName, mTestedApk.absolutePath) mDevice.installPackage(mTestedApk.absolutePath, true /*reinstall*/) } - mLogger.info("Device '%s': installing %s", mDevice.serialNumber, - mTestApk.absolutePath) + mLogger.info("Device '%s': installing %s", mDeviceName, mTestApk.absolutePath) mDevice.installPackage(mTestApk.absolutePath, true /*reinstall*/) @@ -97,7 +102,7 @@ public class RunTestsTask extends BaseTask { runner.setRunName(mDevice.serialNumber) CustomTestRunListener runListener = new CustomTestRunListener( - mDevice.serialNumber, mLogger) + mDeviceName, mLogger) runListener.setReportDir(mResultsDir) runner.run(runListener) @@ -106,16 +111,31 @@ public class RunTestsTask extends BaseTask { } finally { // uninstall the apps String packageName = mVariant.packageName - mLogger.info("Device '%s': uninstalling %s", mDevice.serialNumber, packageName) + mLogger.info("Device '%s': uninstalling %s", mDeviceName, packageName) mDevice.uninstallPackage(packageName) if (mTestedApk != null) { packageName = mTestedVariant.packageName - mLogger.info("Device '%s': uninstalling %s", mDevice.serialNumber, packageName) + mLogger.info("Device '%s': uninstalling %s", mDeviceName, packageName) mDevice.uninstallPackage(packageName) } } } + + private String computeDeviceName(@NonNull IDevice device) { + String version = device.getProperty(IDevice.PROP_BUILD_VERSION); + boolean emulator = device.isEmulator() + + String name; + if (emulator) { + name = mDevice.avdName != null ? mDevice.avdName + "(AVD)" : mDevice.serialNumber + } else { + String model = device.getProperty(IDevice.DEVICE_MODEL_PROPERTY) + name = model != null ? model : mDevice.serialNumber + } + + return version != null ? name + " - " + version : name + } } @TaskAction @@ -134,7 +154,7 @@ public class RunTestsTask extends BaseTask { timeOut -= sleepTime } - if (timeOut == 0) { + if (timeOut <= 0 && !bridge.hasInitialDeviceList()) { throw new BuildException("Timeout getting device list.", null) } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/test/TestOptions.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/test/TestOptions.groovy new file mode 100644 index 0000000..bc16f61 --- /dev/null +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/test/TestOptions.groovy @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.build.gradle.internal.test + +/** + * Options for the tests. + */ +class TestOptions { + + String resultsDir + String reportDir +} diff --git a/tests/flavorlib/app/build.gradle b/tests/flavorlib/app/build.gradle index dcaac3c..d9bfaf5 100644 --- a/tests/flavorlib/app/build.gradle +++ b/tests/flavorlib/app/build.gradle @@ -11,6 +11,11 @@ android { packageName = "com.android.tests.flavorlib.app.flavor2" } } + + test { + resultsDir = "$project.buildDir/foo/results" + reportDir = "$project.buildDir/foo/report" + } } dependencies { diff --git a/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java index d4b3ded..6dd5088 100644 --- a/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java +++ b/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java @@ -18,7 +18,6 @@ package com.android.tests.flavorlib.app; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.widget.TextView; /** @@ -82,9 +81,4 @@ public class MainActivityFlavorTest extends ActivityInstrumentationTestCase2<Mai public void testJavaStrings() { assertEquals(mLibTextView2.getText(), "SUCCESS-LIB1"); } - - @SmallTest - public void testFailureOk() { - assertTrue("Testing failing test", false); - } } diff --git a/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java index 8a4b8f7..56988c0 100644 --- a/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java +++ b/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java @@ -18,7 +18,6 @@ package com.android.tests.flavorlib.app; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.widget.TextView; /** @@ -82,9 +81,4 @@ public class MainActivityFlavorTest extends ActivityInstrumentationTestCase2<Mai public void testJavaStrings() { assertEquals(mLibTextView2.getText(), "SUCCESS-LIB2"); } - - @SmallTest - public void testIsApi17() { - assertEquals(17, android.os.Build.VERSION.SDK_INT); - } } diff --git a/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java b/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java index 26e9518..970fcbe 100644 --- a/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java +++ b/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java @@ -18,7 +18,6 @@ package com.android.tests.flavorlib.lib; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.widget.TextView; import com.android.tests.flavorlib.lib.R; @@ -84,10 +83,4 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv public void testJavaStrings() { assertEquals("SUCCESS-LIB1", mTextView2.getText()); } - - @SmallTest - public void testFailureOk() { - assertTrue("Testing failing test", false); - } - } diff --git a/tests/flavorlibWithFailedTests/app/build.gradle b/tests/flavorlibWithFailedTests/app/build.gradle new file mode 100644 index 0000000..dcaac3c --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/build.gradle @@ -0,0 +1,19 @@ +apply plugin: 'android' + +android { + target = "android-15" + + productFlavors { + flavor1 { + packageName = "com.android.tests.flavorlib.app.flavor1" + } + flavor2 { + packageName = "com.android.tests.flavorlib.app.flavor2" + } + } +} + +dependencies { + flavor1Compile project(':lib1') + flavor2Compile project(':lib2') +} diff --git a/tests/flavorlibWithFailedTests/app/proguard-project.txt b/tests/flavorlibWithFailedTests/app/proguard-project.txt new file mode 100644 index 0000000..349f80f --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/proguard-project.txt @@ -0,0 +1,22 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +-adaptclassstrings
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/flavor1/res/values/strings.xml b/tests/flavorlibWithFailedTests/app/src/flavor1/res/values/strings.xml new file mode 100644 index 0000000..b402efb --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/flavor1/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="app_name">flavorlib-app-f1</string> + +</resources>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/flavor2/res/values/strings.xml b/tests/flavorlibWithFailedTests/app/src/flavor2/res/values/strings.xml new file mode 100644 index 0000000..af1b43c --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/flavor2/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="app_name">flavorlib-app-f2</string> + +</resources>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/main/AndroidManifest.xml b/tests/flavorlibWithFailedTests/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..45758cc --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.flavorlib.app" + android:versionCode="1" + android:versionName="1.0" xmlns:tools="http://schemas.android.com/tools"> + + <uses-sdk + android:minSdkVersion="15" + tools:ignore="UsesMinSdkAttributes" /> + + <application + android:icon="@drawable/icon" + android:label="@string/app_name" > + <activity + android:name=".MainActivity" + android:label="@string/app_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/App.java b/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/App.java new file mode 100644 index 0000000..0312a6c --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/App.java @@ -0,0 +1,43 @@ +package com.android.tests.flavorlib.app; + +import android.app.Activity; +import android.widget.TextView; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class App { + + public static void handleTextView(Activity a) { + TextView tv = (TextView) a.findViewById(R.id.app_text2); + if (tv != null) { + tv.setText(getContent()); + } + } + + private static String getContent() { + InputStream input = App.class.getResourceAsStream("App.txt"); + if (input == null) { + return "FAILED TO FIND App.txt"; + } + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java b/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java new file mode 100644 index 0000000..0d6f8a6 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java @@ -0,0 +1,18 @@ +package com.android.tests.flavorlib.app; + +import android.app.Activity; +import android.os.Bundle; + +import com.android.tests.flavorlib.lib.Lib; + +public class MainActivity extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + + App.handleTextView(this); + Lib.handleTextView(this); + } +}
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/main/res/drawable-hdpi/icon.png b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-hdpi/icon.png diff --git a/tests/flavorlibWithFailedTests/app/src/main/res/drawable-ldpi/icon.png b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-ldpi/icon.png diff --git a/tests/flavorlibWithFailedTests/app/src/main/res/drawable-mdpi/icon.png b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/res/drawable-mdpi/icon.png diff --git a/tests/flavorlibWithFailedTests/app/src/main/res/layout/main.xml b/tests/flavorlibWithFailedTests/app/src/main/res/layout/main.xml new file mode 100644 index 0000000..6761bef --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/res/layout/main.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/app_text1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/app_string" /> + + <TextView + android:id="@+id/app_text2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + <include layout="@layout/lib_main" /> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/main/res/values/strings.xml b/tests/flavorlibWithFailedTests/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..190a400 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="app_name">flavorlib-app</string> + <string name="app_string">SUCCESS-APP</string> + +</resources>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/main/resources/com/android/tests/flavorlib/app/App.txt b/tests/flavorlibWithFailedTests/app/src/main/resources/com/android/tests/flavorlib/app/App.txt new file mode 100644 index 0000000..084e7d0 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/main/resources/com/android/tests/flavorlib/app/App.txt @@ -0,0 +1 @@ +SUCCESS-APP
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java b/tests/flavorlibWithFailedTests/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java new file mode 100644 index 0000000..2788b27 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tests.flavorlib.app; + +import android.test.ActivityInstrumentationTestCase2; +import android.test.suitebuilder.annotation.MediumTest; +import android.widget.TextView; + +/** + * An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}. + * By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically + * launched and finished before and after each test. This also extends + * {@link android.test.InstrumentationTestCase}, which provides + * access to methods for sending events to the target activity, such as key and + * touch events. See {@link #sendKeys}. + * + * In general, {@link android.test.InstrumentationTestCase}s and {@link ActivityInstrumentationTestCase2}s + * are heavier weight functional tests available for end to end testing of your + * user interface. When run via a {@link android.test.InstrumentationTestRunner}, + * the necessary {@link android.app.Instrumentation} will be injected for you to + * user via {@link #getInstrumentation} in your tests. + * + * 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> { + + private TextView mAppTextView1; + private TextView mAppTextView2; + + /** + * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity. + */ + public MainActivityTest() { + super(MainActivity.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + final MainActivity a = getActivity(); + // ensure a valid handle to the activity has been returned + assertNotNull(a); + + mAppTextView1 = (TextView) a.findViewById(R.id.app_text1); + mAppTextView2 = (TextView) a.findViewById(R.id.app_text1); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @MediumTest + public void testPreconditions() { + assertNotNull(mAppTextView1); + assertNotNull(mAppTextView2); + } + + @MediumTest + public void testAndroidStrings() { + assertEquals(mAppTextView1.getText(), "SUCCESS-APP"); + } + + @MediumTest + public void testJavaStrings() { + assertEquals(mAppTextView2.getText(), "SUCCESS-APP"); + } +} diff --git a/tests/flavorlibWithFailedTests/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlibWithFailedTests/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java new file mode 100644 index 0000000..d4b3ded --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tests.flavorlib.app; + +import android.test.ActivityInstrumentationTestCase2; +import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.SmallTest; +import android.widget.TextView; + +/** + * An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}. + * By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically + * launched and finished before and after each test. This also extends + * {@link android.test.InstrumentationTestCase}, which provides + * access to methods for sending events to the target activity, such as key and + * touch events. See {@link #sendKeys}. + * + * In general, {@link android.test.InstrumentationTestCase}s and {@link ActivityInstrumentationTestCase2}s + * are heavier weight functional tests available for end to end testing of your + * user interface. When run via a {@link android.test.InstrumentationTestRunner}, + * the necessary {@link android.app.Instrumentation} will be injected for you to + * user via {@link #getInstrumentation} in your tests. + * + * See {@link com.example.android.apis.AllTests} for documentation on running + * all tests and individual tests in this application. + */ +public class MainActivityFlavorTest extends ActivityInstrumentationTestCase2<MainActivity> { + + private TextView mLibTextView1; + private TextView mLibTextView2; + + /** + * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity. + */ + public MainActivityFlavorTest() { + super(MainActivity.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + final MainActivity a = getActivity(); + // ensure a valid handle to the activity has been returned + assertNotNull(a); + + mLibTextView1 = (TextView) a.findViewById(R.id.lib_text1); + mLibTextView2 = (TextView) a.findViewById(R.id.lib_text2); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @MediumTest + public void testPreconditions() { + assertNotNull(mLibTextView1); + assertNotNull(mLibTextView2); + } + + @MediumTest + public void testAndroidStrings() { + assertEquals(mLibTextView1.getText(), "SUCCESS-LIB1"); + } + + @MediumTest + public void testJavaStrings() { + assertEquals(mLibTextView2.getText(), "SUCCESS-LIB1"); + } + + @SmallTest + public void testFailureOk() { + assertTrue("Testing failing test", false); + } +} diff --git a/tests/flavorlibWithFailedTests/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlibWithFailedTests/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java new file mode 100644 index 0000000..8a4b8f7 --- /dev/null +++ b/tests/flavorlibWithFailedTests/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tests.flavorlib.app; + +import android.test.ActivityInstrumentationTestCase2; +import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.SmallTest; +import android.widget.TextView; + +/** + * An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}. + * By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically + * launched and finished before and after each test. This also extends + * {@link android.test.InstrumentationTestCase}, which provides + * access to methods for sending events to the target activity, such as key and + * touch events. See {@link #sendKeys}. + * + * In general, {@link android.test.InstrumentationTestCase}s and {@link ActivityInstrumentationTestCase2}s + * are heavier weight functional tests available for end to end testing of your + * user interface. When run via a {@link android.test.InstrumentationTestRunner}, + * the necessary {@link android.app.Instrumentation} will be injected for you to + * user via {@link #getInstrumentation} in your tests. + * + * See {@link com.example.android.apis.AllTests} for documentation on running + * all tests and individual tests in this application. + */ +public class MainActivityFlavorTest extends ActivityInstrumentationTestCase2<MainActivity> { + + private TextView mLibTextView1; + private TextView mLibTextView2; + + /** + * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity. + */ + public MainActivityFlavorTest() { + super(MainActivity.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + final MainActivity a = getActivity(); + // ensure a valid handle to the activity has been returned + assertNotNull(a); + + mLibTextView1 = (TextView) a.findViewById(R.id.lib_text1); + mLibTextView2 = (TextView) a.findViewById(R.id.lib_text2); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @MediumTest + public void testPreconditions() { + assertNotNull(mLibTextView1); + assertNotNull(mLibTextView2); + } + + @MediumTest + public void testAndroidStrings() { + assertEquals(mLibTextView1.getText(), "SUCCESS-LIB2"); + } + + @MediumTest + public void testJavaStrings() { + assertEquals(mLibTextView2.getText(), "SUCCESS-LIB2"); + } + + @SmallTest + public void testIsApi17() { + assertEquals(17, android.os.Build.VERSION.SDK_INT); + } +} diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle new file mode 100644 index 0000000..a0832c6 --- /dev/null +++ b/tests/flavorlibWithFailedTests/build.gradle @@ -0,0 +1,8 @@ +buildscript { + repositories { + maven { url '../../repo' } + } + dependencies { + classpath 'com.android.tools.build:gradle:0.3-SNAPSHOT' + } +} diff --git a/tests/flavorlibWithFailedTests/lib1/build.gradle b/tests/flavorlibWithFailedTests/lib1/build.gradle new file mode 100644 index 0000000..f7838fb --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'android-library' + +android { + target = "android-15" +}
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib1/proguard-project.txt b/tests/flavorlibWithFailedTests/lib1/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/AndroidManifest.xml b/tests/flavorlibWithFailedTests/lib1/src/main/AndroidManifest.xml new file mode 100644 index 0000000..44bc277 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.flavorlib.lib" + android:versionCode="1" + android:versionName="1.0" > + + <application + android:icon="@drawable/ic_launcher" + android:label="@string/lib_name" > + <activity + android:name="MainActivity" + android:label="@string/lib_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java b/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java new file mode 100644 index 0000000..1e981c2 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java @@ -0,0 +1,43 @@ +package com.android.tests.flavorlib.lib; + +import android.app.Activity; +import android.widget.TextView; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class Lib { + + public static void handleTextView(Activity a) { + TextView tv = (TextView) a.findViewById(R.id.lib_text2); + if (tv != null) { + tv.setText(getContent()); + } + } + + private static String getContent() { + InputStream input = Lib.class.getResourceAsStream("Lib.txt"); + if (input == null) { + return "FAILED TO FIND Lib.txt"; + } + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java b/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java new file mode 100644 index 0000000..8a13e9b --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.flavorlib.lib; + +import android.app.Activity; +import android.os.Bundle; + +public class MainActivity extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.lib_main); + + Lib.handleTextView(this); + } +} diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-hdpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-ldpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-ldpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-mdpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/res/layout/lib_main.xml b/tests/flavorlibWithFailedTests/lib1/src/main/res/layout/lib_main.xml new file mode 100644 index 0000000..47e792a --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/res/layout/lib_main.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/lib_text1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/lib_string" /> + + <TextView + android:id="@+id/lib_text2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/res/values/strings.xml b/tests/flavorlibWithFailedTests/lib1/src/main/res/values/strings.xml new file mode 100644 index 0000000..ca7dcdb --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="lib_name">flavorlib-lib1</string> + <string name="lib_string">SUCCESS-LIB1</string> + +</resources>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt b/tests/flavorlibWithFailedTests/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt new file mode 100644 index 0000000..452e397 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt @@ -0,0 +1 @@ +SUCCESS-LIB1
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java b/tests/flavorlibWithFailedTests/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java new file mode 100644 index 0000000..26e9518 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tests.flavorlib.lib; + +import android.test.ActivityInstrumentationTestCase2; +import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.SmallTest; +import android.widget.TextView; + +import com.android.tests.flavorlib.lib.R; + +/** + * An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}. + * By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically + * launched and finished before and after each test. This also extends + * {@link android.test.InstrumentationTestCase}, which provides + * access to methods for sending events to the target activity, such as key and + * touch events. See {@link #sendKeys}. + * + * In general, {@link android.test.InstrumentationTestCase}s and {@link ActivityInstrumentationTestCase2}s + * are heavier weight functional tests available for end to end testing of your + * user interface. When run via a {@link android.test.InstrumentationTestRunner}, + * the necessary {@link android.app.Instrumentation} will be injected for you to + * user via {@link #getInstrumentation} in your tests. + * + * 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> { + + private TextView mTextView1; + private TextView mTextView2; + + /** + * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity. + */ + public MainActivityTest() { + super(MainActivity.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + final MainActivity a = getActivity(); + // ensure a valid handle to the activity has been returned + assertNotNull(a); + + mTextView1 = (TextView) a.findViewById(R.id.lib_text1); + mTextView2 = (TextView) a.findViewById(R.id.lib_text2); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @MediumTest + public void testPreconditions() { + assertNotNull(mTextView1); + assertNotNull(mTextView2); + } + + @MediumTest + public void testAndroidStrings() { + assertEquals("SUCCESS-LIB1", mTextView1.getText()); + } + + @MediumTest + public void testJavaStrings() { + assertEquals("SUCCESS-LIB1", mTextView2.getText()); + } + + @SmallTest + public void testFailureOk() { + assertTrue("Testing failing test", false); + } + +} diff --git a/tests/flavorlibWithFailedTests/lib2/build.gradle b/tests/flavorlibWithFailedTests/lib2/build.gradle new file mode 100644 index 0000000..f7838fb --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'android-library' + +android { + target = "android-15" +}
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib2/proguard-project.txt b/tests/flavorlibWithFailedTests/lib2/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/AndroidManifest.xml b/tests/flavorlibWithFailedTests/lib2/src/main/AndroidManifest.xml new file mode 100644 index 0000000..44bc277 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.flavorlib.lib" + android:versionCode="1" + android:versionName="1.0" > + + <application + android:icon="@drawable/ic_launcher" + android:label="@string/lib_name" > + <activity + android:name="MainActivity" + android:label="@string/lib_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java b/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java new file mode 100644 index 0000000..4d8503c --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java @@ -0,0 +1,43 @@ +package com.android.tests.flavorlib.lib; + +import android.app.Activity; +import android.widget.TextView; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class Lib { + + public static void handleTextView(Activity a) { + TextView tv = (TextView) a.findViewById(R.id.lib_text2); + if (tv != null) { + tv.setText(getContent()); + } + } + + private static String getContent() { + InputStream input = Lib.class.getResourceAsStream("Lib.txt"); + if (input == null) { + return "FAILED TO FIND Lib2.txt"; + } + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java b/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java new file mode 100644 index 0000000..8a13e9b --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.flavorlib.lib; + +import android.app.Activity; +import android.os.Bundle; + +public class MainActivity extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.lib_main); + + Lib.handleTextView(this); + } +} diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-hdpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-ldpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-ldpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-mdpi/ic_launcher.png b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/res/layout/lib_main.xml b/tests/flavorlibWithFailedTests/lib2/src/main/res/layout/lib_main.xml new file mode 100644 index 0000000..47e792a --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/res/layout/lib_main.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/lib_text1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/lib_string" /> + + <TextView + android:id="@+id/lib_text2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/res/values/strings.xml b/tests/flavorlibWithFailedTests/lib2/src/main/res/values/strings.xml new file mode 100644 index 0000000..e27cb40 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="lib_name">flavorlib-lib2</string> + <string name="lib_string">SUCCESS-LIB2</string> + +</resources>
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt b/tests/flavorlibWithFailedTests/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt new file mode 100644 index 0000000..94cabe4 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt @@ -0,0 +1 @@ +SUCCESS-LIB2
\ No newline at end of file diff --git a/tests/flavorlibWithFailedTests/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java b/tests/flavorlibWithFailedTests/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java new file mode 100644 index 0000000..05a12e5 --- /dev/null +++ b/tests/flavorlibWithFailedTests/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tests.flavorlib.lib; + +import android.test.ActivityInstrumentationTestCase2; +import android.test.suitebuilder.annotation.MediumTest; +import android.widget.TextView; + +import com.android.tests.flavorlib.lib.R; + +/** + * An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}. + * By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically + * launched and finished before and after each test. This also extends + * {@link android.test.InstrumentationTestCase}, which provides + * access to methods for sending events to the target activity, such as key and + * touch events. See {@link #sendKeys}. + * + * In general, {@link android.test.InstrumentationTestCase}s and {@link ActivityInstrumentationTestCase2}s + * are heavier weight functional tests available for end to end testing of your + * user interface. When run via a {@link android.test.InstrumentationTestRunner}, + * the necessary {@link android.app.Instrumentation} will be injected for you to + * user via {@link #getInstrumentation} in your tests. + * + * 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> { + + private TextView mTextView1; + private TextView mTextView2; + + /** + * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity. + */ + public MainActivityTest() { + super(MainActivity.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + final MainActivity a = getActivity(); + // ensure a valid handle to the activity has been returned + assertNotNull(a); + + mTextView1 = (TextView) a.findViewById(R.id.lib_text1); + mTextView2 = (TextView) a.findViewById(R.id.lib_text2); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @MediumTest + public void testPreconditions() { + assertNotNull(mTextView1); + assertNotNull(mTextView2); + } + + @MediumTest + public void testAndroidStrings() { + assertEquals("SUCCESS-LIB2", mTextView1.getText()); + } + + @MediumTest + public void testJavaStrings() { + assertEquals("SUCCESS-LIB2", mTextView2.getText()); + } +} diff --git a/tests/flavorlibWithFailedTests/settings.gradle b/tests/flavorlibWithFailedTests/settings.gradle new file mode 100644 index 0000000..c72f855 --- /dev/null +++ b/tests/flavorlibWithFailedTests/settings.gradle @@ -0,0 +1,3 @@ +include 'app' +include 'lib1' +include 'lib2' |