diff options
| -rw-r--r-- | src/com/android/networkstack/netlink/TcpInfo.java | 4 | ||||
| -rw-r--r-- | tests/lib/src/com/android/testutils/FakeDns.kt (renamed from tests/lib/src/android/networkstack/util/FakeDns.kt) | 2 | ||||
| -rw-r--r-- | tests/unit/src/com/android/networkstack/metrics/DataStallStatsUtilsTest.kt (renamed from tests/unit/src/android/networkstack/metrics/DataStallStatsUtilsTest.kt) | 3 | ||||
| -rw-r--r-- | tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java (renamed from tests/unit/src/android/networkstack/netlink/TcpInfoTest.java) | 4 | ||||
| -rw-r--r-- | tests/unit/src/com/android/networkstack/util/DnsUtilsTest.kt (renamed from tests/unit/src/android/networkstack/util/DnsUtilsTest.kt) | 3 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/com/android/networkstack/netlink/TcpInfo.java b/src/com/android/networkstack/netlink/TcpInfo.java index 9cf415b..7a2adc7 100644 --- a/src/com/android/networkstack/netlink/TcpInfo.java +++ b/src/com/android/networkstack/netlink/TcpInfo.java @@ -114,7 +114,7 @@ public class TcpInfo { } @VisibleForTesting - public TcpInfo(@NonNull HashMap<Field, Number> info) { + TcpInfo(@NonNull HashMap<Field, Number> info) { for (final Field field : Field.values()) { mFieldsValues.put(field, info.get(field)); } @@ -177,7 +177,7 @@ public class TcpInfo { * Map to enum in bionic/libc/include/netinet/tcp.h */ @VisibleForTesting - public static String getTcpStateName(int state) { + static String getTcpStateName(int state) { switch (state) { case 1: return "TCP_ESTABLISHED"; case 2: return "TCP_SYN_SENT"; diff --git a/tests/lib/src/android/networkstack/util/FakeDns.kt b/tests/lib/src/com/android/testutils/FakeDns.kt index 157b6ce..825d748 100644 --- a/tests/lib/src/android/networkstack/util/FakeDns.kt +++ b/tests/lib/src/com/android/testutils/FakeDns.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.networkstack.util +package com.android.testutils import android.net.DnsResolver import android.net.InetAddresses diff --git a/tests/unit/src/android/networkstack/metrics/DataStallStatsUtilsTest.kt b/tests/unit/src/com/android/networkstack/metrics/DataStallStatsUtilsTest.kt index 3b53b5f..3820165 100644 --- a/tests/unit/src/android/networkstack/metrics/DataStallStatsUtilsTest.kt +++ b/tests/unit/src/com/android/networkstack/metrics/DataStallStatsUtilsTest.kt @@ -14,12 +14,11 @@ * limitations under the License. */ -package android.networkstack.metrics +package com.android.networkstack.metrics import android.net.captiveportal.CaptivePortalProbeResult import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 -import com.android.networkstack.metrics.DataStallStatsUtils import com.android.server.connectivity.nano.DataStallEventProto import org.junit.Assert.assertEquals import org.junit.Test diff --git a/tests/unit/src/android/networkstack/netlink/TcpInfoTest.java b/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java index 9c3660e..415bbe4 100644 --- a/tests/unit/src/android/networkstack/netlink/TcpInfoTest.java +++ b/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package android.networkstack.netlink; +package com.android.networkstack.netlink; import static org.junit.Assert.assertEquals; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; -import com.android.networkstack.netlink.TcpInfo; - import libcore.util.HexEncoding; import org.junit.Test; diff --git a/tests/unit/src/android/networkstack/util/DnsUtilsTest.kt b/tests/unit/src/com/android/networkstack/util/DnsUtilsTest.kt index 815fc60..59d96be 100644 --- a/tests/unit/src/android/networkstack/util/DnsUtilsTest.kt +++ b/tests/unit/src/com/android/networkstack/util/DnsUtilsTest.kt @@ -14,13 +14,14 @@ * limitations under the License. */ -package android.networkstack.util +package com.android.networkstack.netlink.util import android.net.DnsResolver import android.net.DnsResolver.FLAG_EMPTY import android.net.DnsResolver.TYPE_A import android.net.DnsResolver.TYPE_AAAA import android.net.Network +import com.android.testutils.FakeDns import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.networkstack.util.DnsUtils |