[198807] XML Editor with Schema Validation can't find Grammar

tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
index f32c35b..10e86b8 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     David Carver - STAR - Added content Assist check in testIgnoresAttributesOrder
  *******************************************************************************/
 package org.eclipse.wst.xml.core.tests.contentmodel;
 
@@ -67,8 +68,6 @@
    */
   public void testIgnoresAttributesOrder()
   {
-	if(true) return; //workaround for now
-	  
     // Tests the scenario that used to succeed, where the namespace prefix is
     // declared before the schemaLocation.
 
@@ -130,7 +129,8 @@
       IDOMElement documentElement = (IDOMElement) document.getDocumentElement();
       assertNotNull(documentElement);
       CMElementDeclaration cmElementDeclaration = modelQuery.getCMElementDeclaration(documentElement);
-      assertNotNull(cmElementDeclaration);
+      assertNotNull("No element declaration for" + documentElement.getNodeName() + " ("+documentElement.getNamespaceURI()+")", cmElementDeclaration); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      assertNotNull("No content assist available for" + documentElement.getNodeName() + " (" + documentElement.getNamespaceURI() + ")", modelQuery.getAvailableContent(documentElement, cmElementDeclaration, ModelQuery.INCLUDE_CHILD_NODES));
     }
     catch (IOException e)
     {