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

Commit e8eb4862 authored by Jack Yu's avatar Jack Yu
Browse files

Moved data related unit test cases to the sub dir. 

bug: 25691379
Change-Id: I2477dd0a16fbbac8ff79f864f0fd59f86e758b18
parent ecac744a

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

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

 */



package com.android.internal.telephony;

package com.android.internal.telephony.dataconnection;



import android.test.suitebuilder.annotation.SmallTest;

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

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

 */



package com.android.internal.telephony;

package com.android.internal.telephony.dataconnection;



import android.net.LinkProperties;

import android.os.AsyncResult;
@@ -22,12 +22,10 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.internal.telephony.dataconnection.ApnContext;

import com.android.internal.telephony.dataconnection.DataCallResponse;

import com.android.internal.telephony.dataconnection.DataConnection;

import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;

import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;

import com.android.internal.telephony.dataconnection.DcController;

import com.android.internal.util.IState;

import com.android.internal.util.StateMachine;

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

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

 */



package com.android.internal.telephony;

package com.android.internal.telephony.dataconnection;



import android.app.AlarmManager;

import android.app.PendingIntent;
@@ -34,8 +34,12 @@ import android.test.mock.MockContentProvider; 
import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.MediumTest;



import com.android.internal.telephony.dataconnection.DataCallResponse;

import com.android.internal.telephony.dataconnection.DcTracker;

import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.TelephonyTest;



import org.junit.After;

import org.junit.Before;

tests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java→tests/telephonytests/src/com/android/internal/telephony/dataconnection/RetryManagerTest.java

+5 −3
Original line number Diff line number Diff line
@@ -14,13 +14,15 @@ 
 * limitations under the License.

 */



package com.android.internal.telephony;

package com.android.internal.telephony.dataconnection;



import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.internal.telephony.dataconnection.ApnSetting;

import com.android.internal.telephony.RetryManager;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.uicc.UiccController;



import org.junit.After;
@@ -35,7 +37,7 @@ import static org.junit.Assert.assertTrue; 
/**

 * APN retry manager tests

 */

public class TelephonyUtilsTest extends TelephonyTest {

public class RetryManagerTest extends TelephonyTest {



    // This is the real APN data for the Japanese carrier NTT Docomo.

    private ApnSetting mApn1 = new ApnSetting(