Convert Email tests to use android-support-tests

Change-Id: I173afa352504757e84f5cc48dca8b493957ff6a1
This commit is contained in:
Brett Chabot 2014-02-20 21:03:07 -08:00
parent c02e3d5567
commit 695c77e526
3 changed files with 3 additions and 43 deletions

View File

@ -24,7 +24,7 @@ include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
# LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_SDK_VERSION := 14
LOCAL_PACKAGE_NAME := EmailTests

View File

@ -28,9 +28,9 @@
<!--
This declares that this app uses the instrumentation test runner targeting
the package of com.android.email. To run the tests use the command:
"adb shell am instrument -w com.android.email.tests/android.test.InstrumentationTestRunner"
"adb shell am instrument -w com.android.email.tests/android.support.test.runner.AndroidJUnitRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.email"
android:label="Tests for Email."/>

View File

@ -1,40 +0,0 @@
/*
* 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.email;
import junit.framework.Test;
import junit.framework.TestSuite;
import android.test.suitebuilder.TestSuiteBuilder;
/**
* Unit & small test suites for Email. This is intended to run all tests that can be handled
* locally, without requiring any external email server.
*
* To run just this suite from the command line:
* $ adb shell am instrument -w \
* -e class com.android.email.UnitTests \
* com.android.email.tests/android.test.InstrumentationTestRunner
*/
public class SmallTests extends TestSuite {
public static Test suite() {
return new TestSuiteBuilder(SmallTests.class)
.includeAllPackagesUnderHere()
.build();
}
}