Author: vrubezhny Date: 2011-09-09 13:36:21 -0400 (Fri, 09 Sep 2011) New Revision: 34612 Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java Log: JBIDE-9633 Create JUnit tests to cover JBIDE-9515 issue JUnit Test is added for proposals filtering and proposals applying check Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-09-09 17:11:51 UTC (rev 34611) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-09-09 17:36:21 UTC (rev 34612) @@ -31,5 +31,5 @@ org.eclipse.wst.validation;bundle-version="1.2.300", org.jboss.tools.jst.web.kb.test, org.jboss.tools.common.validation, - org.jboss.tools.jst.jsp;bundle-version="3.3.0" + org.jboss.tools.jst.jsp Export-Package: org.jboss.tools.cdi.ui.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java 2011-09-09 17:11:51 UTC (rev 34611) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java 2011-09-09 17:36:21 UTC (rev 34612) @@ -30,21 +30,28 @@ */ public class CAELProposalFilteringTest extends TestCase { - private IProject project; + private IProject project = null; private ContentAssistantTestCase caTest = new ContentAssistantTestCase(); private static final String JSP_PAGE_NAME = "WebContent/test.jsp"; private static final String XHTML_PAGE_NAME = "WebContent/elValidation1.xhtml"; public CAELProposalFilteringTest() { super(); - try { - project = TCKUITest.importPreparedProject("/tests/lookup"); - project = TCKUITest.importPreparedProject("/tests/ca"); - caTest.setProject(project); - } catch (Exception e) { - e.printStackTrace(); - } } + + public void setUp() { + if (project == null) { + try { + IProject testProject = TCKUITest.importPreparedProject("/tests/lookup"); + testProject = TCKUITest.importPreparedProject("/tests/ca"); + caTest.setProject(testProject); + project = testProject; + } catch (Exception e) { + project = null; + e.printStackTrace(); + } + } + } public void testCAELProposalFilteringInJSP () { caTest.openEditor(JSP_PAGE_NAME); @@ -76,8 +83,6 @@ String documentContentToCompare = documentContent.substring(0, start + prefix.length()) + compareString + documentContent.substring(start + prefix.length()); - JobUtils.waitForIdle(); - List<ICompletionProposal> res = CATestUtil.collectProposals(caTest.getContentAssistant(), caTest.getViewer(), offsetToTest); assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); @@ -100,12 +105,7 @@ } assertTrue("The proposal to apply not found.", bPropoosalToApplyFound); - try { - JobUtils.waitForIdle(); - } catch (Exception e) { - e.printStackTrace(); - assertTrue("Waiting for the jobs to complete has failed.", false); - } +// JobUtils.waitForIdle(); String documentUpdatedContent = document.get(); assertTrue("The proposal replacement is failed.", documentContentToCompare.equals(documentUpdatedContent));