From 8bf33e9eb5344fedd540b8cc80c9d1567e1f67c4 Mon Sep 17 00:00:00 2001 From: Minkyeong Kim Date: Wed, 27 Mar 2013 13:40:42 +0900 Subject: [PATCH] Tokentextarea: Changes 'remove' tests to asyncTest Change-Id: I199eceae011afcac780ce8a8208c2cae49f8b077 --- .../widgets/jquery.mobile.tizen.tokentextarea.js | 10 +++--- .../tokentextarea/tokentextarea-tests.js | 42 ++++++++++++++-------- .../tokentextarea/tokentextarea-tests.js | 33 ++++++++++++----- 3 files changed, 56 insertions(+), 29 deletions(-) diff --git a/src/js/widgets/jquery.mobile.tizen.tokentextarea.js b/src/js/widgets/jquery.mobile.tizen.tokentextarea.js index 348e048..0b1edd8 100755 --- a/src/js/widgets/jquery.mobile.tizen.tokentextarea.js +++ b/src/js/widgets/jquery.mobile.tizen.tokentextarea.js @@ -433,7 +433,7 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { self._modifyInputBoxWidth(); textBlock.hide(); - textBlock.fadeIn( "fast", function() { + textBlock.fadeIn( "fast", function () { self._currentWidth += self._calcBlockWidth( textBlock ); $view.trigger( "add" ); }); @@ -449,7 +449,7 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { if ( lockBlock !== null && lockBlock.length > 0 ) { self._currentWidth -= self._calcBlockWidth( lockBlock ); - lockBlock.fadeOut( "fast", function() { + lockBlock.fadeOut( "fast", function () { lockBlock.remove(); self._modifyInputBoxWidth(); }); @@ -726,16 +726,16 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { } if ( arguments.length === 0 ) { - blocks.fadeOut( "fast", function() { + blocks.fadeOut( "fast", function () { blocks.remove(); self._modifyInputBoxWidth(); - this._trigger( "clear" ); + self._trigger( "clear" ); }); } else if ( !isNaN( position ) ) { // remove selected button index = ( ( position < blocks.length ) ? position : ( blocks.length - 1 ) ); - $( blocks[index] ).fadeOut( "fast", function() { + $( blocks[index] ).fadeOut( "fast", function () { $( blocks[index] ).remove(); self._modifyInputBoxWidth(); }); diff --git a/tests/additional-unit-tests/tokentextarea/tokentextarea-tests.js b/tests/additional-unit-tests/tokentextarea/tokentextarea-tests.js index 6ab53a8..12a087a 100755 --- a/tests/additional-unit-tests/tokentextarea/tokentextarea-tests.js +++ b/tests/additional-unit-tests/tokentextarea/tokentextarea-tests.js @@ -24,11 +24,11 @@ /*markup*/ equal( widget.jqmData('label'), options.lable, 'Property : data-label') ; - equal( widget.find('label.ui-tokentextarea-label').html( ), options.lable, 'Property : data-label') ; + equal( widget.find('span.ui-tokentextarea-label').html( ), options.lable, 'Property : data-label') ; equal( widget.jqmData('description'), options.description, 'Property : data-description') ; equal( widget.jqmData('link'), options.link, 'Property : data-link') ; equal( widget.find( "input" ).hasClass('ui-tokentextarea-input'), true, "Markup Check" ); - equal( widget.find( "label" ).hasClass('ui-tokentextarea-label'), true, "Markup Check" ); + equal( widget.find( "span" ).hasClass('ui-tokentextarea-label'), true, "Markup Check" ); equal( widget.find( "a" ).hasClass('ui-tokentextarea-link-base'), true, "Markup Check" ); equal( widget.find( "a" ).attr('href'), '#address', "Markup Check" ); @@ -48,7 +48,6 @@ /* Add */ tokentextarea.tokentextarea( "add", "string1" ); - //equal( addEvent, true, "Event : add" ) ; equal( tokentextarea.tokentextarea( "length" ), 1, "API : add('string1')" ); tokentextarea.tokentextarea( "add", "string2" ); equal( tokentextarea.tokentextarea( "length" ), 2, "API : add('string2')" ); @@ -59,7 +58,6 @@ /* Select */ tokentextarea.tokentextarea( "select", 1 ); - //equal( selectEvent, true, "Event : select" ) ; outputText = tokentextarea.tokentextarea( "select" ); equal( outputText, "string2", "API : select( 1 )" ); @@ -73,22 +71,36 @@ status = tokentextarea.hasClass( "ui-tokentextarea-focusin" ); equal( status, true, "API : focusIn" ); - /* Remove */ - tokentextarea.tokentextarea( "remove", 0 ); - //equal( removeEvent, true, "Event : remove" ) ; - equal( tokentextarea.tokentextarea( "length" ), 2 , "API : remove( 0 )" ); - equal( widget.find(".ui-tokentextarea-block" ).length, 2, 'API : API : remove( 0 )') ; - - /* Reamove all */ - tokentextarea.tokentextarea( "remove" ); - equal( tokentextarea.tokentextarea( "length" ), 0, "API : remove" ); - equal( widget.find(".ui-tokentextarea-block" ).length, 0, 'API : API : remove all') ; - /* input */ inputText = "tokentextarea"; tokentextarea.tokentextarea( "inputText", inputText ); outputText = tokentextarea.tokentextarea( "inputText" ); equal( outputText, inputText, "API : input('" + outputText + "')" ); + + asyncTest("asyncTest", function () { + var $widget = $( "
" ).tokentextarea(); + widget.append( $widget ); + + $widget.tokentextarea( "add", "string1" ); + $widget.tokentextarea( "add", "string2" ); + $widget.tokentextarea( "add", "string3" ); + $widget.tokentextarea( "remove", 0 ); + + setTimeout( function () { + /* Remove */ + equal( $widget.tokentextarea( "length" ), 2 , "API : remove( 0 )" ); + equal( widget.find(".ui-tokentextarea-block" ).length, 2, 'API : API : remove( 0 )'); + $widget.tokentextarea( "remove" ); + }, 400 ); + + setTimeout( function () { + /* Reamove all */ + equal( $widget.tokentextarea( "length" ), 0, "API : remove" ); + equal( widget.find(".ui-tokentextarea-block" ).length, 0, 'API : API : remove all'); + start(); + $widget.remove(); + }, 800 ); + }); }; test( "Tokentextarea", function ( ) { diff --git a/tests/unit-tests/tokentextarea/tokentextarea-tests.js b/tests/unit-tests/tokentextarea/tokentextarea-tests.js index 67fcc46..ef71aa9 100755 --- a/tests/unit-tests/tokentextarea/tokentextarea-tests.js +++ b/tests/unit-tests/tokentextarea/tokentextarea-tests.js @@ -42,21 +42,36 @@ /* Focus In */ tokentextarea.tokentextarea( "focusIn" ); status = tokentextarea.hasClass( "ui-tokentextarea-focusin" ); - equal( status, true, "API : focusIn" ); - - /* Remove */ - tokentextarea.tokentextarea( "remove", 0 ); - equal( tokentextarea.tokentextarea( "length" ), 2 , "API : remove( 0 )" ); - - /* Reamove all */ - tokentextarea.tokentextarea( "remove" ); - equal( tokentextarea.tokentextarea( "length" ), 0, "API : remove" ); + equal( status, true, "API : focusIn" ); /* input */ inputText = "tokentextarea"; tokentextarea.tokentextarea( "inputText", inputText ); outputText = tokentextarea.tokentextarea( "inputText" ); equal( outputText, inputText, "API : input( '" + outputText + "' )" ); + + asyncTest("asyncTest", function () { + var $widget = $( "
" ).tokentextarea(); + $( ".ui-page" ).append( $widget ); + + $widget.tokentextarea( "add", "string1" ); + $widget.tokentextarea( "add", "string2" ); + $widget.tokentextarea( "add", "string3" ); + $widget.tokentextarea( "remove", 0 ); + + setTimeout( function () { + /* Remove */ + equal( $widget.tokentextarea( "length" ), 2, "API : remove( 0 )" ); + $widget.tokentextarea( "remove" ); + }, 400 ); + + setTimeout( function () { + /* Reamove all */ + equal( $widget.tokentextarea( "length" ), 0, "API : remove()" ); + start(); + $widget.remove(); + }, 800 ); + }); }; test( "Tokentextarea", function () { -- 2.7.4