Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcbe5e16 authored Jan 07, 2022 by Jack Yu

Migrated unit test cases

Migrated telephony data unit tests to the new
package com.android.internal.telephony.data

Fix: 213586371
Test: atest FrameworksTelephonyTests
Merged-In: I8cf90be437ff7ed886b059eaa5cb71785a50c8d2
Change-Id: I8cf90be437ff7ed886b059eaa5cb71785a50c8d2

parent a74f7c42

tests/telephonytests/src/com/android/internal/telephony/dataconnection/AccessNetworksManagerTest.java→tests/telephonytests/src/com/android/internal/telephony/data/AccessNetworksManagerTest.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.internal.telephony.dataconnection;		package com.android.internal.telephony.data;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;

	@@ -38,7 +38,6 @@ import android.testing.AndroidTestingRunner;
	import android.testing.TestableLooper;		import android.testing.TestableLooper;

	import com.android.internal.telephony.TelephonyTest;		import com.android.internal.telephony.TelephonyTest;
	import com.android.internal.telephony.data.AccessNetworksManager;

	import org.junit.After;		import org.junit.After;
	import org.junit.Before;		import org.junit.Before;

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataCallResponseTest.java→tests/telephonytests/src/com/android/internal/telephony/data/DataCallResponseTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.internal.telephony.dataconnection;		package com.android.internal.telephony.data;

	import static com.android.internal.telephony.dataconnection.DcTrackerTest.FAKE_ADDRESS;		import static com.android.internal.telephony.dataconnection.DcTrackerTest.FAKE_ADDRESS;
	import static com.android.internal.telephony.dataconnection.DcTrackerTest.FAKE_DNS;		import static com.android.internal.telephony.dataconnection.DcTrackerTest.FAKE_DNS;

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataEnabledOverrideTest.java→tests/telephonytests/src/com/android/internal/telephony/data/DataEnabledOverrideTest.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.internal.telephony.dataconnection;		package com.android.internal.telephony.data;

	import static org.junit.Assert.assertEquals;		import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertFalse;		import static org.junit.Assert.assertFalse;
	@@ -28,7 +28,6 @@ import android.test.suitebuilder.annotation.SmallTest;

	import com.android.internal.telephony.PhoneConstants;		import com.android.internal.telephony.PhoneConstants;
	import com.android.internal.telephony.TelephonyTest;		import com.android.internal.telephony.TelephonyTest;
	import com.android.internal.telephony.data.DataEnabledOverride;

	import org.junit.After;		import org.junit.After;
	import org.junit.Before;		import org.junit.Before;

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataFailCauseTest.java→tests/telephonytests/src/com/android/internal/telephony/data/DataFailCauseTest.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.internal.telephony.dataconnection;		package com.android.internal.telephony.data;

	import static junit.framework.Assert.assertEquals;		import static junit.framework.Assert.assertEquals;
	import static junit.framework.Assert.assertFalse;		import static junit.framework.Assert.assertFalse;
	@@ -184,8 +184,8 @@ public class DataFailCauseTest extends TelephonyTest {
	for (int i = 0; i < 2; i++) {		for (int i = 0; i < 2; i++) {
	for (DcFailCauseData data : mFailCauseDataList) {		for (DcFailCauseData data : mFailCauseDataList) {
	if (DataFailCause.getFailCause(data.mCause) == (		if (DataFailCause.getFailCause(data.mCause) == (
	DataFailCause.SERVICE_OPTION_NOT_SUBSCRIBED) \|\|		DataFailCause.SERVICE_OPTION_NOT_SUBSCRIBED)
	DataFailCause.getFailCause(data.mCause) == (		\|\| DataFailCause.getFailCause(data.mCause) == (
	DataFailCause.TETHERED_CALL_ACTIVE)) {		DataFailCause.TETHERED_CALL_ACTIVE)) {
	assertTrue("cause = " + data.mCause,		assertTrue("cause = " + data.mCause,
	DataFailCause.isPermanentFailure(mContext,		DataFailCause.isPermanentFailure(mContext,