From 0fcf2097e7e217319b625d5dfc24aded06c02227 Mon Sep 17 00:00:00 2001 From: Johan Redestig Date: Thu, 30 Aug 2012 13:53:10 +0200 Subject: WspTypeDecoder: fixed decoding of content parameters The removed condition prevented any parameter to have 0 as integer value. Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89 --- .../telephony/Wap230WspContentTypeTest.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'tests/telephonytests') diff --git a/tests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java b/tests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java index d31b294..9c2b7ef 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java @@ -623,6 +623,26 @@ public class Wap230WspContentTypeTest extends TestCase { } + public void testTypedParamWellKnownShortIntegerCompactIntegerValue_0() { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + out.write(0x3); + out.write(SHORT_MIME_TYPE_ROLLOVER_CERTIFICATE | WSP_SHORT_INTEGER_MASK); + out.write(TYPED_PARAM_SEC | WSP_SHORT_INTEGER_MASK); + out.write(0x00 | WSP_SHORT_INTEGER_MASK); + + WspTypeDecoder unit = new WspTypeDecoder(out.toByteArray()); + assertTrue(unit.decodeContentType(0)); + + String mimeType = unit.getValueString(); + + assertEquals(STRING_MIME_TYPE_ROLLOVER_CERTIFICATE, mimeType); + assertEquals(0x3F, unit.getValue32()); + assertEquals(4, unit.getDecodedDataLength()); + + Map params = unit.getContentParameters(); + assertEquals("0", params.get("SEC")); + } + public void testTypedParamWellKnownShortIntegerMultipleParameters() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -850,4 +870,4 @@ public class Wap230WspContentTypeTest extends TestCase { WspTypeDecoder unit = new WspTypeDecoder(out.toByteArray()); assertFalse(unit.decodeContentType(0)); } -} \ No newline at end of file +} -- cgit v1.1