UnitTC: fix virtualgrid test error

Change-Id: Ia31bb179f51f5b8c53185912adbedc33a12ecfc0

diff --git a/tests/unit-tests/virtualgrid/index.html b/tests/unit-tests/virtualgrid/index.html
index 4aa2282..a99eb80 100644 (file)
--- a/tests/unit-tests/virtualgrid/index.html
+++ b/tests/unit-tests/virtualgrid/index.html
@@ -9,6 +9,7 @@
                </script>
                <link rel="stylesheet" href="../../../libs/js/jquery-mobile-1.2.0/external/qunit.css" />
                <script src="../../../libs/js/jquery-mobile-1.2.0/external/qunit.js"></script>
+               <script src = "../../../demos/tizen-winsets/widgets/grid/virtualgrid-db-demo.js"></script>
                <script src="virtualgrid-tests.js"></script>
                <title>Virtualgrid</title>
        </head>
@@ -36,14 +37,6 @@
                                                </div>
                                        </script>
                                        <div id="virtualgrid-test" data-direction="y" data-role="virtualgrid" data-rotation="true" data-template="tizen-demo-namecard" data-dbtable="JSON_DATA" style="width:600px; height:500px;"></div>
-                                       <script>
-                                               $( ".virtualgrid_demo_page" ).live( "pagecreate", function() {
-                                                       console.log("pagecreate...");
-                                                       $.getScript( "../../../demos/tizen-winsets/widgets/grid/virtualgrid-db-demo.js", function( data, textStatus ) {
-                                                               $(document).trigger("dataloaded");
-                                                       });
-                                               });
-                                       </script>
                                </div>
                        </div>
                </div>

diff --git a/tests/unit-tests/virtualgrid/virtualgrid-tests.js b/tests/unit-tests/virtualgrid/virtualgrid-tests.js
index 4ae09a9..1227d80 100755 (executable)
--- a/tests/unit-tests/virtualgrid/virtualgrid-tests.js
+++ b/tests/unit-tests/virtualgrid/virtualgrid-tests.js
@@ -5,10 +5,12 @@
  * Woosung Sohn <woosungim.sohn@samsung.com>
  */
 
-( function ( $ ) {
+$( document ).ready( function () {
+       var virtualGrid, startVirtualGridTest;
+
        module( "Virtualgrid" );
 
-       var startVirtualGridTest = function ( virtualGrid ) {
+       startVirtualGridTest = function ( virtualGrid ) {
                var $vgView,
                        $vgScrollView,
                        $vgWrapBlocks,
@@ -61,19 +63,28 @@
                        notEqual( $item.children().length, prevColCnt, "Method : resize" );
 
                        $item = $( $vgWrapBlocks.first().children()[0] );
-                       $item.trigger( "click" );
+                       try {
+                               $item.trigger( "click" );
+                       } catch ( exception ) {
+                               console.log( "click event exception : " + exception );
+                       }
                });
        };
 
-       $( document ).bind( "dataloaded" , function () {
-               var virtualGrid = $( "#virtualgrid-test" ).virtualgrid( "create" , {
+       /* Load Dummy Data and Init Virtual Grid widget*/
+       if ( window.JSON_DATA ) {
+               // trigger pagecreate
+               $( "#virtualgrid_demo_page" ).page();
+
+               virtualGrid = $( "#virtualgrid-test" ).virtualgrid( "create", {
                        itemData: function ( idx ) {
                                return JSON_DATA[ idx ];
                        },
                        numItemData: JSON_DATA.length,
                        cacheItemData: function ( minIdx, maxIdx ) { }
                });
-
                startVirtualGridTest( virtualGrid );
-       });
-}( jQuery ));
+       } else {
+               console.log ( "Virtual Grid Init Fail." );
+       }
+} );