[jbosstools-commits] JBoss Tools SVN: r31439 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.

Author: scabanovich Date: 2011-05-23 17:12:28 -0400 (Mon, 23 May 2011) New Revision: 31439 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/MissingKBBuilderTest.java Log: JBIDE-8983 https://issues.jboss.org/browse/JBIDE-8983 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -7,9 +7,8 @@ import junit.framework.TestSuite; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; @@ -83,10 +82,10 @@ jspTextEditor.setText(documentContentModified); - ICompletionProposal[] result= null; - String errorMessage = null; +// ICompletionProposal[] result= null; +// String errorMessage = null; - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); //$NON-NLS-1$ @@ -117,7 +116,7 @@ jspTextEditor.setText(documentContentModified); - res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -10,8 +10,8 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; -import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; @@ -39,12 +39,12 @@ public void testThereAreNotOnlyELProposalsJBIDE2437 () throws BadLocationException { openEditor(PAGE_NAME); JobUtils.waitForIdle(); - ICompletionProposal[] result= null; - String errorMessage = null; +// ICompletionProposal[] result= null; +// String errorMessage = null; IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, true, false, false); - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, reg.getOffset()); + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, reg.getOffset()); assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -1,6 +1,5 @@ package org.jboss.tools.jsf.jsp.ca.test; -import java.util.ArrayList; import java.util.List; import junit.framework.Test; @@ -9,12 +8,10 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.contentassist.ContentAssistant; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; -import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.TestProjectProvider; @@ -61,9 +58,9 @@ final IRegion reg = new FindReplaceDocumentAdapter(document).find(0, " var=\"msg\"", true, true, false, false); String text = document.get(); - String errorMessage = null; +// String errorMessage = null; - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, reg.getOffset()); + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, reg.getOffset()); assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -7,9 +7,8 @@ import junit.framework.TestSuite; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; @@ -61,7 +60,7 @@ String errorMessage = null; - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); List<String> customCompletionProposals = new ArrayList<String>(); @@ -96,7 +95,7 @@ jspTextEditor.setText(documentContentModified); - res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); if (res != null) { for (ICompletionProposal proposal : res) { Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -14,9 +14,8 @@ import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences; -import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal; -import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.TestProjectProvider; @@ -124,7 +123,7 @@ // getters and setters are to be shown setupELContentAssistPreferences(false, true); - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); @@ -137,8 +136,8 @@ // getters and setters are to be shown setupELContentAssistPreferences(true, true); - TestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window - res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + CATestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window + res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); @@ -152,8 +151,8 @@ setupELContentAssistPreferences(false, true); - TestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window - res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + CATestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window + res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); @@ -167,8 +166,8 @@ setupELContentAssistPreferences(false, false); - TestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window - res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + CATestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window + res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/MissingKBBuilderTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/MissingKBBuilderTest.java 2011-05-23 21:03:06 UTC (rev 31438) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/MissingKBBuilderTest.java 2011-05-23 21:12:28 UTC (rev 31439) @@ -1,9 +1,8 @@ package org.jboss.tools.jsf.jsp.ca.test; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; @@ -48,7 +47,7 @@ ICompletionProposal[] result = null; - IContentAssistProcessor p = TestUtil.getProcessor(viewer, position + offset, contentAssistant); + IContentAssistProcessor p = CATestUtil.getProcessor(viewer, position + offset, contentAssistant); if (p != null) { try { result = p.computeCompletionProposals(viewer, position + offset);