diff options
Diffstat (limited to 'tests')
21 files changed, 60 insertions, 56 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index bec150f99..f4b47776e 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -94,11 +94,11 @@ import com.android.internal.util.StateMachine; import com.android.server.wifi.hotspot2.NetworkDetail; import com.android.server.wifi.hotspot2.PasspointManager; import com.android.server.wifi.hotspot2.PasspointProvisioningTestUtil; -import com.android.server.wifi.nano.WifiMetricsProto; -import com.android.server.wifi.nano.WifiMetricsProto.StaEvent; -import com.android.server.wifi.nano.WifiMetricsProto.WifiIsUnusableEvent; -import com.android.server.wifi.nano.WifiMetricsProto.WifiUsabilityStats; import com.android.server.wifi.p2p.WifiP2pServiceImpl; +import com.android.server.wifi.proto.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto.StaEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiIsUnusableEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiUsabilityStats; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; diff --git a/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java b/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java index 871218f1f..517d69aff 100644 --- a/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java +++ b/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java @@ -18,6 +18,8 @@ package com.android.server.wifi; import android.util.ArrayMap; +import com.android.server.wifi.proto.WifiScoreCardProto; + import java.util.Map; public final class ConcreteCandidate implements WifiCandidates.Candidate { diff --git a/tests/wifitests/src/com/android/server/wifi/DppMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/DppMetricsTest.java index 303c6e7d7..fd43578b1 100644 --- a/tests/wifitests/src/com/android/server/wifi/DppMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/DppMetricsTest.java @@ -34,8 +34,8 @@ import static org.junit.Assert.assertTrue; import android.test.suitebuilder.annotation.SmallTest; -import com.android.server.wifi.nano.WifiMetricsProto; -import com.android.server.wifi.nano.WifiMetricsProto.HistogramBucketInt32; +import com.android.server.wifi.proto.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto.HistogramBucketInt32; import org.junit.After; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java index f88272d45..f1eeb389d 100644 --- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java @@ -54,8 +54,8 @@ import android.provider.Settings; import androidx.test.filters.SmallTest; -import com.android.server.wifi.nano.WifiMetricsProto; -import com.android.server.wifi.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; +import com.android.server.wifi.proto.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java index 898409f1a..4b26664e8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java @@ -29,7 +29,7 @@ import android.provider.Settings; import androidx.test.filters.SmallTest; -import com.android.server.wifi.nano.WifiMetricsProto.WifiIsUnusableEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiIsUnusableEvent; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index b3f1ed12e..27094b240 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -33,7 +33,7 @@ import static com.android.server.wifi.WifiMetricsTestUtil.buildInt32Count; import static com.android.server.wifi.WifiMetricsTestUtil.buildLinkProbeFailureReasonCount; import static com.android.server.wifi.WifiMetricsTestUtil.buildLinkProbeFailureStaEvent; import static com.android.server.wifi.WifiMetricsTestUtil.buildLinkProbeSuccessStaEvent; -import static com.android.server.wifi.nano.WifiMetricsProto.StaEvent.TYPE_LINK_PROBE; +import static com.android.server.wifi.proto.nano.WifiMetricsProto.StaEvent.TYPE_LINK_PROBE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -81,26 +81,26 @@ import com.android.server.wifi.hotspot2.NetworkDetail; import com.android.server.wifi.hotspot2.PasspointManager; import com.android.server.wifi.hotspot2.PasspointMatch; import com.android.server.wifi.hotspot2.PasspointProvider; -import com.android.server.wifi.nano.WifiMetricsProto; -import com.android.server.wifi.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; -import com.android.server.wifi.nano.WifiMetricsProto.DeviceMobilityStatePnoScanStats; -import com.android.server.wifi.nano.WifiMetricsProto.HistogramBucketInt32; -import com.android.server.wifi.nano.WifiMetricsProto.Int32Count; -import com.android.server.wifi.nano.WifiMetricsProto.LinkProbeStats; -import com.android.server.wifi.nano.WifiMetricsProto.LinkProbeStats.ExperimentProbeCounts; -import com.android.server.wifi.nano.WifiMetricsProto.LinkProbeStats.LinkProbeFailureReasonCount; -import com.android.server.wifi.nano.WifiMetricsProto.NetworkSelectionExperimentDecisions; -import com.android.server.wifi.nano.WifiMetricsProto.PasspointProfileTypeCount; -import com.android.server.wifi.nano.WifiMetricsProto.PasspointProvisionStats; -import com.android.server.wifi.nano.WifiMetricsProto.PnoScanMetrics; -import com.android.server.wifi.nano.WifiMetricsProto.SoftApConnectedClientsEvent; -import com.android.server.wifi.nano.WifiMetricsProto.StaEvent; -import com.android.server.wifi.nano.WifiMetricsProto.WifiIsUnusableEvent; -import com.android.server.wifi.nano.WifiMetricsProto.WifiRadioUsage; -import com.android.server.wifi.nano.WifiMetricsProto.WifiUsabilityStats; -import com.android.server.wifi.nano.WifiMetricsProto.WifiUsabilityStatsEntry; -import com.android.server.wifi.nano.WifiMetricsProto.WpsMetrics; import com.android.server.wifi.p2p.WifiP2pMetrics; +import com.android.server.wifi.proto.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; +import com.android.server.wifi.proto.nano.WifiMetricsProto.DeviceMobilityStatePnoScanStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.HistogramBucketInt32; +import com.android.server.wifi.proto.nano.WifiMetricsProto.Int32Count; +import com.android.server.wifi.proto.nano.WifiMetricsProto.LinkProbeStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.LinkProbeStats.ExperimentProbeCounts; +import com.android.server.wifi.proto.nano.WifiMetricsProto.LinkProbeStats.LinkProbeFailureReasonCount; +import com.android.server.wifi.proto.nano.WifiMetricsProto.NetworkSelectionExperimentDecisions; +import com.android.server.wifi.proto.nano.WifiMetricsProto.PasspointProfileTypeCount; +import com.android.server.wifi.proto.nano.WifiMetricsProto.PasspointProvisionStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.PnoScanMetrics; +import com.android.server.wifi.proto.nano.WifiMetricsProto.SoftApConnectedClientsEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.StaEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiIsUnusableEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiRadioUsage; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiUsabilityStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiUsabilityStatsEntry; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WpsMetrics; import com.android.server.wifi.rtt.RttMetrics; import com.android.server.wifi.util.ExternalCallbackTracker; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTestUtil.java index 0e9f661ca..2be553840 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTestUtil.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertEquals; import android.net.wifi.WifiManager; -import com.android.server.wifi.nano.WifiMetricsProto.DeviceMobilityStatePnoScanStats; -import com.android.server.wifi.nano.WifiMetricsProto.HistogramBucketInt32; -import com.android.server.wifi.nano.WifiMetricsProto.Int32Count; -import com.android.server.wifi.nano.WifiMetricsProto.LinkProbeStats.ExperimentProbeCounts; -import com.android.server.wifi.nano.WifiMetricsProto.LinkProbeStats.LinkProbeFailureReasonCount; -import com.android.server.wifi.nano.WifiMetricsProto.StaEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.DeviceMobilityStatePnoScanStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.HistogramBucketInt32; +import com.android.server.wifi.proto.nano.WifiMetricsProto.Int32Count; +import com.android.server.wifi.proto.nano.WifiMetricsProto.LinkProbeStats.ExperimentProbeCounts; +import com.android.server.wifi.proto.nano.WifiMetricsProto.LinkProbeStats.LinkProbeFailureReasonCount; +import com.android.server.wifi.proto.nano.WifiMetricsProto.StaEvent; import java.util.Arrays; import java.util.Comparator; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java index c9e7db2f9..2eaa7b944 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java @@ -68,7 +68,7 @@ import android.util.Xml; import com.android.internal.util.AsyncChannel; import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.WifiNetworkFactory.AccessPoint; -import com.android.server.wifi.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import com.android.server.wifi.util.ScanResultUtil; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java index adb1be81c..bf610c2c9 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java @@ -41,7 +41,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs; -import com.android.server.wifi.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import org.junit.After; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java index b1ef1a032..dfd686723 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java @@ -24,8 +24,8 @@ import android.text.format.DateUtils; import androidx.test.filters.SmallTest; -import com.android.server.wifi.nano.WifiMetricsProto.WifiPowerStats; -import com.android.server.wifi.nano.WifiMetricsProto.WifiRadioUsage; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiPowerStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiRadioUsage; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java index d02ae2ed4..15a6f598e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java @@ -22,12 +22,14 @@ import android.net.wifi.WifiConfiguration; import androidx.test.filters.SmallTest; +import com.android.server.wifi.proto.WifiScoreCardProto; + import org.junit.Before; import org.junit.Test; import org.mockito.MockitoAnnotations; /** - * Unit tests for {@link com.android.server.wifi.WifiScoreCardProto}. + * Unit tests for {@link com.android.server.wifi.proto.WifiScoreCardProto}. */ @SmallTest public class WifiScoreCardProtoTest extends WifiBaseTest { diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java index b78b248fa..69ef041d3 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java @@ -29,11 +29,11 @@ import android.util.Pair; import androidx.test.filters.SmallTest; -import com.android.server.wifi.WifiScoreCardProto.AccessPoint; -import com.android.server.wifi.WifiScoreCardProto.Event; -import com.android.server.wifi.WifiScoreCardProto.Network; -import com.android.server.wifi.WifiScoreCardProto.NetworkList; -import com.android.server.wifi.WifiScoreCardProto.Signal; +import com.android.server.wifi.proto.WifiScoreCardProto.AccessPoint; +import com.android.server.wifi.proto.WifiScoreCardProto.Event; +import com.android.server.wifi.proto.WifiScoreCardProto.Network; +import com.android.server.wifi.proto.WifiScoreCardProto.NetworkList; +import com.android.server.wifi.proto.WifiScoreCardProto.Signal; import com.android.server.wifi.util.IntHistogram; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java index a27b141a1..760a9a2d4 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java @@ -24,7 +24,7 @@ import static junit.framework.Assert.assertTrue; import androidx.test.filters.SmallTest; -import com.android.server.wifi.nano.WifiMetricsProto.WifiWakeStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiWakeStats; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java index 47772bd7e..65edbbb79 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java @@ -34,7 +34,7 @@ import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import com.android.server.wifi.util.MetricsUtils; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMetricsTest.java index bc69ec68a..bbfbd37b1 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMetricsTest.java @@ -25,9 +25,9 @@ import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto.GroupEvent; -import com.android.server.wifi.nano.WifiMetricsProto.P2pConnectionEvent; -import com.android.server.wifi.nano.WifiMetricsProto.WifiP2pStats; +import com.android.server.wifi.proto.nano.WifiMetricsProto.GroupEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.P2pConnectionEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiP2pStats; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pServiceImplTest.java index 52439e42e..483b60686 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pServiceImplTest.java @@ -80,7 +80,7 @@ import com.android.server.wifi.FrameworkFacade; import com.android.server.wifi.HalDeviceManager; import com.android.server.wifi.WifiBaseTest; import com.android.server.wifi.WifiInjector; -import com.android.server.wifi.nano.WifiMetricsProto.P2pConnectionEvent; +import com.android.server.wifi.proto.nano.WifiMetricsProto.P2pConnectionEvent; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java index 9dfd6586d..a989f0903 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java @@ -30,7 +30,7 @@ import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import org.junit.Before; import org.junit.Rule; diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java index 7f456482b..76f8b0f63 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java @@ -75,7 +75,7 @@ import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.FrameworkFacade; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import com.android.server.wifi.util.WifiPermissionsUtil; import org.junit.After; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java index 3de22ceb0..397c61d2d 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -89,8 +89,8 @@ import com.android.server.wifi.WifiMetrics; import com.android.server.wifi.WifiNative; import com.android.server.wifi.WifiPowerMetrics; import com.android.server.wifi.aware.WifiAwareMetrics; -import com.android.server.wifi.nano.WifiMetricsProto; import com.android.server.wifi.p2p.WifiP2pMetrics; +import com.android.server.wifi.proto.nano.WifiMetricsProto; import com.android.server.wifi.rtt.RttMetrics; import com.android.server.wifi.util.WifiAsyncChannel; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/util/IntCounterTest.java b/tests/wifitests/src/com/android/server/wifi/util/IntCounterTest.java index d82f07334..e3029ea57 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/IntCounterTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/IntCounterTest.java @@ -22,7 +22,7 @@ import static com.android.server.wifi.WifiMetricsTestUtil.buildInt32Count; import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto.Int32Count; +import com.android.server.wifi.proto.nano.WifiMetricsProto.Int32Count; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/IntHistogramTest.java b/tests/wifitests/src/com/android/server/wifi/util/IntHistogramTest.java index 888b5f2ac..9e291af16 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/IntHistogramTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/IntHistogramTest.java @@ -24,7 +24,7 @@ import static org.hamcrest.core.IsEqual.equalTo; import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiBaseTest; -import com.android.server.wifi.nano.WifiMetricsProto.HistogramBucketInt32; +import com.android.server.wifi.proto.nano.WifiMetricsProto.HistogramBucketInt32; import org.junit.Before; import org.junit.Rule; |