[jbosstools-commits] JBoss Tools SVN: r23078 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.

[jbosstools-commits at lists.jboss.org]

Author: yradtsevich
Date: 2010-06-29 02:05:40 -0400 (Tue, 29 Jun 2010)
New Revision: 23078

Modified:
   trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java
Log:
https://jira.jboss.org/browse/JBIDE-6543
- file name and XPath of the node where a VPE content test failed is printed now (part 2).

Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java	2010-06-29 03:36:20 UTC (rev 23077)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java	2010-06-29 06:05:40 UTC (rev 23078)
@@ -11,7 +11,6 @@
 package org.jboss.tools.jsf.vpe.jsf.test.jbide;
 
 import java.io.File;
-import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.swt.custom.StyledText;
@@ -20,9 +19,7 @@
 import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
 import org.jboss.tools.vpe.editor.VpeController;
 import org.jboss.tools.vpe.ui.test.ComponentContentTest;
-import org.jboss.tools.vpe.ui.test.TestDomUtil;
 import org.jboss.tools.vpe.ui.test.TestUtil;
-import org.w3c.dom.Document;
 
 /**
  * @author mareshkau
@@ -74,16 +71,8 @@
 				.getLocation().toFile();
 
 		// get document
-		Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
-		assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$
+		compareContent(vpeController, xmlTestFile);
 
-		List<String> ids = TestDomUtil.getTestIds(xmlTestDocument);
-
-		for (String id : ids) {
-
-			compareElements(vpeController, xmlTestDocument, id, id);
-		}
-
 		if (getException() != null) {
 			throw getException();
 		}
@@ -93,6 +82,4 @@
 	protected String getTestProjectName() {
 		return JsfAllTests.IMPORT_PROJECT_NAME;
 	}
-
-
 }