[jbosstools-commits] JBoss Tools SVN: r25102 - in trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf: test and 1 other directory.

Author: vrubezhny Date: 2010-09-22 12:53:47 -0400 (Wed, 22 Sep 2010) New Revision: 25102 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide6259Test.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java Log: JBIDE-7123 Create JUnit test for JBIDE-6259: Add an option to Preferences to disable/enable code completion for getteres and setters in EL. JUnit test is created Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide6259Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide6259Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide6259Test.java 2010-09-22 16:53:47 UTC (rev 25102) @@ -0,0 +1,184 @@ +package org.jboss.tools.jsf.ca.test; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import junit.framework.Test; +import junit.framework.TestSuite; + +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.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.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; + +public class JsfJspJbide6259Test extends ContentAssistantTestCase { + TestProjectProvider provider = null; + + boolean makeCopy = false; + private static final String PROJECT_NAME = "JsfJbide1704Test"; + private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp"; + + public static Test suite() { + return new TestSuite(JsfJspJbide1704Test.class); + } + + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy); + project = provider.getProject(); + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + } + } + + private static final String EXPRESSION_STRING = "#{person."; + private static final String[] TEST_PROPOSAL_EMPTY_SET_EMPTY = new String[0]; + private static final String[] TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_TRUE = { + "name", + "getName", + "getName()" + }; + private static final String[] TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_FALSE = { + "name" + }; + private static final String[] TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_FALSE_WRONG_CASES = { + "getName", + "getName()" + }; + private static final String[] TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_TRUE = { + "getName()" + }; + private static final String[] TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_TRUE_WRONG_CASES = { + "getName" + }; + private static final String[] TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_FALSE = { + "getName", + "getName()" + }; + + private void testProposals (List<ICompletionProposal> proposals, String[] testCases, String[] wrongCases) { + // testCases is the array of proposals which are strict to be present + // wrongCases is the array of proposals which are strict to be absent + + Set<String> existingCases = new HashSet<String>(); + for (ICompletionProposal p : proposals) { + if (!(p instanceof AutoELContentAssistantProposal)) + continue; + + AutoELContentAssistantProposal proposal = (AutoELContentAssistantProposal)p; + String replacement = proposal.getReplacementString(); + if (replacement == null) + continue; + + if (replacement.indexOf('.') > -1) { + replacement = replacement.substring(replacement.lastIndexOf('.') + 1); + } + + for (int i = 0; i < testCases.length; i++) { + if (replacement.equals(testCases[i])) { + existingCases.add(testCases[i]); // add the proposal to existing set + continue; + } + } + + for (int i = 0; i < wrongCases.length; i++) { + assertFalse("The proposal \'" + replacement + "\' is not allowed to be shown!", replacement.equals(wrongCases[i])); + } + } + assertTrue("Not all the required proposals are present!", (existingCases.size() == testCases.length)); + } + + private void setupELContentAssistPreferences(boolean methodsWithParenthesesOnly, boolean showGettersAndSetters) { + ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_METHODS_WITH_PARENTHESES_ONLY, methodsWithParenthesesOnly); + ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_GETTERS_AND_SETTERS, showGettersAndSetters); + } + + public void testJspJbide6259 () { + assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null)); + + openEditor(PAGE_NAME); + + try { + + final IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + EXPRESSION_STRING, true, true, false, false); + String errorMessage = null; + + int offsetToTest = reg.getOffset() + EXPRESSION_STRING.length(); + + // Test method presentations: with and without parentheses + + // Set up EL Content Assist preferences to: + // methods are to be shown with and without parentheses + // getters and setters are to be shown + setupELContentAssistPreferences(false, true); + + List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + + assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); + + testProposals(res, TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_FALSE, TEST_PROPOSAL_EMPTY_SET_EMPTY); + + // Test method presentations: with parentheses only + + // Set up EL Content Assist preferences to: + // methods are to be shown with parentheses only + // 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); + + assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); + + testProposals(res, TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_TRUE, TEST_PROPOSAL_METHODS_WITH_PARENTHESES_ONLY_TRUE_WRONG_CASES); + + // Test property presentations: property name, getters and setters are to be shown + + // Set up EL Content Assist preferences to: + // methods are to be shown with and without parentheses + // getters and setters are to be shown + + setupELContentAssistPreferences(false, true); + + TestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window + res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + + assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); + + testProposals(res, TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_TRUE, TEST_PROPOSAL_EMPTY_SET_EMPTY); + + // Test property presentations: the only property name is to be shown + + // Set up EL Content Assist preferences to: + // methods are to be shown with and without parentheses + // getters and setters are to be shown + + setupELContentAssistPreferences(false, false); + + TestUtil.prepareCAInvokation(contentAssistant, viewer, 0); // drop the CA Window + res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + + assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0)); + + testProposals(res, TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_FALSE, TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_FALSE_WRONG_CASES); + + } catch (BadLocationException e) { + fail(e.getMessage()); + } + + closeEditor(); + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide6259Test.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java 2010-09-22 16:45:40 UTC (rev 25101) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java 2010-09-22 16:53:47 UTC (rev 25102) @@ -12,6 +12,7 @@ import org.jboss.tools.jsf.ca.test.JsfJspJbide1704Test; import org.jboss.tools.jsf.ca.test.JsfJspJbide1717Test; +import org.jboss.tools.jsf.ca.test.JsfJspJbide6259Test; import junit.framework.Test; import junit.framework.TestSuite; @@ -20,6 +21,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Test for org.jboss.tools.jsf.test"); + suite.addTestSuite(JsfJspJbide6259Test.class); suite.addTestSuite(JsfJspJbide1704Test.class); suite.addTestSuite(JsfJspJbide1717Test.class);