Add a test app for assets support.
Xavier Ducrohet [Wed, 6 Feb 2013 03:11:52 +0000 (19:11 -0800)]
Also fix some issues related to input detection of some tasks.

Change-Id: I38ac5a151fe1ac84c03fc0cafb8cab31117888a1

38 files changed:
.gitignore
builder/src/main/java/com/android/builder/AndroidBuilder.java
builder/src/main/java/com/android/builder/ManifestDependency.java
gradle/src/build-test/groovy/com/android/build/gradle/AutomatedBuildTest.java
gradle/src/device-test/groovy/com/android/build/gradle/DeviceTest.java
gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ManifestDependencyImpl.java
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/SymbolFileProviderImpl.java
gradle/src/main/groovy/com/android/build/gradle/tasks/ProcessAndroidResources.groovy
gradle/src/main/groovy/com/android/build/gradle/tasks/ProcessAppManifest.groovy
gradle/src/main/groovy/com/android/build/gradle/tasks/ProcessTestManifest.groovy
tests/assets/app/build.gradle [new file with mode: 0644]
tests/assets/app/proguard-project.txt [new file with mode: 0644]
tests/assets/app/src/main/AndroidManifest.xml [new file with mode: 0644]
tests/assets/app/src/main/assets/App.txt [new file with mode: 0644]
tests/assets/app/src/main/java/com/android/tests/assets/app/App.java [new file with mode: 0644]
tests/assets/app/src/main/java/com/android/tests/assets/app/MainActivity.java [new file with mode: 0644]
tests/assets/app/src/main/res/drawable-hdpi/icon.png [new file with mode: 0644]
tests/assets/app/src/main/res/drawable-ldpi/icon.png [new file with mode: 0644]
tests/assets/app/src/main/res/drawable-mdpi/icon.png [new file with mode: 0644]
tests/assets/app/src/main/res/layout/main.xml [new file with mode: 0644]
tests/assets/app/src/main/res/values/strings.xml [new file with mode: 0644]
tests/assets/app/src/test/java/com/android/tests/assets/app/MainActivityTest.java [new file with mode: 0644]
tests/assets/build.gradle [new file with mode: 0644]
tests/assets/lib/build.gradle [new file with mode: 0644]
tests/assets/lib/proguard-project.txt [new file with mode: 0644]
tests/assets/lib/src/main/AndroidManifest.xml [new file with mode: 0644]
tests/assets/lib/src/main/assets/Lib.txt [new file with mode: 0644]
tests/assets/lib/src/main/java/com/android/tests/assets/lib/Lib.java [new file with mode: 0644]
tests/assets/lib/src/main/java/com/android/tests/assets/lib/MainActivity.java [new file with mode: 0644]
tests/assets/lib/src/main/res/drawable-hdpi/ic_launcher.png [new file with mode: 0644]
tests/assets/lib/src/main/res/drawable-ldpi/ic_launcher.png [new file with mode: 0644]
tests/assets/lib/src/main/res/drawable-mdpi/ic_launcher.png [new file with mode: 0644]
tests/assets/lib/src/main/res/layout/lib_main.xml [new file with mode: 0644]
tests/assets/lib/src/main/res/values/strings.xml [new file with mode: 0644]
tests/assets/lib/src/test/java/com/android/tests/assets/lib/MainActivityTest.java [new file with mode: 0644]
tests/assets/settings.gradle [new file with mode: 0644]

index 7157013..ff1178c 100644 (file)
@@ -8,13 +8,14 @@ local.properties
 gradle/build
 tests/*/build
 tests/api/*/build
-tests/multiproject/*/build
-tests/tictactoe/*/build
 tests/applibtest/*/build
+tests/assets/*/build
 tests/flavorlib/*/build
 tests/flavorlibWithFailedTests/*/build
 tests/libsTest/*/build
+tests/multiproject/*/build
 tests/renderscriptInLib/*/build
 tests/repo/*/build
