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

Commit 570de736 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Add / fix a few tests 

- Make ActivityThread a bivalent test.
- I turned ActivityThread.getSystemContext() returns a context with
  an "android" package. Updated the test and excluded it on ravenwood.

- Added tests for accessing static mocking from other threads.

Bug: 292141694
Test: atest RavenwoodMockitoTest_device RavenwoodBivalentTest_device
Test: atest RavenwoodMockitoTest RavenwoodBivalentTest
Flag: TEST_ONLY
Change-Id: Ifdb25e6d42e6ac710c4879245b4159a572a483eb
parent 7294163e

ravenwood/tests/coretest/test/com/android/ravenwoodtest/coretest/RavenwoodActivityThreadTest.java→ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodActivityThreadTest.java

+10 −2
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 
package com.android.ravenwoodtest.coretest;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;



import android.app.ActivityThread;

import android.content.Context;

import android.platform.test.annotations.DisabledOnRavenwood;



import androidx.test.platform.app.InstrumentationRegistry;
@@ -30,8 +32,14 @@ public class RavenwoodActivityThreadTest { 


    @Test

    public void testActivityThreadCurrentSystemContext() {

        assertEquals(ActivityThread.currentSystemContext().getPackageName(),

                sContext.getPackageName());

        assertNotNull(ActivityThread.currentSystemContext());

    }



    @Test

    @DisabledOnRavenwood(

            reason = "ravenwood just returns a package context as system context for now")

    public void testActivityThreadCurrentSystemContextPackage() {

        assertEquals("android", ActivityThread.currentSystemContext().getPackageName());

    }



    @Test

ravenwood/tests/mockito/test/com/android/ravenwoodtest/mockito/RavenwoodMockitoDeviceOnlyTest.java

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; 


import android.app.ActivityManager;

import android.platform.test.ravenwood.RavenwoodRule;

import android.platform.test.ravenwood.RavenwoodUtils;



import com.android.dx.mockito.inline.extended.ExtendedMockito;
@@ -39,6 +40,11 @@ public class RavenwoodMockitoDeviceOnlyTest { 
            ExtendedMockito.doReturn(true).when(ActivityManager::isUserAMonkey);



            assertThat(ActivityManager.isUserAMonkey()).isEqualTo(true);



            // Extended mockito's static mocking works on any threads.

            RavenwoodUtils.runOnMainThreadSync(() -> {

                assertThat(ActivityManager.isUserAMonkey()).isEqualTo(true);

            });

        } finally {

            mockingSession.finishMocking();

        }

ravenwood/tests/mockito/test/com/android/ravenwoodtest/mockito/RavenwoodMockitoRavenwoodOnlyTest.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; 


import android.app.ActivityManager;

import android.platform.test.ravenwood.RavenwoodRule;

import android.platform.test.ravenwood.RavenwoodUtils;



import org.junit.Rule;

import org.junit.Test;
@@ -33,6 +34,12 @@ public class RavenwoodMockitoRavenwoodOnlyTest { 
        try (MockedStatic<ActivityManager> am = Mockito.mockStatic(ActivityManager.class)) {

            am.when(ActivityManager::isUserAMonkey).thenReturn(true);

            assertThat(ActivityManager.isUserAMonkey()).isEqualTo(true);



            // Mockito's static mocking only works on the current thread.

            // (unlike ExtendedMockito's)

            RavenwoodUtils.runOnMainThreadSync(() -> {

                assertThat(ActivityManager.isUserAMonkey()).isEqualTo(false);

            });

        }

    }

}