diff options
| author | Brett Chabot <brettchabot@google.com> | 2019-03-04 14:14:56 -0800 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2019-03-05 09:05:47 -0800 |
| commit | 1ae2aa66eb6a59ff87af1b0e64e9416c514d5728 (patch) | |
| tree | 753c116a0355950efdcd30bd65825d10d06d15e2 /tests/net/java/com/android/server/IpSecServiceTest.java | |
| parent | 5461b1d23f0f3e2af54dc371200a2d6c4d4b524d (diff) | |
Migrate frameworks/base/tests/net/ to androidx.test
Test: atest FrameworksNetTests
Change-Id: Iaa59d606f5e1678cc5aaca9ed37e184fad894e5d
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceTest.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/tests/net/java/com/android/server/IpSecServiceTest.java index 5be7c7bb2040..b5c3e9287467 100644 --- a/tests/net/java/com/android/server/IpSecServiceTest.java +++ b/tests/net/java/com/android/server/IpSecServiceTest.java @@ -20,6 +20,7 @@ import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.EADDRINUSE; import static android.system.OsConstants.IPPROTO_UDP; import static android.system.OsConstants.SOCK_DGRAM; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -39,19 +40,24 @@ import android.net.IpSecAlgorithm; import android.net.IpSecConfig; import android.net.IpSecManager; import android.net.IpSecSpiResponse; -import android.net.IpSecTransform; import android.net.IpSecUdpEncapResponse; import android.os.Binder; import android.os.ParcelFileDescriptor; import android.os.Process; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import dalvik.system.SocketTagger; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentMatcher; + import java.io.FileDescriptor; import java.net.InetAddress; import java.net.ServerSocket; @@ -60,11 +66,6 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentMatcher; - /** Unit tests for {@link IpSecService}. */ @SmallTest @RunWith(AndroidJUnit4.class) |