From 8f35fbf25b880db5e3ac95bc15dfa2a509e32f9d Mon Sep 17 00:00:00 2001 From: "heeju.joo" Date: Mon, 8 Apr 2013 16:53:59 +0900 Subject: [PATCH] UnitTC: tizen winset unit tc bugs have been fixed button-tests.js: if-else statement have been added (line 33) collapsible-tests.js: expected result have been modified (line 15,16) slider-tests.js: equal assertion have been changed with ok (line 37,42) Change-Id: Ie9b1a924f65746dc5ff67f60f06f29376f1bc0a5 --- tests/unit-tests/button/button-tests.js | 15 +++++++++------ tests/unit-tests/collapsible/collapsible-tests.js | 4 ++-- tests/unit-tests/slider/slider-tests.js | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/unit-tests/button/button-tests.js b/tests/unit-tests/button/button-tests.js index d2ec533..839d963 100644 --- a/tests/unit-tests/button/button-tests.js +++ b/tests/unit-tests/button/button-tests.js @@ -8,7 +8,7 @@ $( "#checkboxpage" ).live( "pageinit", function ( event ) { module( "button" ); - var unit_button = function ( widget, type ) { + var unit_button = function ( widget, type, text ) { var buttonClassPrefix = "ui-btn", buttonText = type, icon, @@ -30,8 +30,11 @@ $( "#checkboxpage" ).live( "pageinit", function ( event ) { // Text Trim, Cause jQueryMobile(JQM) 1.1 forced to add - "\u00a0" in buttonIcon(ButtonMarkup) // JQM 1.1 buttonMarkup code : // - if( buttonIcon ) buttonIcon.appendChild( document.createTextNode( "\u00a0" ) ); - equal( widget.text().trim() , buttonText , "Button Text" ); - + if ( buttonText == "" ) { + equal( widget.text().trim() , text , "Button Text icon only" ); + } else { + equal( widget.text().trim() , buttonText , "Button Text" ); + } icon = widget.jqmData("icon"); if ( icon !== undefined ) { ok( widget.children().children().hasClass("ui-icon-" + icon ) , "Style - Button Icon" ); @@ -87,15 +90,15 @@ $( "#checkboxpage" ).live( "pageinit", function ( event ) { }); test ( "Button - Inline, Only Icon(Reveal)" , function () { - unit_button( $("#button-4"), "Non Text Button" ); + unit_button( $("#button-4"), "Non Text Button", "reveal" ); }); test ( "Button - Inline, Only Icon(Send), circle" , function () { - unit_button( $("#button-5"), "Non Text Button" ); + unit_button( $("#button-5"), "Non Text Button", "send" ); }); test ( "Button - Inline, Only Icon(Favorite), nobackground" , function () { - unit_button( $("#button-6"), "Non Text Button" ); + unit_button( $("#button-6"), "Non Text Button", "favorite" ); }); }); diff --git a/tests/unit-tests/collapsible/collapsible-tests.js b/tests/unit-tests/collapsible/collapsible-tests.js index 4a179d8..f2e9ca0 100644 --- a/tests/unit-tests/collapsible/collapsible-tests.js +++ b/tests/unit-tests/collapsible/collapsible-tests.js @@ -12,8 +12,8 @@ ok( created_collapse, "Create" ); /* Check Option */ - equal( obj_collapse.options.expandCueText, " click to expand contents", "Collapsed test -> expandCueText" ); - equal( obj_collapse.options.collapseCueText, " click to collapse contents", "Collapsed test -> collapseCueText" ); + equal( obj_collapse.options.expandCueText, " Expandable list, tap to open list", "Collapsed test -> expandCueText" ); + equal( obj_collapse.options.collapseCueText, " Expandable list, tap to close list", "Collapsed test -> collapseCueText" ); equal( obj_collapse.options.collapsed, true, "Collapsed test -> collapsed" ); equal( obj_collapse.options.heading, "h1,h2,h3,h4,h5,h6,legend,li", "Collapsed test -> heading" ); equal( obj_collapse.options.theme, 's', "Collapsed test -> theme" ); diff --git a/tests/unit-tests/slider/slider-tests.js b/tests/unit-tests/slider/slider-tests.js index 535b626..392bd8c 100644 --- a/tests/unit-tests/slider/slider-tests.js +++ b/tests/unit-tests/slider/slider-tests.js @@ -34,12 +34,12 @@ equal( handle.attr("aria-valuemin"), widget.attr("min"), "Paramter: min" ); equal( handle.attr("aria-valuemax"), widget.attr("max"), "Paramter: max" ); - equal( parseInt( handle.css("left") ), handle_left( widget, slider ), "Handle Location: Default" ); + ok( Math.abs(parseInt( handle.css("left") ) - handle_left( widget, slider ) ) <= 1, "Handle Location: Default" ); /* Check APIs */ widget.val( random_move(widget.attr("min"), widget.attr("max")) ); widget.trigger("change"); - equal( parseInt( handle.css("left") ), handle_left( widget, slider ), "Handle Location: Moved" ); + ok( Math.abs(parseInt( handle.css("left") ) - handle_left( widget, slider ) ) <= 1, "Handle Location: Moved" ); }; test( "normal slider", function () { -- 2.7.4