Author: akazakov Date: 2011-08-12 18:04:45 -0400 (Fri, 12 Aug 2011) New Revision: 33868 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java Log: https://issues.jboss.org/browse/JBIDE-9532 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2011-08-12 22:03:50 UTC (rev 33867) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2011-08-12 22:04:45 UTC (rev 33868) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -40,6 +41,7 @@ if(!project.exists()) { project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); } + TestUtil._waitForValidation(project); } /* (non-Javadoc) @@ -48,7 +50,6 @@ @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2011-08-12 22:03:50 UTC (rev 33867) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2011-08-12 22:04:45 UTC (rev 33868) @@ -19,24 +19,27 @@ import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test; import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test; import org.jboss.tools.jst.jsp.test.selbar.SelectionBarTest; +import org.jboss.tools.test.util.ProjectImportTestSetup; public class JstJspAllTests { public static Test suite() { TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test"); //$NON-NLS-1$ - + suite.addTest(new ProjectImportTestSetup(new TestSuite( + Jbide6061Test.class), + "org.jboss.tools.jst.jsp.test", "projects/Jbide6061Test", //$NON-NLS-1$ //$NON-NLS-2$ + "Jbide6061Test")); //$NON-NLS-1$ + suite.addTestSuite(JstJspJbide1585Test.class); suite.addTestSuite(JstJspJbide1641Test.class); - + suite.addTestSuite(Jbide1791Test.class); suite.addTestSuite(Jbide9092Test.class); - suite.addTestSuite(Jbide6061Test.class); - + suite.addTestSuite(JspPreferencesPageTest.class); suite.addTestSuite(SelectionBarTest.class); - + return suite; } - -} +} \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java 2011-08-12 22:03:50 UTC (rev 33867) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java 2011-08-12 22:04:45 UTC (rev 33868) @@ -13,11 +13,11 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.jboss.tools.test.util.TestProjectProvider; /** * Test cast testing http://jira.jboss.com/jira/browse/JBIDE-6061 issue. @@ -30,7 +30,6 @@ private static final String JSP_PAGE_NAME = "/WebContent/pages/jsp_page.jsp"; //$NON-NLS-1$ private static final String XHTML_PAGE_NAME = "/WebContent/pages/xhtml_page.xhtml"; //$NON-NLS-1$ private static final String HTML_PAGE_NAME = "/WebContent/pages/html_page.html"; //$NON-NLS-1$ - private TestProjectProvider provider = null; private final String[] CSSCLASS_PROPOSALS = new String[]{ "errors", //$NON-NLS-1$ "cls1", //$NON-NLS-1$ @@ -48,16 +47,9 @@ } public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME,false); //$NON-NLS-1$ - project = provider.getProject(); + project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); } - protected void tearDown() throws Exception { - if(provider != null) { - provider.dispose(); - } - } - public void testJbide6061OnJspPage(){ for (String textToFind : STRINGS_TO_FIND_IN_JSP) { doTheCSSClassValuesTest(JSP_PAGE_NAME, textToFind, CSSCLASS_PROPOSALS); @@ -119,4 +111,4 @@ } return r; } -} +} \ No newline at end of file