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

Commit 1ae1b6b9 authored by Hugo Benichi's avatar Hugo Benichi Committed by Gerrit Code Review
Browse files

Merge "Finish moving NetworkStats tests to tests/net"

parents dde9ee9e e7e10303

services/tests/servicestests/src/com/android/server/net/NetworkStatsAccessTest.java→tests/net/java/com/android/server/net/NetworkStatsAccessTest.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.admin.DeviceAdminInfo; 
import android.app.admin.DevicePolicyManagerInternal;

import android.content.Context;

import android.content.pm.PackageManager;

import android.support.test.filters.SmallTest;

import android.telephony.TelephonyManager;



import com.android.server.LocalServices;
@@ -34,6 +35,7 @@ import junit.framework.TestCase; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



@SmallTest

public class NetworkStatsAccessTest extends TestCase {

    private static final String TEST_PKG = "com.example.test";

    private static final int TEST_UID = 12345;

services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java→tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java

+3 −3
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import android.net.NetworkTemplate; 
import android.os.Process;

import android.os.UserHandle;

import android.telephony.TelephonyManager;

import android.support.test.filters.SmallTest;

import android.test.AndroidTestCase;

import android.test.MoreAsserts;

import android.test.suitebuilder.annotation.MediumTest;



import com.android.frameworks.servicestests.R;

import com.android.frameworks.tests.net.R;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;
@@ -51,7 +51,7 @@ import libcore.io.Streams; 
/**

 * Tests for {@link NetworkStatsCollection}.

 */

@MediumTest

@SmallTest

public class NetworkStatsCollectionTest extends AndroidTestCase {



    private static final String TEST_FILE = "test.bin";

services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java→tests/net/java/com/android/server/net/NetworkStatsObserversTest.java

+5 −4
Original line number Diff line number Diff line
@@ -38,16 +38,16 @@ import android.net.DataUsageRequest; 
import android.net.NetworkIdentity;

import android.net.NetworkStats;

import android.net.NetworkTemplate;

import android.os.ConditionVariable;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.Process;



import android.os.ConditionVariable;

import android.os.Looper;

import android.os.Messenger;

import android.os.Message;

import android.os.Messenger;

import android.os.Process;

import android.os.UserHandle;

import android.support.test.filters.SmallTest;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;
@@ -69,6 +69,7 @@ import org.mockito.MockitoAnnotations; 
/**

 * Tests for {@link NetworkStatsObservers}.

 */

@SmallTest

public class NetworkStatsObserversTest extends TestCase {

    private static final String TEST_IFACE = "test0";

    private static final String TEST_IFACE2 = "test1";

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

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import android.os.MessageQueue.IdleHandler; 
import android.os.Message;

import android.os.PowerManager;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.telephony.TelephonyManager;

import android.test.AndroidTestCase;
@@ -119,6 +120,7 @@ import java.util.List; 
 * still uses the Easymock structure, which could be simplified.

 */

@RunWith(AndroidJUnit4.class)

@SmallTest

public class NetworkStatsServiceTest {

    private static final String TAG = "NetworkStatsServiceTest";