From 8ca4ac971a9b862fbd69c57af3a3c0029a6b9f4d Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Fri, 18 Nov 2016 10:05:10 -0800 Subject: hotspot2: anqp: update package name to reflect the updated location Bug: 33000864 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: If842197a027a2c8381aacf5b256191f81bcbd1bb --- .../src/com/android/server/wifi/hotspot2/AnqpCacheTest.java | 9 ++++++--- .../android/server/wifi/hotspot2/PasspointEventHandlerTest.java | 2 +- .../src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java | 2 +- .../android/server/wifi/hotspot2/anqp/VenueNameElementTest.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java index 9b06d1305..b46c05c36 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.wifi; +package com.android.server.wifi.hotspot2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,11 +27,14 @@ import android.net.wifi.WifiSsid; import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; -import com.android.server.wifi.anqp.ANQPElement; -import com.android.server.wifi.anqp.Constants; +import com.android.server.wifi.Clock; +import com.android.server.wifi.hotspot2.anqp.ANQPElement; +import com.android.server.wifi.hotspot2.anqp.Constants; import com.android.server.wifi.hotspot2.ANQPData; import com.android.server.wifi.hotspot2.AnqpCache; import com.android.server.wifi.hotspot2.NetworkDetail; +import com.android.server.wifi.ScanDetail; +import com.android.server.wifi.ScanResults; import org.junit.Test; import org.mockito.Mock; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java index 88e02f8d5..3e6fa1407 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java @@ -26,7 +26,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.test.suitebuilder.annotation.SmallTest; import com.android.server.wifi.WifiNative; -import com.android.server.wifi.anqp.Constants; +import com.android.server.wifi.hotspot2.anqp.Constants; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java index fb6f63729..29b196230 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.wifi.anqp; +package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.*; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java index ff80e4b09..90c3d25be 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.wifi.anqp; +package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.*; -- cgit v1.2.3