Commit 232f5c6c authored by Aaron Klotz's avatar Aaron Klotz
Browse files

Bug 1650118: Part 3 - Update tests; r=geckoview-reviewers,agi,perftest-reviewers,sparky 

Depends on D90930

Differential Revision: https://phabricator.services.mozilla.com/D90932
parent 135da082

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentCrashTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ class ContentCrashTest : BaseSessionTest() { 
    @IgnoreCrash

    @Test

    fun crashContent() {

        assumeTrue(sessionRule.env.isMultiprocess)

        // We need the crash reporter for this test

        assumeTrue(BuildConfig.MOZ_CRASHREPORTER)

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -119,9 +119,6 @@ class ContentDelegateMultipleSessionsTest : BaseSessionTest() { 


    @IgnoreCrash

    @Test fun crashContentMultipleSessions() {

        // This test doesn't make sense without multiprocess

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        val newSession = getSecondGeckoSession()



        // We can inadvertently catch the `onCrash` call for the cached session if we don't specify
@@ -161,8 +158,6 @@ class ContentDelegateMultipleSessionsTest : BaseSessionTest() { 


    @IgnoreCrash

    @Test fun killContentMultipleSessions() {

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        val newSession = getSecondGeckoSession()



        val mainSessionKilled = GeckoResult<Void>()

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt

+0 −8
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ class ContentDelegateTest : BaseSessionTest() { 


    @IgnoreCrash

    @Test fun crashContent() {

        // This test doesn't make sense without multiprocess

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        mainSession.loadUri(CONTENT_CRASH_URL)

        mainSession.waitUntilCalled(object : Callbacks.ContentDelegate {

            @AssertCalled(count = 1)
@@ -137,9 +134,6 @@ class ContentDelegateTest : BaseSessionTest() { 
    @IgnoreCrash

    @WithDisplay(width = 10, height = 10)

    @Test fun crashContent_tapAfterCrash() {

        // This test doesn't make sense without multiprocess

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        mainSession.delegateUntilTestEnd(object : Callbacks.ContentDelegate {

            override fun onCrash(session: GeckoSession) {

                mainSession.open()
@@ -170,8 +164,6 @@ class ContentDelegateTest : BaseSessionTest() { 


    @IgnoreCrash

    @Test fun killContent() {

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        killAllContentProcesses()

        mainSession.waitUntilCalled(object : Callbacks.ContentDelegate {

            @AssertCalled(count = 1)

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -1637,8 +1637,6 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) { 


    @IgnoreCrash

    @Test fun contentCrashIgnored() {

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))



        mainSession.loadUri(CONTENT_CRASH_URL)

        mainSession.waitUntilCalled(object : Callbacks.ContentDelegate {

            @AssertCalled(count = 1)
@@ -1648,7 +1646,6 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) { 


    @Test(expected = ChildCrashedException::class)

    fun contentCrashFails() {

        assumeThat(sessionRule.env.isMultiprocess, equalTo(true))

        assumeThat(sessionRule.env.shouldShutdownOnCrash(), equalTo(false))



        sessionRule.session.loadUri(CONTENT_CRASH_URL)

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/Environment.java

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ public class Environment { 
        return !getEnvVar("MOZ_CRASHREPORTER_SHUTDOWN").isEmpty();

    }



    public boolean isMultiprocess() {

        return Boolean.valueOf(InstrumentationRegistry.getArguments()

                .getString("use_multiprocess",

                        "true"));

    }



    public boolean isDebugging() {

        return Debug.isDebuggerConnected();

    }