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

Commit cd81a00c authored by Gabriel Biren's avatar Gabriel Biren
Browse files

Use Extended Mockito in the frameworks/base 

unit tests.

Will allow static mocking in the future
WifiKeystore tests.

Bug: 304553176
Test: atest FrameworksWifiNonUpdatableApiTests
Change-Id: Ifa05cfc154bd4993f9df8f6d683e78381acb8a57
parent e50abcb7

wifi/tests/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ android_test { 
        "androidx.test.core",

        "frameworks-base-testutils",

        "guava",

        "mockito-target-minus-junit4",

        "mockito-target-extended-minus-junit4",

        "truth",

    ],
@@ -48,6 +48,12 @@ android_test { 
        "android.test.base",

    ],



    // Required by Extended Mockito

    jni_libs: [

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],



    test_suites: [

        "general-tests",

    ],

wifi/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="android.net.wifi.nonupdatable.test">



    <application>

    <application android:debuggable="true">

        <uses-library android:name="android.test.runner"/>

        <activity android:label="WifiTestDummyLabel"

             android:name="WifiTestDummyName"