From fc7a74d73da37a6de47b2d985fa6b5622fa6536b Mon Sep 17 00:00:00 2001 From: "xy.qian" Date: Tue, 21 Mar 2017 10:31:14 +0800 Subject: [PATCH] [common][tct-time-tizen-tests][update tc to fix issue] Change-Id: I000f4f9e85f2c351462337847868f45c180cb394 Signed-off-by: xy.qian --- .../time/TimeUtil_getDateFormat.html | 2 +- .../time/support/time_common.js | 72 ++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/common/tct-time-tizen-tests/time/TimeUtil_getDateFormat.html b/common/tct-time-tizen-tests/time/TimeUtil_getDateFormat.html index b653599b0..276783812 100755 --- a/common/tct-time-tizen-tests/time/TimeUtil_getDateFormat.html +++ b/common/tct-time-tizen-tests/time/TimeUtil_getDateFormat.html @@ -41,7 +41,7 @@ test(function () { var returnedValue, shortformat = true; returnedValue = tizen.time.getDateFormat(shortformat); assert_type(returnedValue, "string", "Timezone type"); - assert_equals(returnedValue, DATE_FORMAT, "Date format"); + assert_equals(returnedValue, getShortDateFormat(DATE_FORMAT), "Date format"); }, document.title); diff --git a/common/tct-time-tizen-tests/time/support/time_common.js b/common/tct-time-tizen-tests/time/support/time_common.js index d3ffa2788..35107f4ff 100755 --- a/common/tct-time-tizen-tests/time/support/time_common.js +++ b/common/tct-time-tizen-tests/time/support/time_common.js @@ -69,12 +69,78 @@ var invalidArgument = [ function () {} ]; +function getExpectedLocaleString (dateformat) { + var i = 0, resultString = ""; + for (i = 0; i < dateformat.length; i++) { + if (dateformat.charAt(i) == "D") + resultString += "Friday"; + else if (dateformat.charAt(i) == "y") + resultString += "2011"; + else if (dateformat.charAt(i) == "d") + resultString += "11"; + else if (dateformat.charAt(i) == "m") + resultString += "11"; + else if (dateformat.charAt(i) == "M") + resultString += "November"; + else if (dateformat.charAt(i) == " ") + resultString += " "; + else if (dateformat.charAt(i) == ",") + resultString += ","; + else { + assert_unreached("Wrong time format."); + } + } + return [resultString+", 4:55:54 a.m.", resultString+" 4:55:54 a.m."]; +} + +function getExpectedLocaleDateString (dateformat) { + var i = 0, resultString = ""; + for (i = 0; i < dateformat.length; i++) { + if (dateformat.charAt(i) == "D") + resultString += "Friday"; + else if (dateformat.charAt(i) == "y") + resultString += "2011"; + else if (dateformat.charAt(i) == "d") + resultString += "11"; + else if (dateformat.charAt(i) == "m") + resultString += "11"; + else if (dateformat.charAt(i) == "M") + resultString += "November"; + else if (dateformat.charAt(i) == " ") + resultString += " "; + else if (dateformat.charAt(i) == ",") + resultString += ","; + else { + assert_unreached("Wrong time format."); + } + } + return resultString; +} + +function getShortDateFormat (dateformat) { + var i = 0, resultString = ""; + for (i = 0; i < dateformat.length; i++) { + if (dateformat.charAt(i) == "D" || dateformat.charAt(i) == " " || dateformat.charAt(i) == ",") + resultString += ""; + else if (dateformat.charAt(i) == "y") + resultString += "y/"; + else if (dateformat.charAt(i) == "d") + resultString += "d/"; + else if (dateformat.charAt(i) == "m" || dateformat.charAt(i) == "M") + resultString += "m/"; + else { + assert_unreached("Wrong time format."); + } + } + return resultString.slice(0, 5); +} + + var testAdditionalParamArray = [ERROR_NUM, null, undefined]; var DATE_FORMAT = "D, d M y"; // this variable MUST be set before executing tests var TIME_FORMAT = "h:m:s ap"; // this variable MUST be set before executing tests -// change Major and Minor channel -document.write(''); +// change date and time format +document.write(''); document.write(''); - -- 2.34.1