Commit d445c555 authored Aug 18, 2016 by Felipe Leme Committed by Lorenzo Colitti Jan 18, 2017

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)

(cherry picked from commit e4c02991)

Change-Id: I93cdfc8753dcded141732c0587783d1fa2085f5a

parent c97d8b74

services/tests/servicestests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		services.devicepolicy \
		services.net \
		services.usage \
		easymocklib \
		guava \
		android-support-test \
		mockito-target \

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

+80 −226

File changed.

Preview size limit exceeded, changes collapsed.