### Eclipse Workspace Patch 1.0
#P fluid-engage-core
Index: tests/component-tests/myCollection/html/myCollectionView-test.html
===================================================================
--- tests/component-tests/myCollection/html/myCollectionView-test.html	(revision 9418)
+++ tests/component-tests/myCollection/html/myCollectionView-test.html	(working copy)
@@ -5,31 +5,24 @@
         <title>My Collection Tests</title>
 		
         <link rel="Stylesheet" media="screen" href="../../../../../fluid-infusion/src/webapp/tests/lib/qunit/css/testsuite.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/myCollection/css/myCollection.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../../fluid-infusion/src/webapp/framework/fss/css/fss-layout.css" ></link>		
+        <link rel="stylesheet" type="text/css" href="../../../../../fluid-infusion/src/webapp/framework/fss/css/fss-layout.css" ></link>        
+        <link rel="stylesheet" type="text/css" href="../../../../../fluid-engage-core/components/navigationBar/css/NavigationBar.css" />        
+        <link rel="stylesheet" type="text/css" href="../../../../../fluid-engage/components/myCollection/css/myCollection.css" />
+		
 
 		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/jquery/core/js/jquery.js"></script>
-		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/json/js/json2.js"></script>
         <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/fastXmlPull/js/fastXmlPull.js"></script>
-		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/jquery/ui/js/ui.core.js"></script>
-		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/jquery/plugins/delegate/js/jquery.delegate.js"></script>
         <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/framework/core/js/Fluid.js"></script>
 		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/framework/renderer/js/fluidRenderer.js"></script>
 		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/framework/renderer/js/fluidParser.js"></script>
-        <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/framework/core/js/jquery.keyboard-a11y.js"></script>		
-        <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/components/reorderer/js/GeometricManager.js"></script>
-        <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/components/reorderer/js/Reorderer.js"></script>
-        <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/components/reorderer/js/ImageReorderer.js"></script>
-        <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/lib/jquery/ui/js/ui.draggable.js"></script>
-		<script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/framework/core/js/FluidDOMUtilities.js"></script>
 		
         <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/tests/lib/qunit/js/testrunner.js"></script>
         <script type="text/javascript" src="../../../../../fluid-infusion/src/webapp/tests/test-core/jqUnit/js/jqUnit.js"></script>
 
         <script type="text/javascript" src="../../../../../fluid-engage-core/framework/js/engageClientUtils.js"></script>
- 		<script type="text/javascript" src="../../../../../fluid-engage-core/lib/jquery/plugins/cookie/js/jquery.cookie.js"></script>
    		<script type="text/javascript" src="../../../../../fluid-engage-core/components/myCollection/js/MyCollectionView.js"></script>
-   		<script type="text/javascript" src="../../../../../fluid-engage-core/components/navigationList/js/NavigationList.js"></script>		
+		<script type="text/javascript" src="../../../../../fluid-engage-core/components/navigationBar/js/NavigationBar.js"></script>   		
+   		<script type="text/javascript" src="../../../../../fluid-engage-core/components/navigationList/js/NavigationList.js"></script>   				
 		<script type="text/javascript" src="../../../../../fluid-engage-core/components/user/js/user.js"></script>
 
 		<script type="text/javascript" src="../../../../../fluid-engage-core/tests/component-tests/myCollection/js/myCollectionTests.js"></script>
Index: tests/component-tests/myCollection/js/myCollectionTests.js
===================================================================
--- tests/component-tests/myCollection/js/myCollectionTests.js	(revision 9418)
+++ tests/component-tests/myCollection/js/myCollectionTests.js	(working copy)
@@ -14,7 +14,8 @@
 /*global jqUnit*/
 /*global expect*/
 /*global document*/
-/*global setTimeout*/
+/*global stop*/
+/*global start*/
 
 (function ($) {
     $(document).ready(function () {
@@ -25,7 +26,7 @@
         var setup = function () {
             tests.fetchTemplate(
                     "../../../../components/myCollection/html/myCollection.html",
-                    ".flc-myCollection");
+                    ".flc-myCollection-container");
             
             // Workaround to the different relative path when running tests.
             // We retrieve the navigation list link and rewrite it with a
@@ -43,13 +44,15 @@
                 async: false
             });
             
-            component = fluid.engage.myCollection(".flc-myCollection", {model: model});     
+            component = fluid.engage.myCollection(".flc-myCollection-container", {model: model});
+
+            // Here we delay the running of the tests to allow the My Collection component
+            // to be initialized. This is necessary because its initialization is delayed.
+            stop();
+            start();
         };
         
-        tests = jqUnit.testCase("My Collection Tests"/*, setup*/);
-        // Setup here is called directly to walk around the delayed initialization of
-        // the navigationList subcomponent in Firefox
-        setup();
+        tests = jqUnit.testCase("My Collection Tests", setup);
         
         var myCollectionTests = function () {
             tests.test("Component construction test", function () {
@@ -58,10 +61,10 @@
                 jqUnit.assertNotUndefined("Component defined.", component);
                 jqUnit.assertNotNull("Component not null.", component);
                 
-                jqUnit.assertNotUndefined("User subcomponent defined.",
-                        component.user);
-                jqUnit.assertNotNull("User subcomponent not null.",
-                        component.user);
+                jqUnit.assertNotUndefined("Navigation bar subcomponent defined.",
+                        component.navBar);
+                jqUnit.assertNotNull("Navigation bar subcomponent not null.",
+                        component.navBar);
                 
                 jqUnit.assertNotUndefined("Navigation List subcomponent defined.",
                         component.navigationList);
@@ -81,30 +84,8 @@
                 jqUnit.assertEquals("Model node museum matches passed museum.",
                         model.data[0].museum, component.model.data[0].museum);
             });
-            
-            tests.test("Strings test", function () {
-                expect(1);
-                
-                var expectedStatus = fluid.stringTemplate(
-                    component.options.strings.statusMessageTemplate, {
-                        artifactsNumber: model.data.length,
-                        artifactsPlural: model.data.length === 1 ? "" : "s"
-                    }
-                );
-                
-                var status = component.locate("collectionStatus").html();
-                
-                jqUnit.assertEquals("Correct status message.",
-                        expectedStatus, status);
-            });            
         };
 
-        var doTests = function () { 
-            myCollectionTests();
-        };
-
-        // Again we delay the tests execution to walk around the delayed
-        // initialization of the navigationList subcomponent
-        setTimeout(doTests, 1);         
+        myCollectionTests();
     });
 })(jQuery);
\ No newline at end of file
