Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3 am: e211119fea" into oc-dr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-06-22 20:16:55 +00:00
committed by Android (Google) Code Review
parent 61f8509891 aa7f42c5c1
commit 989b7db027
6 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test-runner/tests/Android.mk
View File

@@ -16,6 +16,13 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# We only want this apk build for tests.
#
# Run the tests using the following commands:
# adb -r install ${ANDROID_PRODUCT_OUT}/data/app/FrameworkTestRunnerTests/FrameworkTestRunnerTests.apk
# adb shell am instrument \
-e notAnnotation android.test.suitebuilder.examples.error.RunAsPartOfSeparateTest \
-w com.android.frameworks.testrunner.tests/android.test.InstrumentationTestRunner
#
LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner

4
test-runner/tests/src/android/test/TestCaseUtilTest.java
View File

@@ -29,9 +29,7 @@ public class TestCaseUtilTest extends TestCase {
List<String> testCaseNames = TestCaseUtil.getTestCaseNames(testSuite, false);
assertEquals(2, testCaseNames.size());
assertTrue(testCaseNames.get(0).endsWith("OneTestTestCase"));
assertTrue(testCaseNames.get(1).endsWith("OneTestTestSuite"));
assertEquals(0, testCaseNames.size());
}
public void testGetTestCaseNamesForTestCaseWithSuiteMethod() throws Exception {

21
test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java
View File

@@ -135,10 +135,23 @@ public class TestSuiteBuilderTest extends TestCase {
TestSuite testSuite = new OuterTest().buildTestsUnderHereRecursively();
assertContentsInOrder(getTestCaseNames(testSuite),
"testOuter", "testErrorOne", "testErrorTwo", "testFailOne", "testFailTwo",
"testInstrumentation", "testLevel1", "testLevel2", "testAnotherOne",
"testSimpleOne", "testSimpleTwo", "testNonSmoke", "testSmoke", "testSubclass",
"testSuperclass", "testUnSuppressedMethod");
"testOuter",
"testPublicConstructor",
"testErrorOne",
"testErrorTwo",
"testFailOne",
"testFailTwo",
"testInstrumentation",
"testLevel1",
"testLevel2",
"testAnotherOne",
"testSimpleOne",
"testSimpleTwo",
"testNonSmoke",
"testSmoke",
"testSubclass",
"testSuperclass",
"testUnSuppressedMethod");
}
private void assertContentsInOrder(List<String> actual, String... source) {

1
test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java
View File

@@ -18,6 +18,7 @@ package android.test.suitebuilder.examples.error;
import junit.framework.TestCase;
@RunAsPartOfSeparateTest
public class ErrorTest extends TestCase {
public void testErrorOne() throws Exception {

1
test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java
View File

@@ -18,6 +18,7 @@ package android.test.suitebuilder.examples.error;
import junit.framework.TestCase;
@RunAsPartOfSeparateTest
public class FailingTest extends TestCase {
public void testFailOne() throws Exception {

30
test-runner/tests/src/android/test/suitebuilder/examples/error/RunAsPartOfSeparateTest.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright (C) 2017 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 android.test.suitebuilder.examples.error;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Annotation that marks tests that should only be run as part of a separate test and not on their
* own.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface RunAsPartOfSeparateTest {
}