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

Commit 7072f32b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'frameworks-net-tests' 

* changes:
  Move the connectivity tests to frameworks/base/tests/net.
  De-guava BroadcastInterceptingContext and move it to testutils.
  Move FakeSettingsProvider to a common location.
parents 37c20a36 ecc986d4

core/tests/utiltests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    frameworks-base-testutils \

    mockito-target-minus-junit4



LOCAL_JAVA_LIBRARIES := android.test.runner

services/tests/servicestests/src/com/android/internal/util/FakeSettingsProviderTest.java→core/tests/utiltests/src/com/android/internal/util/test/FakeSettingsProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.util;

package com.android.internal.util.test;



import android.content.ContentResolver;

import android.database.ContentObserver;

services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Binder; 
import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import com.android.server.net.BaseNetworkObserver;

import com.android.internal.util.test.BroadcastInterceptingContext;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ import android.text.format.Time; 
import android.util.Log;

import android.util.TrustedTime;



import com.android.server.BroadcastInterceptingContext.FutureIntent;

import com.android.internal.util.test.BroadcastInterceptingContext;

import com.android.internal.util.test.BroadcastInterceptingContext.FutureIntent;

import com.android.server.net.NetworkPolicyManagerInternal;

import com.android.server.net.NetworkPolicyManagerService;

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ import android.test.AndroidTestCase; 
import android.util.TrustedTime;



import com.android.internal.net.VpnInfo;

import com.android.server.BroadcastInterceptingContext;

import com.android.internal.util.test.BroadcastInterceptingContext;

import com.android.server.net.NetworkStatsService;

import com.android.server.net.NetworkStatsService.NetworkStatsSettings;

import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;