diff options
Diffstat (limited to 'tests/CoreTests')
4 files changed, 21 insertions, 15 deletions
diff --git a/tests/CoreTests/android/content/SyncStorageEngineTest.java b/tests/CoreTests/android/content/SyncStorageEngineTest.java index dee6e38..533338e 100644 --- a/tests/CoreTests/android/content/SyncStorageEngineTest.java +++ b/tests/CoreTests/android/content/SyncStorageEngineTest.java @@ -20,6 +20,7 @@ import android.test.AndroidTestCase; import android.test.RenamingDelegatingContext; import android.test.mock.MockContext; import android.test.mock.MockContentResolver; +import android.accounts.Account; public class SyncStorageEngineTest extends AndroidTestCase { @@ -28,7 +29,7 @@ public class SyncStorageEngineTest extends AndroidTestCase { * correcponding sync is finished. This can happen if the clock changes while we are syncing. */ public void testPurgeActiveSync() throws Exception { - final String account = "a@example.com"; + final Account account = new Account("a@example.com", "example.type"); final String authority = "testprovider"; MockContentResolver mockResolver = new MockContentResolver(); diff --git a/tests/CoreTests/android/core/RequestAPITest.java b/tests/CoreTests/android/core/RequestAPITest.java index d89f5ae..94eb23e 100644 --- a/tests/CoreTests/android/core/RequestAPITest.java +++ b/tests/CoreTests/android/core/RequestAPITest.java @@ -72,7 +72,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { RequestHandle handle = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", headers, null, - null, 0, false); + null, 0); handle.waitUntilComplete(); fail("expected exception not thrown"); @@ -121,7 +121,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { mTestWebServer.setKeepAlive(false); RequestHandle handle = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", headers, null, - null, 0, false); + null, 0); handle.waitUntilComplete(); } @@ -197,7 +197,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { RequestHandle handle = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", null, testEventHandler, - null, 0, false); + null, 0); Log.d(LOGTAG, "testGet - sent request. Waiting"); handle.waitUntilComplete(); @@ -231,11 +231,11 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { RequestHandle handle0 = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", null, testEventHandler, - null, 0, false); + null, 0); handle0.waitUntilComplete(); RequestHandle handle1 = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", null, testEventHandler2, - null, 0, false); + null, 0); handle1.waitUntilComplete(); /* It's not correct to use same listener for multiple @@ -270,7 +270,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { RequestHandle handle = mRequestQueue.queueRequest( "http://localhost:8080/test1", "HEAD", null, testEventHandler, - null, 0, false); + null, 0); Log.d(LOGTAG, "testHead - sent request waiting"); handle.waitUntilComplete(); @@ -297,7 +297,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { RequestHandle handle = mRequestQueue.queueRequest( "http://localhost:8080/test1", "GET", null, testEventHandler, - null, 0, false); + null, 0); Log.d(LOGTAG, "testChunked - sent request waiting"); handle.waitUntilComplete(); @@ -330,7 +330,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { Log.d(LOGTAG, testName + " start - rq = " + mRequestQueue); RequestHandle requestHandle = mRequestQueue.queueRequest( - "http://localhost:8080/test1", "GET", null, testEventHandler, null, 0, false); + "http://localhost:8080/test1", "GET", null, testEventHandler, null, 0); Log.d(LOGTAG, testName + " - sent request waiting"); requestHandle.waitUntilComplete(); @@ -398,10 +398,10 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { leh2.expectHeaders(); RequestHandle handle0 = mRequestQueue.queueRequest( - "http://localhost:8080/test1", "GET", null, testEventHandler, null, 0, false); + "http://localhost:8080/test1", "GET", null, testEventHandler, null, 0); handle0.waitUntilComplete(); RequestHandle handle1 = mRequestQueue.queueRequest( - "http://localhost:8080/test1", "HEAD", null, testEventHandler, null, 0, false); + "http://localhost:8080/test1", "HEAD", null, testEventHandler, null, 0); Log.d(LOGTAG, "testGetAndHead - sent request. Waiting"); handle1.waitUntilComplete(); @@ -432,7 +432,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { Log.d(LOGTAG, "testPost start - rq = " + mRequestQueue); RequestHandle handle = mRequestQueue.queueRequest( - "http://localhost:8080/test1", "POST", null, testEventHandler, null, 0, false); + "http://localhost:8080/test1", "POST", null, testEventHandler, null, 0); Log.d(LOGTAG, "testPost - sent request waiting"); handle.waitUntilComplete(); @@ -470,7 +470,7 @@ public class RequestAPITest extends AndroidTestCase implements HttpConstants { InputStream bodyProvider = new ByteArrayInputStream(mBody.getBytes()); RequestHandle handle = mRequestQueue.queueRequest( - "http://localhost:8080/test1", "POST", null, testEventHandler, bodyProvider, bodyLength, false); + "http://localhost:8080/test1", "POST", null, testEventHandler, bodyProvider, bodyLength); Log.d(LOGTAG, "testPostWithData - sent request waiting"); handle.waitUntilComplete(); diff --git a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java index 577d384..ff73b32 100644 --- a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java +++ b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java @@ -309,6 +309,11 @@ public class PhoneNumberUtilsTest extends TestCase { number.append("800-55512"); PhoneNumberUtils.formatNanpNumber(number); assertEquals("800-555-12", number.toString()); + + number.clear(); + number.append("46645"); + PhoneNumberUtils.formatNanpNumber(number); + assertEquals("46645", number.toString()); } @SmallTest diff --git a/tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java b/tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java index 7107412..b96743a 100644 --- a/tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java +++ b/tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java @@ -81,7 +81,7 @@ public class GSMPhoneTest extends AndroidTestCase implements PerformanceTestCase mRadioControl = mGSMTestHandler.getSimulatedCommands(); mHandler = mGSMTestHandler.getHandler(); - mGSMPhone.registerForPhoneStateChanged(mHandler, EVENT_PHONE_STATE_CHANGED, null); + mGSMPhone.registerForPreciseCallStateChanged(mHandler, EVENT_PHONE_STATE_CHANGED, null); mGSMPhone.registerForNewRingingConnection(mHandler, EVENT_RINGING, null); mGSMPhone.registerForDisconnect(mHandler, EVENT_DISCONNECT, null); @@ -109,7 +109,7 @@ public class GSMPhoneTest extends AndroidTestCase implements PerformanceTestCase protected void tearDown() throws Exception { mRadioControl.shutdown(); - mGSMPhone.unregisterForPhoneStateChanged(mHandler); + mGSMPhone.unregisterForPreciseCallStateChanged(mHandler); mGSMPhone.unregisterForNewRingingConnection(mHandler); mGSMPhone.unregisterForDisconnect(mHandler); mGSMPhone.setOnPostDialCharacter(mHandler, 0, null); |