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

Commit e4c02991 authored by Felipe Leme's avatar Felipe Leme Committed by Lorenzo Colitti
Browse files

DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. 

Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

BUG: 30943463

(cherry picked from commit b8f946dc)

Change-Id: Ia9929295ab2396a7ebb133e65d157f98414e4dfa
parent 2026ca14

services/tests/servicestests/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    services.devicepolicy \

    services.devicepolicy \

    services.net \

    services.net \

    services.usage \

    services.usage \

    easymocklib \

    guava \

    guava \

    android-support-test \

    android-support-test \

    mockito-target \

    mockito-target \

services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java

+80 −226

File changed.

Preview size limit exceeded, changes collapsed.