LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Migrate cts/tests/tests/net to androidx.test" am: c4c0bb37cf

Browse Source 
am: 928821e657

Change-Id: I011952772f9b50b25e07fcc765be691b974c9076
This commit is contained in:
Brett Chabot
2019-03-01 17:29:54 -08:00
committed by android-build-merger
parent 13a1199fdf 928821e657
commit debeff9d12
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/net/Android.mk
View File

@@ -40,8 +40,8 @@ LOCAL_PACKAGE_NAME := CtsNetTestCases
LOCAL_STATIC_JAVA_LIBRARIES := \
core-tests-support \
compatibility-device-util \
ctstestrunner \
compatibility-device-util-axt \
ctstestrunner-axt \
ctstestserver \
mockwebserver \
junit \

2
tests/cts/net/AndroidManifest.xml
View File

@@ -42,7 +42,7 @@
</receiver>
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="android.net.cts"
android:label="CTS tests of android.net">
<meta-data android:name="listener"

15
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -24,6 +24,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.provider.Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
import android.app.Instrumentation;
@@ -50,40 +51,38 @@ import android.os.Looper;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.system.Os;
import android.system.OsConstants;
import android.test.AndroidTestCase;
import android.text.TextUtils;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
import com.android.internal.R;
import com.android.internal.telephony.PhoneConstants;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
import libcore.io.Streams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.lang.NumberFormatException;
import java.net.HttpURLConnection;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.Socket;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.Scanner;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import libcore.io.Streams;
public class ConnectivityManagerTest extends AndroidTestCase {

6
tests/cts/net/src/android/net/cts/MacAddressTest.java
View File

@@ -19,11 +19,13 @@ package android.net.cts;
import static android.net.MacAddress.TYPE_BROADCAST;
import static android.net.MacAddress.TYPE_MULTICAST;
import static android.net.MacAddress.TYPE_UNICAST;
import static org.junit.Assert.fail;
import android.net.MacAddress;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

8
tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java
View File

@@ -24,9 +24,10 @@ import static org.junit.Assume.assumeTrue;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.FileUtils;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.test.InstrumentationRegistry;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.compatibility.common.util.ApiLevelUtil;
import com.android.compatibility.common.util.SystemUtil;
@@ -37,7 +38,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;