[192568] XML Catalog import/export should be in Import/Export wizards
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 584d10e..21698de 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() throws IOException, CoreException { - if(true) return; //workaround for now - // Tests the scenario that used to succeed, where the namespace prefix is // declared before the schemaLocation. @@ -132,6 +131,7 @@ assertNotNull("missing document element", documentElement); //$NON-NLS-1$ CMElementDeclaration cmElementDeclaration = modelQuery.getCMElementDeclaration(documentElement); 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)); } finally {
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java index f9797fb..69fc3bb 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java
@@ -139,11 +139,12 @@ try { Thread.sleep(5000); Iterator iter = annoModel.getAnnotationIterator(); + // make sure the only problem we find is the lack of a specified grammar while (iter.hasNext()) { Annotation anno = (Annotation) iter.next(); String annoType = anno.getType(); if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) { - assertTrue("testReconciler: Unexpected initial annotations" + anno.getText(), false); + assertTrue("testReconciler: Unexpected initial annotations" + anno.getText(), anno.getText().indexOf("No grammar constraints") > -1); } } }