+tests/tictactoe/*/build
 /repo
 /out
index 880f591..6bfaee7 100644 (file)
@@ -253,7 +253,7 @@ public class AndroidBuilder {
     public void processManifest(
             @NonNull File mainManifest,
             @NonNull List<File> manifestOverlays,
-            @NonNull List<ManifestDependency> libraries,
+            @NonNull List<? extends ManifestDependency> libraries,
                      int versionCode,
                      String versionName,
                      int minSdkVersion,
@@ -346,7 +346,7 @@ public class AndroidBuilder {
                      int minSdkVersion,
             @NonNull String testedPackageName,
             @NonNull String instrumentationRunner,
-            @NonNull List<ManifestDependency> libraries,
+            @NonNull List<? extends ManifestDependency> libraries,
             @NonNull String outManifestLocation) {
         checkState(mTarget != null, "Target not set.");
         checkNotNull(testPackageName, "testPackageName cannot be null.");
@@ -447,12 +447,12 @@ public class AndroidBuilder {
      */
     private void mergeLibraryManifests(
             File mainManifest,
-            Iterable<ManifestDependency> directLibraries,
+            Iterable<? extends ManifestDependency> directLibraries,
             File outManifest, Map<String, String> attributeInjection) throws IOException {
 
         List<File> manifests = Lists.newArrayList();
         for (ManifestDependency library : directLibraries) {
-            List<ManifestDependency> subLibraries = library.getManifestDependencies();
+            List<? extends ManifestDependency> subLibraries = library.getManifestDependencies();
             if (subLibraries == null || subLibraries.size() == 0) {
                 manifests.add(library.getManifest());
             } else {
@@ -500,7 +500,7 @@ public class AndroidBuilder {
             @NonNull  File manifestFile,
             @NonNull  File resFolder,
             @Nullable File assetsDir,
-            @NonNull  List<SymbolFileProvider> libraries,
+            @NonNull  List<? extends SymbolFileProvider> libraries,
             @Nullable String packageOverride,
             @Nullable String sourceOutputDir,
             @Nullable String symbolOutputDir,
index d85c279..6f3bfdd 100644 (file)
@@ -26,5 +26,5 @@ public interface ManifestDependency extends ManifestProvider {
     /**
      * Returns the direct dependency of this dependency.
      */
-    List<ManifestDependency> getManifestDependencies();
+    List<? extends ManifestDependency> getManifestDependencies();
 }
index 3e3a055..a23b560 100644 (file)
@@ -34,9 +34,10 @@ public class AutomatedBuildTest extends BuildTest {
     private static enum TestType { BUILD, REPORT };
 
     private static final String[] sBuiltProjects = new String[] {
-            "aidl", "api", "applibtest", "basic", "dependencies", "flavored", "flavorlib",
-            "flavors", "libsTest", "migrated", "multiproject", "multires", "overlay1", "overlay2",
-            "renderscript", "renderscriptInLib", "renderscriptMultiSrc", "tictactoe"
+            "aidl", "api", "assets", "applibtest", "assets", "basic", "dependencies", "flavored",
+            "flavorlib", "flavors", "libsTest", "migrated", "multiproject", "multires",
+            "overlay1", "overlay2", "renderscript", "renderscriptInLib", "renderscriptMultiSrc",
+            "tictactoe"
     };
 
     private static final String[] sReportProjects = new String[] {
index 778327f..066859c 100644 (file)
@@ -38,7 +38,7 @@ public class DeviceTest extends BuildTest {
     private String gradleVersion;
 
     private static final String[] sBuiltProjects = new String[] {
-        "api", "applibtest", "basic", "flavored", "flavorlib",
+        "api", "assets", "applibtest", "basic", "flavored", "flavorlib",
         "flavors", "libsTest", "migrated", "multires", "overlay1", "overlay2",
     };
 
index 173f460..8e7563b 100644 (file)
@@ -57,7 +57,6 @@ import com.android.builder.PlatformSdkParser
 import com.android.builder.ProductFlavor
 import com.android.builder.SdkParser
 import com.android.builder.SourceProvider
-import com.android.builder.SymbolFileProvider
 import com.android.builder.VariantConfiguration
 import com.android.builder.signing.SigningConfig
 import com.android.utils.ILogger
@@ -275,7 +274,7 @@ public abstract class BasePlugin {
     }
 
     protected void createProcessManifestTask(ApplicationVariant variant,
-                                                            String manifestOurDir) {
+                                             String manifestOurDir) {
         def processManifestTask = project.tasks.add("process${variant.name}Manifest",
                 ProcessAppManifest)
         variant.processManifestTask = processManifestTask
@@ -315,7 +314,7 @@ public abstract class BasePlugin {
     }
 
     protected void createProcessTestManifestTask(ApplicationVariant variant,
-                                                                    String manifestOurDir) {
+                                                 String manifestOurDir) {
         def processTestManifestTask = project.tasks.add("process${variant.name}TestManifest",
                 ProcessTestManifest)
         variant.processManifestTask = processTestManifestTask
@@ -447,6 +446,10 @@ public abstract class BasePlugin {
     }
 
     protected void createProcessResTask(ApplicationVariant variant) {
+        createProcessResTask(variant, "$project.buildDir/symbols/$variant.dirName")
+    }
+
+    protected void createProcessResTask(ApplicationVariant variant, final String symbolLocation) {
         def processResources = project.tasks.add("process${variant.name}Resources",
                 ProcessAndroidResources)
         variant.processResourcesTask = processResources
@@ -484,7 +487,7 @@ public abstract class BasePlugin {
             project.file("$project.buildDir/source/r/$variant.dirName")
         }
         processResources.conventionMapping.textSymbolDir = {
-            project.file("$project.buildDir/symbols/$variant.dirName")
+            project.file(symbolLocation)
         }
         processResources.conventionMapping.packageFile = {
             project.file(
@@ -1093,8 +1096,10 @@ public abstract class BasePlugin {
         return null
     }
 
-    protected List<ManifestDependency> getManifestDependencies(List<AndroidDependency> libraries) {
-        List<ManifestDependency> list = Lists.newArrayListWithCapacity(libraries.size())
+    protected List<ManifestDependencyImpl> getManifestDependencies(
+            List<AndroidDependency> libraries) {
+
+        List<ManifestDependencyImpl> list = Lists.newArrayListWithCapacity(libraries.size())
 
         for (AndroidDependency lib : libraries) {
             // get the dependencies
@@ -1105,9 +1110,10 @@ public abstract class BasePlugin {
         return list
     }
 
-    protected static List<SymbolFileProvider> getTextSymbolDependencies(
+    protected static List<SymbolFileProviderImpl> getTextSymbolDependencies(
             List<AndroidDependency> libraries) {
-        List<SymbolFileProvider> list = Lists.newArrayListWithCapacity(libraries.size())
+
+        List<SymbolFileProviderImpl> list = Lists.newArrayListWithCapacity(libraries.size())
 
         for (AndroidDependency lib : libraries) {
             list.add(new SymbolFileProviderImpl(lib.manifest, lib.symbolFile))
index 71f5105..b6b891d 100644 (file)
@@ -31,7 +31,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.MavenPlugin
-import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Sync
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.internal.reflect.Instantiator
@@ -182,8 +182,9 @@ public class LibraryPlugin extends BasePlugin implements Plugin<Project> {
         // Add a task to create the BuildConfig class
         createBuildConfigTask(variant)
 
-        // Add a task to generate resource source files
-        createProcessResTask(variant)
+        // Add a task to generate resource source files, directing the location
+        // of the r.txt file to be directly in the bundle.
+        createProcessResTask(variant, "$project.buildDir/$DIR_BUNDLES/${variant.dirName}")
 
         // process java resources
         createProcessJavaResTask(variant)
@@ -207,7 +208,7 @@ public class LibraryPlugin extends BasePlugin implements Plugin<Project> {
         jar.exclude(packageName + "/BuildConfig.class")
 
         // package the aidl files into the bundle folder
-        Copy packageAidl = project.tasks.add("package${variant.name}Aidl", Copy)
+        Sync packageAidl = project.tasks.add("package${variant.name}Aidl", Sync)
         // packageAidl from 3 sources. the order is important to make sure the override works well.
         packageAidl.from(defaultConfigData.sourceSet.aidl.directories,
                 buildTypeData.sourceSet.aidl.directories).include("**/*.aidl")
@@ -215,21 +216,15 @@ public class LibraryPlugin extends BasePlugin implements Plugin<Project> {
                 "$project.buildDir/$DIR_BUNDLES/${variant.dirName}/$SdkConstants.FD_AIDL"))
 
         // package the renderscript header files files into the bundle folder
-        Copy packageRenderscript = project.tasks.add("package${variant.name}Renderscript", Copy)
+        Sync packageRenderscript = project.tasks.add("package${variant.name}Renderscript", Sync)
         // packageAidl from 3 sources. the order is important to make sure the override works well.
         packageRenderscript.from(defaultConfigData.sourceSet.renderscript.directories,
                 buildTypeData.sourceSet.renderscript.directories).include("**/*.rsh")
         packageRenderscript.into(project.file(
                 "$project.buildDir/$DIR_BUNDLES/${variant.dirName}/$SdkConstants.FD_RENDERSCRIPT"))
 
-        // package the R symbol text file into the bundle folder
-        Copy packageSymbol = project.tasks.add("package${variant.name}Symbols", Copy)
-        packageSymbol.dependsOn variant.processResourcesTask
-        packageSymbol.from(variant.processResourcesTask.textSymbolDir)
-        packageSymbol.into(project.file("$project.buildDir/$DIR_BUNDLES/${variant.dirName}"))
-
         Zip bundle = project.tasks.add("bundle${variant.name}", Zip)
-        bundle.dependsOn jar, packageAidl, packageSymbol, packageRenderscript
+        bundle.dependsOn jar, packageAidl, packageRenderscript
         bundle.setDescription("Assembles a bundle containing the library in ${variant.name}.");
         bundle.destinationDir = project.file("$project.buildDir/libs")
         bundle.extension = BuilderConstants.EXT_LIB_ARCHIVE
index f4969c0..dd55fea 100644 (file)
@@ -28,24 +28,27 @@ import java.util.List;
  */
 public class ManifestDependencyImpl implements ManifestDependency{
 
-    @InputFile
     private File manifest;
+    private List<? extends ManifestDependency> dependencies;
 
-    @Nested
-    private List<ManifestDependency> dependencies;
-
-    public ManifestDependencyImpl(File manifest, List<ManifestDependency> dependencies) {
+    public ManifestDependencyImpl(File manifest, List<? extends ManifestDependency> dependencies) {
         this.manifest = manifest;
         this.dependencies = dependencies;
     }
 
+    @InputFile
     @Override
     public File getManifest() {
         return manifest;
     }
 
     @Override
-    public List<ManifestDependency> getManifestDependencies() {
+    public List<? extends ManifestDependency> getManifestDependencies() {
         return dependencies;
     }
+
+    @Nested
+    public List<ManifestDependencyImpl> getManifestDependenciesForInput() {
+        return (List<ManifestDependencyImpl>) dependencies;
+    }
 }
index 3348699..d803e82 100644 (file)
@@ -26,10 +26,7 @@ import java.io.File;
  */
 public class SymbolFileProviderImpl implements SymbolFileProvider {
 
-    @InputFile
     private File manifest;
-
-    @InputFile
     private File symbolFile;
 
     public SymbolFileProviderImpl(File manifest, File symbolFile) {
@@ -37,11 +34,13 @@ public class SymbolFileProviderImpl implements SymbolFileProvider {
         this.symbolFile = symbolFile;
     }
 
+    @InputFile
     @Override
     public File getManifest() {
         return manifest;
     }
 
+    @InputFile
     @Override
     public File getSymbolFile() {
         return symbolFile;
index bb37f39..6b7937a 100644 (file)
  * limitations under the License.
  */
 package com.android.build.gradle.tasks
-
+import com.android.build.gradle.internal.dependency.SymbolFileProviderImpl
 import com.android.build.gradle.internal.dsl.AaptOptionsImpl
 import com.android.build.gradle.internal.tasks.IncrementalTask
-import com.android.builder.SymbolFileProvider
 import com.android.builder.VariantConfiguration
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
@@ -55,7 +54,7 @@ public class ProcessAndroidResources extends IncrementalTask {
     // ----- PRIVATE TASK API -----
 
     @Nested
-    List<SymbolFileProvider> libraries
+    List<SymbolFileProviderImpl> libraries
 
     @Input @Optional
     String packageOverride
index 805b028..6e3c413 100644 (file)
  * limitations under the License.
  */
 package com.android.build.gradle.tasks
-
-import com.android.builder.ManifestDependency
+import com.android.build.gradle.internal.dependency.ManifestDependencyImpl
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.Optional
-
 /**
  * A task that processes the manifest
  */
@@ -36,7 +34,7 @@ public class ProcessAppManifest extends ProcessManifest {
     List<File> manifestOverlays
 
     @Nested
-    List<ManifestDependency> libraries
+    List<ManifestDependencyImpl> libraries
 
     @Input
     int versionCode
index ab7cdec..3f9a9fa 100644 (file)
@@ -15,7 +15,7 @@
  */
 package com.android.build.gradle.tasks
 
-import com.android.builder.ManifestDependency
+import com.android.build.gradle.internal.dependency.ManifestDependencyImpl
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Nested
 
@@ -39,7 +39,7 @@ public class ProcessTestManifest extends ProcessManifest {
     String instrumentationRunner
 
     @Nested
-    List<ManifestDependency> libraries
+    List<ManifestDependencyImpl> libraries
 
     @Override
     protected void doFullTaskAction() {
diff --git a/tests/assets/app/build.gradle b/tests/assets/app/build.gradle
new file mode 100644 (file)
index 0000000..f71301e
--- /dev/null
@@ -0,0 +1,9 @@
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 15
+}
+
+dependencies {
+    compile project(':lib')
+}
diff --git a/tests/assets/app/proguard-project.txt b/tests/assets/app/proguard-project.txt
new file mode 100644 (file)
index 0000000..349f80f
--- /dev/null
@@ -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/assets/app/src/main/AndroidManifest.xml b/tests/assets/app/src/main/AndroidManifest.xml
new file mode 100644 (file)
index 0000000..404f93f
--- /dev/null
@@ -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.assets.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/assets/app/src/main/assets/App.txt b/tests/assets/app/src/main/assets/App.txt
new file mode 100644 (file)
index 0000000..084e7d0
--- /dev/null
@@ -0,0 +1 @@
+SUCCESS-APP
\ No newline at end of file
diff --git a/tests/assets/app/src/main/java/com/android/tests/assets/app/App.java b/tests/assets/app/src/main/java/com/android/tests/assets/app/App.java
new file mode 100644 (file)
index 0000000..31e40ff
--- /dev/null
@@ -0,0 +1,46 @@
+package com.android.tests.assets.app;
+
+import android.app.Activity;
+import android.content.Context;
+import android.widget.TextView;
+import android.content.res.AssetManager;
+
+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(a));
+        }
+    }
+    
+    private static String getContent(Context context) {
+        AssetManager assets = context.getAssets();
+               
+        BufferedReader reader = null;
+        try {
+            InputStream input = assets.open("App.txt");
+            if (input == null) {
+                return "FAILED TO FIND App.txt";
+            }
+            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/assets/app/src/main/java/com/android/tests/assets/app/MainActivity.java b/tests/assets/app/src/main/java/com/android/tests/assets/app/MainActivity.java
new file mode 100644 (file)
index 0000000..c20a401
--- /dev/null
@@ -0,0 +1,18 @@
+package com.android.tests.assets.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import com.android.tests.assets.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/assets/app/src/main/res/drawable-hdpi/icon.png b/tests/assets/app/src/main/res/drawable-hdpi/icon.png
new file mode 100644 (file)
index 0000000..8074c4c
Binary files /dev/null and b/tests/assets/app/src/main/res/drawable-hdpi/icon.png differ
diff --git a/tests/assets/app/src/main/res/drawable-ldpi/icon.png b/tests/assets/app/src/main/res/drawable-ldpi/icon.png
new file mode 100644 (file)
index 0000000..1095584
Binary files /dev/null and b/tests/assets/app/src/main/res/drawable-ldpi/icon.png differ
diff --git a/tests/assets/app/src/main/res/drawable-mdpi/icon.png b/tests/assets/app/src/main/res/drawable-mdpi/icon.png
new file mode 100644 (file)
index 0000000..a07c69f
Binary files /dev/null and b/tests/assets/app/src/main/res/drawable-mdpi/icon.png differ
diff --git a/tests/assets/app/src/main/res/layout/main.xml b/tests/assets/app/src/main/res/layout/main.xml
new file mode 100644 (file)
index 0000000..6761bef
--- /dev/null
@@ -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/assets/app/src/main/res/values/strings.xml b/tests/assets/app/src/main/res/values/strings.xml
new file mode 100644 (file)
index 0000000..190a400
--- /dev/null
@@ -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/assets/app/src/test/java/com/android/tests/assets/app/MainActivityTest.java b/tests/assets/app/src/test/java/com/android/tests/assets/app/MainActivityTest.java
new file mode 100644 (file)
index 0000000..77ee434
--- /dev/null
@@ -0,0 +1,92 @@
+/*
+ * 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.assets.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;
+    private TextView mLibTextView1;
+    private TextView mLibTextView2;
+
+    /**
+     * 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);
+        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(mAppTextView1);
+        assertNotNull(mAppTextView2);
+        assertNotNull(mLibTextView1);
+        assertNotNull(mLibTextView2);
+    }
+
+    @MediumTest
+    public void testAndroidStrings() {
+        assertEquals("SUCCESS-APP", mAppTextView1.getText());
+        assertEquals("SUCCESS-LIB", mLibTextView1.getText());
+    }
+
+    @MediumTest
+    public void testJavaStrings() {
+        assertEquals("SUCCESS-APP", mAppTextView2.getText());
+        assertEquals("SUCCESS-LIB", mLibTextView2.getText());
+    }
+}
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
new file mode 100644 (file)
index 0000000..8090336
--- /dev/null
@@ -0,0 +1,10 @@
+buildscript {
+    repositories {
+        maven { url '../../repo' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.3-SNAPSHOT'
+    }
+}
+
+apply plugin: 'android-reporting'
\ No newline at end of file
diff --git a/tests/assets/lib/build.gradle b/tests/assets/lib/build.gradle
new file mode 100644 (file)
index 0000000..182f845
--- /dev/null
@@ -0,0 +1,5 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 15
+}
\ No newline at end of file
diff --git a/tests/assets/lib/proguard-project.txt b/tests/assets/lib/proguard-project.txt
new file mode 100644 (file)
index 0000000..f2fe155
--- /dev/null
@@ -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/assets/lib/src/main/AndroidManifest.xml b/tests/assets/lib/src/main/AndroidManifest.xml
new file mode 100644 (file)
index 0000000..275eb6f
--- /dev/null
@@ -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.assets.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/assets/lib/src/main/assets/Lib.txt b/tests/assets/lib/src/main/assets/Lib.txt
new file mode 100644 (file)
index 0000000..731a6b4
--- /dev/null
@@ -0,0 +1 @@
+SUCCESS-LIB
\ No newline at end of file
diff --git a/tests/assets/lib/src/main/java/com/android/tests/assets/lib/Lib.java b/tests/assets/lib/src/main/java/com/android/tests/assets/lib/Lib.java
new file mode 100644 (file)
index 0000000..89ecfbb
--- /dev/null
@@ -0,0 +1,46 @@
+package com.android.tests.assets.lib;
+
+import android.app.Activity;
+import android.content.Context;
+import android.widget.TextView;
+import android.content.res.AssetManager;
+
+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(a));
+        }
+    }
+
+    private static String getContent(Context context) {
+        AssetManager assets = context.getAssets();
+
+        BufferedReader reader = null;
+        try {
+            InputStream input = assets.open("Lib.txt");
+            if (input == null) {
+                return "FAILED TO FIND Lib.txt";
+            }
+            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/assets/lib/src/main/java/com/android/tests/assets/lib/MainActivity.java b/tests/assets/lib/src/main/java/com/android/tests/assets/lib/MainActivity.java
new file mode 100644 (file)
index 0000000..d8def1c
--- /dev/null
@@ -0,0 +1,15 @@
+package com.android.tests.assets.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/assets/lib/src/main/res/drawable-hdpi/ic_launcher.png b/tests/assets/lib/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..8074c4c
Binary files /dev/null and b/tests/assets/lib/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/tests/assets/lib/src/main/res/drawable-ldpi/ic_launcher.png b/tests/assets/lib/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..1095584
Binary files /dev/null and b/tests/assets/lib/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/tests/assets/lib/src/main/res/drawable-mdpi/ic_launcher.png b/tests/assets/lib/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..a07c69f
Binary files /dev/null and b/tests/assets/lib/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/tests/assets/lib/src/main/res/layout/lib_main.xml b/tests/assets/lib/src/main/res/layout/lib_main.xml
new file mode 100644 (file)
index 0000000..47e792a
--- /dev/null
@@ -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/assets/lib/src/main/res/values/strings.xml b/tests/assets/lib/src/main/res/values/strings.xml
new file mode 100644 (file)
index 0000000..a97de83
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="lib_name">assets-lib</string>
+    <string name="lib_string">SUCCESS-LIB</string>
+
+</resources>
\ No newline at end of file
diff --git a/tests/assets/lib/src/test/java/com/android/tests/assets/lib/MainActivityTest.java b/tests/assets/lib/src/test/java/com/android/tests/assets/lib/MainActivityTest.java
new file mode 100644 (file)
index 0000000..40ebe35
--- /dev/null
@@ -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.assets.lib;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.widget.TextView;
+
+import com.android.tests.assets.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-LIB", mTextView1.getText());
+    }
+
+    @MediumTest
+    public void testJavaStrings() {
+        assertEquals("SUCCESS-LIB", mTextView2.getText());
+    }
+}
diff --git a/tests/assets/settings.gradle b/tests/assets/settings.gradle
new file mode 100644 (file)
index 0000000..eedb2a1
--- /dev/null
@@ -0,0 +1,2 @@
+include 'app'
+include 'lib'