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

Commit c4796c00 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes Id87c25ec,Ib0837ee6 into main 

* changes:
  Offer Mockito under Ravenwood.
  Offer Mainline stubs under Ravenwood.
parents fcf5c4e6 ed81c781

Ravenwood.bp

+21 −0
Original line number Diff line number Diff line
@@ -75,16 +75,35 @@ java_genrule { 
    ],

}



java_library {

    name: "mockito-ravenwood-prebuilt",

    installable: false,

    static_libs: [

        "mockito-robolectric-prebuilt",

    ],

}



java_library {

    name: "inline-mockito-ravenwood-prebuilt",

    installable: false,

    static_libs: [

        "inline-mockito-robolectric-prebuilt",

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

        "framework-minus-apex.ravenwood",

        "hoststubgen-helper-runtime.ravenwood",

        "hoststubgen-helper-framework-runtime.ravenwood",

        "all-updatable-modules-system-stubs",

        "junit",

        "truth",

        "ravenwood-junit-impl",

        "android.test.mock.ravenwood",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

}
@@ -94,5 +113,7 @@ android_ravenwood_libgroup { 
        "junit",

        "truth",

        "ravenwood-junit",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

}

core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.internal.os; 


import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;



import android.os.FileUtils;
@@ -73,8 +72,7 @@ public class StoragedUidIoStatsReaderTest { 
    @Test

    public void testReadNonexistentFile() throws Exception {

        mStoragedUidIoStatsReader.readAbsolute(mCallback);

        verifyZeroInteractions(mCallback);



        verifyNoMoreInteractions(mCallback);

    }



    /**