Author: dmaliarevich Date: 2011-11-21 07:44:41 -0500 (Mon, 21 Nov 2011) New Revision: 36480 Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java Log: https://issues.jboss.org/browse/JBIDE-9975 - Test updates to show correct errors. Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-11-21 12:35:30 UTC (rev 36479) +++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-11-21 12:44:41 UTC (rev 36480) @@ -15,12 +15,12 @@ import java.util.List; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.test.util.WorkbenchUtils; import org.jboss.tools.vpe.editor.VpeController; @@ -85,13 +85,12 @@ /* * Get xml test file */ - File xmlTestFile = TestUtil.getComponentFileByFullPath( - elementPagePath + XML_FILE_EXTENSION, getTestProjectName()) - .getLocation().toFile(); + IResource xmlFile =TestUtil.getComponentFileByFullPath(elementPagePath + XML_FILE_EXTENSION, getTestProjectName()); /* * Test that XML test file was found and exists */ - assertNotNull("Could not find XML component file '"+elementPagePath + XML_FILE_EXTENSION+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ + assertNotNull("Could not find XML component file '"+elementPagePath + XML_FILE_EXTENSION+"'", xmlFile); //$NON-NLS-1$ //$NON-NLS-2$ + File xmlTestFile = xmlFile.getLocation().toFile(); /* * Get document */ @@ -286,7 +285,7 @@ // find visual element and check if it is not null visualElement = findElementById(controller, elementId,TestUtil.MAX_IDLE); - assertNotNull(visualElement); + assertNotNull("Cannot find invisible element with id '"+elementId+"' ", visualElement); //$NON-NLS-1$ //$NON-NLS-2$ // generate text for invisible tag String modelInvisibleTagText = generateInvisibleTagText(sourceELement