Menu tests: Split out markup structure and accessibility assertions.

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index ee737ceb11991a86541feead4e8971f6e74fe948..5ee28c14aa166794e31c0043ecd8ef7bf18110fd 100644 (file)
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -2,23 +2,29 @@
 
 module( "menu: core" );
 
+test( "markup structure", function() {
+       expect( 6 );
+       var element = $( "#menu1" ).menu();
+       ok( element.hasClass( "ui-menu" ), "main element is .ui-menu" );
+       element.children().each(function( index ) {
+               ok( $( this ).hasClass( "ui-menu-item" ), "child " + index + " is .ui-menu-item" );
+       });
+});
+
 test( "accessibility", function () {
-       expect( 5 );
-       var item,
-               element = $( "#menu1" ).menu(),
-               item0 = $( "li:eq(0) a" );
+       expect( 4 );
+       var element = $( "#menu1" ).menu();
 
-       ok( element.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
        equal( element.attr( "role" ), "menu", "main role" );
-       ok( !element.attr( "aria-activedescendant" ), "aria attribute not yet active" );
+       ok( !element.attr( "aria-activedescendant" ), "aria-activedescendant not set" );
+
+       element.menu( "focus", $.Event(), element.children().eq( -2 ) );
+       equal( element.attr( "aria-activedescendant" ), "testID1", "aria-activedescendant from existing id" );
 
-       item = element.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
-       element.menu( "focus", $.Event(), item );
-       equal( element.attr( "aria-activedescendant" ), "xid", "aria attribute, id from DOM" );
+       element.menu( "focus", $.Event(), element.children().eq( 0 ) );
+       ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria-activedescendant from generated id" );
 
-       item = element.find( "li:last" );
-       element.menu( "focus", $.Event(), item );
-       ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
+       // Item roles are tested in the role option tests
 });
 
 })( jQuery );