diff options
author | Xavier Ducrohet <xav@android.com> | 2013-02-05 19:11:52 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2013-02-13 19:27:49 -0800 |
commit | 368588715e190f068d28dfce6f6753b19ed91acb (patch) | |
tree | 726020a63b7d0cf5afc78c5c20af851eba9dcff7 /tests | |
parent | db92233d5849d6064148e834e1299396c4999a70 (diff) | |
download | build-368588715e190f068d28dfce6f6753b19ed91acb.tar.gz |
Add a test app for assets support.
Also fix some issues related to input detection of some tasks.
Change-Id: I38ac5a151fe1ac84c03fc0cafb8cab31117888a1
Diffstat (limited to 'tests')
26 files changed, 472 insertions, 0 deletions
diff --git a/tests/assets/app/build.gradle b/tests/assets/app/build.gradle new file mode 100644 index 0000000..f71301e --- /dev/null +++ b/tests/assets/app/build.gradle @@ -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 index 0000000..349f80f --- /dev/null +++ b/tests/assets/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/assets/app/src/main/AndroidManifest.xml b/tests/assets/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..404f93f --- /dev/null +++ b/tests/assets/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.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 index 0000000..084e7d0 --- /dev/null +++ b/tests/assets/app/src/main/assets/App.txt @@ -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 index 0000000..31e40ff --- /dev/null +++ b/tests/assets/app/src/main/java/com/android/tests/assets/app/App.java @@ -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 index 0000000..c20a401 --- /dev/null +++ b/tests/assets/app/src/main/java/com/android/tests/assets/app/MainActivity.java @@ -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 Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/tests/assets/app/src/main/res/drawable-hdpi/icon.png diff --git a/tests/assets/app/src/main/res/drawable-ldpi/icon.png b/tests/assets/app/src/main/res/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/tests/assets/app/src/main/res/drawable-ldpi/icon.png diff --git a/tests/assets/app/src/main/res/drawable-mdpi/icon.png b/tests/assets/app/src/main/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/tests/assets/app/src/main/res/drawable-mdpi/icon.png 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 index 0000000..6761bef --- /dev/null +++ b/tests/assets/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/assets/app/src/main/res/values/strings.xml b/tests/assets/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..190a400 --- /dev/null +++ b/tests/assets/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/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 index 0000000..77ee434 --- /dev/null +++ b/tests/assets/app/src/test/java/com/android/tests/assets/app/MainActivityTest.java @@ -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 index 0000000..8090336 --- /dev/null +++ b/tests/assets/build.gradle @@ -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 index 0000000..182f845 --- /dev/null +++ b/tests/assets/lib/build.gradle @@ -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 index 0000000..f2fe155 --- /dev/null +++ b/tests/assets/lib/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/assets/lib/src/main/AndroidManifest.xml b/tests/assets/lib/src/main/AndroidManifest.xml new file mode 100644 index 0000000..275eb6f --- /dev/null +++ b/tests/assets/lib/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.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 index 0000000..731a6b4 --- /dev/null +++ b/tests/assets/lib/src/main/assets/Lib.txt @@ -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 index 0000000..89ecfbb --- /dev/null +++ b/tests/assets/lib/src/main/java/com/android/tests/assets/lib/Lib.java @@ -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 index 0000000..d8def1c --- /dev/null +++ b/tests/assets/lib/src/main/java/com/android/tests/assets/lib/MainActivity.java @@ -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 Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/tests/assets/lib/src/main/res/drawable-hdpi/ic_launcher.png 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 Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/tests/assets/lib/src/main/res/drawable-ldpi/ic_launcher.png 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 Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/tests/assets/lib/src/main/res/drawable-mdpi/ic_launcher.png 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 index 0000000..47e792a --- /dev/null +++ b/tests/assets/lib/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/assets/lib/src/main/res/values/strings.xml b/tests/assets/lib/src/main/res/values/strings.xml new file mode 100644 index 0000000..a97de83 --- /dev/null +++ b/tests/assets/lib/src/main/res/values/strings.xml @@ -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 index 0000000..40ebe35 --- /dev/null +++ b/tests/assets/lib/src/test/java/com/android/tests/assets/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.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 index 0000000..eedb2a1 --- /dev/null +++ b/tests/assets/settings.gradle @@ -0,0 +1,2 @@ +include 'app' +include 'lib' |