diff options
Diffstat (limited to 'tests/CoreTests')
3 files changed, 36 insertions, 24 deletions
diff --git a/tests/CoreTests/android/location/LocationManagerProximityTest.java b/tests/CoreTests/android/location/LocationManagerProximityTest.java index 3f43bcf..e82d878 100644 --- a/tests/CoreTests/android/location/LocationManagerProximityTest.java +++ b/tests/CoreTests/android/location/LocationManagerProximityTest.java @@ -26,6 +26,7 @@ import android.location.LocationManager; import android.provider.Settings; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.Suppress; import android.util.Log; /** @@ -37,9 +38,11 @@ import android.util.Log; * adb shell am instrument -e class android.location.LocationManagerProximityTest \ * -w android.core/android.test.InstrumentationTestRunner * - * This test requires that the "Allow mock locations" setting be enabled + * This test requires that the "Allow mock locations" setting be enabled. + * To ensure reliable results, all location providers should be disabled. * */ +@Suppress @MediumTest public class LocationManagerProximityTest extends AndroidTestCase { diff --git a/tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java b/tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java index 5df8991..e2336f8 100644 --- a/tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java +++ b/tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java @@ -28,18 +28,20 @@ public class GsmAlphabetTest extends TestCase { @SmallTest public void test7bitWithHeader() throws Exception { - byte[] data = new byte[3]; - data[0] = (byte) 1; - data[1] = (byte) 2; - data[2] = (byte) 2; + SmsHeader.ConcatRef concatRef = new SmsHeader.ConcatRef(); + concatRef.refNumber = 1; + concatRef.seqNumber = 2; + concatRef.msgCount = 2; + concatRef.isEightBits = true; SmsHeader header = new SmsHeader(); - header.add(new SmsHeader.Element(SmsHeader.CONCATENATED_8_BIT_REFERENCE, data)); + header.concatRef = concatRef; - String message = "aaaaaaaaaabbbbbbbbbbcccccccccc"; - byte[] userData = GsmAlphabet.stringToGsm7BitPackedWithHeader(message, header.toByteArray()); + String message = "aaaaaaaaaabbbbbbbbbbcccccccccc"; + byte[] userData = GsmAlphabet.stringToGsm7BitPackedWithHeader(message, + SmsHeader.toByteArray(header)); int septetCount = GsmAlphabet.countGsmSeptets(message, false); String parsedMessage = GsmAlphabet.gsm7BitPackedToString( - userData, header.toByteArray().length+1, septetCount, 1); + userData, SmsHeader.toByteArray(header).length+1, septetCount, 1); assertEquals(message, parsedMessage); } @@ -306,4 +308,3 @@ public class GsmAlphabetTest extends TestCase { GsmAlphabet.gsm8BitUnpackedToString(unpacked, 1, unpacked.length - 1)); } } - diff --git a/tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java b/tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java index 5d5d1f9..8a66614 100644 --- a/tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java +++ b/tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java @@ -34,35 +34,38 @@ public class SMSDispatcherTest extends AndroidTestCase { public void testCMT1() throws Exception { SmsMessage sms; SmsHeader header; - Iterator<SmsHeader.Element> elements; String[] lines = new String[2]; - - lines[0] = "+CMT: ,158"; + + lines[0] = "+CMT: ,158"; lines[1] = "07914140279510F6440A8111110301003BF56080426101748A8C0B05040B" + "8423F000035502010106276170706C69636174696F6E2F766E642E776170" + "2E6D6D732D6D65737361676500AF848D0185B4848C8298524F347839776F" + "7547514D4141424C3641414141536741415A4B554141414141008D908918" + "802B31363530323438363137392F545950453D504C4D4E008A808E028000" + "88058103093A8083687474703A2F2F36"; - + sms = SmsMessage.newFromCMT(lines); header = sms.getUserDataHeader(); assertNotNull(header); assertNotNull(sms.getUserData()); - - elements = header.getElements().iterator(); - assertNotNull(elements); + assertNotNull(header.concatRef); + assertEquals(header.concatRef.refNumber, 85); + assertEquals(header.concatRef.msgCount, 2); + assertEquals(header.concatRef.seqNumber, 1); + assertEquals(header.concatRef.isEightBits, true); + assertNotNull(header.portAddrs); + assertEquals(header.portAddrs.destPort, 2948); + assertEquals(header.portAddrs.origPort, 9200); + assertEquals(header.portAddrs.areEightBits, false); } - + @MediumTest public void testCMT2() throws Exception { SmsMessage sms; SmsHeader header; - Iterator<SmsHeader.Element> elements; String[] lines = new String[2]; - lines[0] = "+CMT: ,77"; lines[1] = "07914140279510F6440A8111110301003BF56080426101848A3B0B05040B8423F" @@ -71,12 +74,17 @@ public class SMSDispatcherTest extends AndroidTestCase { sms = SmsMessage.newFromCMT(lines); header = sms.getUserDataHeader(); - System.out.println("header = " + header); assertNotNull(header); assertNotNull(sms.getUserData()); - - elements = header.getElements().iterator(); - assertNotNull(elements); + assertNotNull(header.concatRef); + assertEquals(header.concatRef.refNumber, 85); + assertEquals(header.concatRef.msgCount, 2); + assertEquals(header.concatRef.seqNumber, 2); + assertEquals(header.concatRef.isEightBits, true); + assertNotNull(header.portAddrs); + assertEquals(header.portAddrs.destPort, 2948); + assertEquals(header.portAddrs.origPort, 9200); + assertEquals(header.portAddrs.areEightBits, false); } @MediumTest |