Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156775fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Ensure that android.test tests pass"

parents e74f3adb 2a637cf9

test-runner/tests/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -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

test-runner/tests/src/android/test/TestCaseUtilTest.java

+1 −3
Original line number Diff line number Diff line
@@ -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 {

test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java

+17 −4
Original line number Diff line number Diff line
@@ -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) {

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

+1 −0
Original line number Diff line number Diff line
@@ -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 {

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

+1 −0
Original line number Diff line number Diff line
@@ -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 {