From 3b389e686816762a685825d285be8213a2249e06 Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Fri, 30 Jan 2015 13:41:34 +0800 Subject: [PATCH] Bug 1126687 - Part 2: Modify Test Cases Accordingly. r=echen. --- dom/system/gonk/tests/test_ril_worker_stk.js | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dom/system/gonk/tests/test_ril_worker_stk.js b/dom/system/gonk/tests/test_ril_worker_stk.js index 952a6c28ab7e..bbc70a767a2d 100644 --- a/dom/system/gonk/tests/test_ril_worker_stk.js +++ b/dom/system/gonk/tests/test_ril_worker_stk.js @@ -1419,6 +1419,12 @@ add_test(function test_stk_event_download_location_status() { // TLV_LOCATION_INFO_GSM_SIZE(9) do_check_eq(pduHelper.readHexOctet(), 19); + // Event List, Type-Length-Value + do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | + COMPREHENSIONTLV_FLAG_CR); + do_check_eq(pduHelper.readHexOctet(), 1); + do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LOCATION_STATUS); + // Device Identifies, Type-Length-Value(Source ID-Destination ID) do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID | COMPREHENSIONTLV_FLAG_CR); @@ -1426,12 +1432,6 @@ add_test(function test_stk_event_download_location_status() { do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME); do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM); - // Event List, Type-Length-Value - do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | - COMPREHENSIONTLV_FLAG_CR); - do_check_eq(pduHelper.readHexOctet(), 1); - do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LOCATION_STATUS); - // Location Status, Type-Length-Value do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LOCATION_STATUS | COMPREHENSIONTLV_FLAG_CR); @@ -1501,6 +1501,12 @@ add_test(function test_stk_event_download_language_selection() { // TLV_LANGUAGE(4) do_check_eq(pduHelper.readHexOctet(), 11); + // Event List, Type-Length-Value + do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | + COMPREHENSIONTLV_FLAG_CR); + do_check_eq(pduHelper.readHexOctet(), 1); + do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LANGUAGE_SELECTION); + // Device Identifies, Type-Length-Value(Source ID-Destination ID) do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID | COMPREHENSIONTLV_FLAG_CR); @@ -1508,12 +1514,6 @@ add_test(function test_stk_event_download_language_selection() { do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME); do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM); - // Event List, Type-Length-Value - do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | - COMPREHENSIONTLV_FLAG_CR); - do_check_eq(pduHelper.readHexOctet(), 1); - do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LANGUAGE_SELECTION); - // Language, Type-Length-Value do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LANGUAGE); do_check_eq(pduHelper.readHexOctet(), 2); @@ -1556,6 +1556,12 @@ add_test(function test_stk_event_download_user_activity() { // BER length, 7 = TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3) do_check_eq(pduHelper.readHexOctet(), 7); + // Event List, Type-Length-Value + do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | + COMPREHENSIONTLV_FLAG_CR); + do_check_eq(pduHelper.readHexOctet(), 1); + do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_USER_ACTIVITY); + // Device Identities, Type-Length-Value(Source ID-Destination ID) do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID | COMPREHENSIONTLV_FLAG_CR); @@ -1563,12 +1569,6 @@ add_test(function test_stk_event_download_user_activity() { do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME); do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM); - // Event List, Type-Length-Value - do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | - COMPREHENSIONTLV_FLAG_CR); - do_check_eq(pduHelper.readHexOctet(), 1); - do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_USER_ACTIVITY); - run_next_test(); }; @@ -1605,6 +1605,12 @@ add_test(function test_stk_event_download_idle_screen_available() { // BER length, 7 = TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3) do_check_eq(pduHelper.readHexOctet(), 7); + // Event List, Type-Length-Value + do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | + COMPREHENSIONTLV_FLAG_CR); + do_check_eq(pduHelper.readHexOctet(), 1); + do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_IDLE_SCREEN_AVAILABLE); + // Device Identities, Type-Length-Value(Source ID-Destination ID) do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID | COMPREHENSIONTLV_FLAG_CR); @@ -1612,12 +1618,6 @@ add_test(function test_stk_event_download_idle_screen_available() { do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_DISPLAY); do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM); - // Event List, Type-Length-Value - do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | - COMPREHENSIONTLV_FLAG_CR); - do_check_eq(pduHelper.readHexOctet(), 1); - do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_IDLE_SCREEN_AVAILABLE); - run_next_test(); }; @@ -1656,6 +1656,12 @@ add_test(function test_stk_event_download_browser_termination() { // ++TLV_BROWSER_TERMINATION_CAUSE(3) do_check_eq(pduHelper.readHexOctet(), 10); + // Event List, Type-Length-Value + do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | + COMPREHENSIONTLV_FLAG_CR); + do_check_eq(pduHelper.readHexOctet(), 1); + do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_BROWSER_TERMINATION); + // Device Identities, Type-Length-Value(Source ID-Destination ID) do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID | COMPREHENSIONTLV_FLAG_CR); @@ -1663,12 +1669,6 @@ add_test(function test_stk_event_download_browser_termination() { do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME); do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM); - // Event List, Type-Length-Value - do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST | - COMPREHENSIONTLV_FLAG_CR); - do_check_eq(pduHelper.readHexOctet(), 1); - do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_BROWSER_TERMINATION); - // Browser Termination Case, Type-Length-Value do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_BROWSER_TERMINATION_CAUSE | COMPREHENSIONTLV_FLAG_CR);