Author: dazarov Date: 2011-08-12 13:52:18 -0400 (Fri, 12 Aug 2011) New Revision: 33856 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java Log: https://issues.jboss.org/browse/JBIDE-9473 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -112,8 +112,6 @@ IHyperlink[] links = elPartitioner.detectHyperlinks(viewer, testData.getHyperlinkRegion(), true); boolean recognized = links != null; -// if(recognized) -// System.out.println("Recognized - "+i); if (recognized) { counter++; @@ -179,13 +177,10 @@ private static void loadRegions(List<TestRegion> regionList, IDocument document) throws BadLocationException{ FindReplaceDocumentAdapter adapter = new FindReplaceDocumentAdapter(document); - //String documentText = document.get(); - //int position = documentText.indexOf("{"); IRegion region = adapter.find(0, "{", true, true, false, false); if(region == null) region = new Region(0,0); for(TestRegion testRegion : regionList){ - //int newPosition = documentText.indexOf(testRegion.regionText, position); IRegion newRegion = adapter.find(region.getOffset()+region.getLength(), testRegion.regionText, true, true, false, false); if(newRegion != null){ testRegion.region = newRegion; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -51,6 +51,7 @@ protected static final String XML_EXT = "xml"; //$NON-NLS-1$ protected static final String XHTML_EXT = "xhtml"; //$NON-NLS-1$ protected static final String JSP_EXT = "jsp"; //$NON-NLS-1$ + protected static final String JSPX_EXT = "jspx"; //$NON-NLS-1$ protected static final String PROPERTIES_EXT = "properties"; //$NON-NLS-1$ // private static final String GET = "get"; //$NON-NLS-1$ @@ -208,6 +209,7 @@ searchInCach(file); } else if (JAVA_EXT.equalsIgnoreCase(file.getFileExtension()) || JSP_EXT.equalsIgnoreCase(file.getFileExtension()) + || JSPX_EXT.equalsIgnoreCase(file.getFileExtension()) || XHTML_EXT.equalsIgnoreCase(file.getFileExtension()) || XML_EXT.equalsIgnoreCase(file.getFileExtension())) { searchInCach(file); @@ -232,7 +234,8 @@ String ext = file.getFileExtension(); if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(ext) - || JSP_EXT.equalsIgnoreCase(ext)) { + || JSP_EXT.equalsIgnoreCase(ext) + || JSPX_EXT.equalsIgnoreCase(ext)) { searchInCach(file); } return true; Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -10,6 +10,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; @@ -66,7 +68,11 @@ IDocument document = documentProvider.getDocument(editorInput); assertNotNull("The document for the file \"" + fileName + "\" is not loaded", document); + + if(regionList.get(0).region == null) + loadRegions(regionList, document); + int expected = 0; for(TestRegion testRegion : regionList) expected += testRegion.region.getLength()+1; @@ -95,18 +101,21 @@ int counter = 0; for (int i = 0; i < document.getLength(); i++) { + int lineNumber = document.getLineOfOffset(i); + int position = i - document.getLineOffset(lineNumber)+1; + lineNumber++; + TestData testData = new TestData(document, i); IHyperlink[] links = elDetector.detectHyperlinks(viewer, testData.getHyperlinkRegion(), true); boolean recognized = links != null; -// if(recognized) -// System.out.println("Recognized - "+i); if (recognized) { counter++; TestRegion testRegion = findOffsetInRegions(i, regionList); if(testRegion == null){ - fail("Wrong detection for offset - "+i); + String information = findRegionInformation(document, i, regionList); + fail("Wrong detection for offset - "+i+" (line - "+lineNumber+" position - "+position+") "+information); }else{ checkTestRegion(links, testRegion); } @@ -114,8 +123,7 @@ else { for(TestRegion testRegion : regionList){ if(i >= testRegion.region.getOffset() && i <= testRegion.region.getOffset()+testRegion.region.getLength()) { - int line = document.getLineOfOffset(testRegion.region.getOffset()); - fail("Wrong detection for region - "+testRegion.region.getOffset()+" : "+testRegion.region.getLength()+" region - "+i); + fail("Wrong detection for region - "+getRegionInformation(document, testRegion)+" offset - "+i+" (line - "+lineNumber+" position - "+position+")"); } } } @@ -162,7 +170,29 @@ } return null; } + + private static void loadRegions(List<TestRegion> regionList, IDocument document) throws BadLocationException{ + FindReplaceDocumentAdapter adapter = new FindReplaceDocumentAdapter(document); + //IRegion region = adapter.find(0, "{", true, true, false, false); + //if(region == null) + IRegion region = new Region(0,0); + for(TestRegion testRegion : regionList){ + IRegion newRegion = adapter.find(region.getOffset()+region.getLength(), testRegion.regionText, true, true, false, false); + if(newRegion != null){ + testRegion.region = newRegion; + region = newRegion; + }else + fail("Can not find string - "+testRegion.regionText); + } + + for(int i = regionList.size()-1; i >= 0; i--){ + TestRegion r = regionList.get(i); + if(r.hyperlinks.size() == 0) + regionList.remove(r); + } + } + private static TestRegion findOffsetInRegions(int offset, List<TestRegion> regionList){ for(TestRegion testRegion : regionList){ if(offset >= testRegion.region.getOffset() && offset <= testRegion.region.getOffset()+testRegion.region.getLength()) @@ -170,6 +200,34 @@ } return null; } + + private static String findRegionInformation(IDocument document, int offset, List<TestRegion> regionList) throws BadLocationException{ + int index = 0; + for(int i = 0; i < regionList.size(); i++){ + TestRegion testRegion = regionList.get(i); + if(offset > testRegion.region.getOffset()+testRegion.region.getLength()){ + index = i; + } + } + String info = "previous region - " + getRegionInformation(document, regionList.get(index)); + if(index+1 < regionList.size()) + info += " next region - " + getRegionInformation(document, regionList.get(index+1)); + return info; + } + + private static String getRegionInformation(IDocument document, TestRegion region) throws BadLocationException{ + String info = ""; + int lineNumber = document.getLineOfOffset(region.region.getOffset()); + int position = region.region.getOffset() - document.getLineOffset(lineNumber)+1; + lineNumber++; + + if(region.regionText != null) + info += "<"+region.regionText+"> "; + + info += region.region.getOffset()+" - "+(region.region.getOffset()+region.region.getLength())+" line - "+lineNumber+" position - "+position; + + return info; + } public static IEditorPart openFileInEditor(IFile input) { return openFileInEditor(input, null); @@ -293,7 +351,8 @@ } public static class TestRegion{ - Region region; + IRegion region = null; + String regionText = null; ArrayList<TestHyperlink> hyperlinks = new ArrayList<TestHyperlink>(); public TestRegion(int offset, int length, TestHyperlink[] testHyperlinks){ @@ -302,6 +361,13 @@ hyperlinks.add(testHyperlink); } } + + public TestRegion(String regionText, TestHyperlink[] testHyperlinks){ + this.regionText = regionText; + for(TestHyperlink testHyperlink : testHyperlinks){ + hyperlinks.add(testHyperlink); + } + } } public static class TestHyperlink{ Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-08-12 17:52:18 UTC (rev 33856) @@ -17,7 +17,9 @@ org.eclipse.jst.standard.schemas, org.eclipse.wst.validation, org.eclipse.ui.ide, - org.jboss.tools.jst.jsp.test + org.jboss.tools.jst.jsp.test, + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.search;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -0,0 +1,146 @@ +package org.jboss.tools.jst.web.kb.test; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.ILocalVariable; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.search.IJavaSearchConstants; +import org.eclipse.jdt.core.search.IJavaSearchScope; +import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory; +import org.eclipse.jdt.ui.search.ElementQuerySpecification; +import org.eclipse.jdt.ui.search.IQueryParticipant; +import org.eclipse.jdt.ui.search.ISearchRequestor; +import org.eclipse.jdt.ui.search.QuerySpecification; +import org.eclipse.search.ui.text.Match; +import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.util.FileUtil; + +public class QueryParticipantTestUtils extends TestCase{ + public static final int FIELD_SEARCH = 1; + public static final int METHOD_SEARCH = 2; + public static final int TYPE_SEARCH = 3; + public static final int PARAMETER_SEARCH = 4; + + public static void testSearchParticipant(IProject project, String fileName, int searchType, String elementName, String parameterName, IQueryParticipant participant, List<MatchStructure> matches){ + IFile file = project.getFile(fileName); + assertNotNull("File - "+fileName+" not found", file); + + try{ + ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file); + IJavaElement element = null; + + IType type = compilationUnit.findPrimaryType(); + + if(searchType == FIELD_SEARCH){ + element = type.getField(elementName); + }else if(searchType == METHOD_SEARCH){ + element = getMethod(type, elementName); + }else if(searchType == TYPE_SEARCH){ + element = type; + }else if(searchType == PARAMETER_SEARCH){ + IMethod method = getMethod(type, elementName); + element = getParameter(method, parameterName); + } + + if(element != null){ + SearchRequestor requestor = new SearchRequestor(); + + JavaSearchScopeFactory factory= JavaSearchScopeFactory.getInstance(); + IJavaSearchScope scope= factory.createWorkspaceScope(true); + String description= factory.getWorkspaceScopeDescription(true); + QuerySpecification specification = new ElementQuerySpecification(element, IJavaSearchConstants.REFERENCES, scope, description); + + participant.search(requestor, specification, new NullProgressMonitor()); + + List<Match> matchesForCheck = requestor.getMatches(); + + checkMatches(matchesForCheck, matches); + }else + fail("Java Element not found"); + }catch(CoreException ex){ + fail("Core exception"); + } + } + + private static IMethod getMethod(IType type, String name) throws JavaModelException{ + IMethod[] methods = type.getMethods(); + for(IMethod method : methods){ + if(method.getElementName().equals(name)) + return method; + } + return null; + } + + private static ILocalVariable getParameter(IMethod method, String name) throws JavaModelException{ + ILocalVariable[] parameters = method.getParameters(); + for(ILocalVariable parameter : parameters){ + if(parameter.getElementName().equals(name)) + return parameter; + } + return null; + } + + private static void checkMatches(List<Match> matchesForCheck, List<MatchStructure> matchList) throws CoreException { + for(Match match : matchesForCheck){ + assertTrue("Match must return IFile", match.getElement() instanceof IFile); + MatchStructure ms = findMatch(matchList, match); + assertNotNull("Unexpected match found (file - "+((IFile)match.getElement()).getFullPath()+")", ms); + ms.checked = true; + } + + for(MatchStructure ms : matchList){ + assertTrue("Match not found (file - "+ms.path+")", ms.checked); + } + } + + protected static MatchStructure findMatch(List<MatchStructure> matchList, Match match){ + IFile file = (IFile)match.getElement(); + String filePath = ((IFile)match.getElement()).getFullPath().toString(); + String text = FileUtil.getContentFromEditorOrFile(file); + String name = text.substring(match.getOffset(), match.getOffset()+match.getLength()); + for(MatchStructure ms : matchList){ + if(!ms.checked && ms.path.equals(filePath) && ms.name.equals(name)){ + System.out.println("found!"); + return ms; + } + } + return null; + } + + + static class SearchRequestor implements ISearchRequestor{ + ArrayList<Match> matches = new ArrayList<Match>(); + + public void reportMatch(Match match){ + matches.add(match); + } + + public List<Match> getMatches(){ + return matches; + } + } + + public static class MatchStructure{ + String path; + String name; // label + boolean checked; + + public MatchStructure(String path, String name){ + this.path = path; + this.name = name; + checked = false; + } + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-08-12 17:52:18 UTC (rev 33856) @@ -43,7 +43,8 @@ org.jboss.tools.tests;bundle-version="3.1.0", org.jboss.tools.jst.web;bundle-version="3.2.0", org.eclipse.jst.jee.web, - org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0" + org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0", + org.jboss.tools.jst.web.kb.test;bundle-version="3.3.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.ca, org.jboss.tools.seam.ui.test.hyperlink, Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -27,6 +27,7 @@ import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest; import org.jboss.tools.seam.ui.test.ca.SeamJbide3845Test; import org.jboss.tools.seam.ui.test.el.ELExprPartitionerTest; +import org.jboss.tools.seam.ui.test.el.ELReferencesQueryParticipantTest; import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest; import org.jboss.tools.seam.ui.test.jbide.JBide3989Test; import org.jboss.tools.seam.ui.test.marker.SeamMarkerResolutionTest; @@ -55,6 +56,7 @@ TestSuite suite = new TestSuite("Seam UI tests"); suite.addTestSuite(ELExprPartitionerTest.class); + suite.addTestSuite(ELReferencesQueryParticipantTest.class); suite.addTestSuite(OpenSeamComponentDialogTest.class); suite.addTest(SeamComponentsViewAllTests.suite()); suite.addTest(SeamProjectNewWizardTest.suite()); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-08-12 15:45:23 UTC (rev 33855) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -47,7 +47,7 @@ private String isJsfCheck = null; public void setUp() throws Exception { - System.out.println(">>>> ELExprPartitionerTest >>>>"); + //System.out.println(">>>> ELExprPartitionerTest >>>>"); provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy); project = provider.getProject(); Throwable exception = null; @@ -87,38 +87,47 @@ if(provider != null) { provider.dispose(); } - System.out.println("<<<< ELExprPartitionerTest <<<<"); + //System.out.println("<<<< ELExprPartitionerTest <<<<"); } public void testELExprPartitioner() throws Exception{ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(673, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(681, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(673, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(681, 7/*"question"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(756, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(764, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(756, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(764, 7/*"question"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(863, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(871, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_start' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(863, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(871, 9/*"info_start"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_start' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(909, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - regionList.add(new TestRegion(921, 15, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getRemainingGuesses() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(909, 10/*"numberGuess"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + regionList.add(new TestRegion(921, 15/*"remainingGuesses"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getRemainingGuesses() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - regionList.add(new TestRegion(964, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(972, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_finish' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(964, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(972, 10/*"info_finish"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_finish' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(1022, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(1030, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_yes' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(1022, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(1030, 9/*"button_yes"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_yes' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(1091, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(1099, 8, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_no' of bundle 'demo.bundle.Messages'", "Messages.properties")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(1091, 6/*"Message"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(1099, 8/*"button_no"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_no' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList.add(new TestRegion(1157, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - regionList.add(new TestRegion(1169, 12, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getPossibilities() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(1157, 10/*"numberGuess"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + regionList.add(new TestRegion(1169, 12/*"possibilities"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getPossibilities() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - regionList.add(new TestRegion(1237, 13, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Iterator.next() - java.util'")})); - regionList.add(new TestRegion(1252, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Integer.intValue() - java.lang'")})); + //regionList.add(new TestRegion("#{", new TestHyperlink[]{})); + regionList.add(new TestRegion(1237, 13/*"_localVariable"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Iterator.next() - java.util'")})); + regionList.add(new TestRegion(1252, 7/*"intValue"*/, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Integer.intValue() - java.lang'")})); HyperlinkTestUtil.checkRegions(project, PAGE_NAME, regionList, new ELHyperlinkDetector()); Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java 2011-08-12 17:52:18 UTC (rev 33856) @@ -0,0 +1,106 @@ +package org.jboss.tools.seam.ui.test.el; + +import java.util.ArrayList; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant; +import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils; +import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils.MatchStructure; +import org.jboss.tools.test.util.TestProjectProvider; + +public class ELReferencesQueryParticipantTest extends TestCase{ + TestProjectProvider provider = null; + IProject project = null; + boolean makeCopy = false; + private static final String PROJECT_NAME = "numberguess"; + + public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName( + "", "Is KB natures check"); //$NON-NLS-1$ + public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName( + "", "Is JSF natures check"); //$NON-NLS-1$ + public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName( + "", "Is JSF check"); //$NON-NLS-1$ + private String isKbNatureCheck = null; + private String isJsfNatureCheck = null; + private String isJsfCheck = null; + + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy); + project = provider.getProject(); + Throwable exception = null; + + assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + if (project != null) { + isKbNatureCheck = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED); + project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$ + Boolean.toString(false)); + isJsfNatureCheck = project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED); + project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$ + Boolean.toString(false)); + isJsfCheck = project.getPersistentProperty(IS_JSF_CHECK_NEED); + project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$ + Boolean.toString(false)); + } + } + + protected void tearDown() throws Exception { + if (project != null) { + project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$ + isKbNatureCheck); + project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$ + isJsfNatureCheck); + project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$ + isJsfCheck); + } + if(provider != null) { + provider.dispose(); + } + } + + public void testELReferencesQueryParticipantForType(){ + ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>(); + + matches.add(new MatchStructure("/numberguess/web/giveup.jspx", "numberGuess")); + matches.add(new MatchStructure("/numberguess/web/giveup.jspx", "numberGuess")); + + QueryParticipantTestUtils.testSearchParticipant(project, + "src/org/jboss/seam/example/numberguess/NumberGuess.java", + QueryParticipantTestUtils.TYPE_SEARCH, + "NumberGuess", + "", + new ELReferencesQueryParticipant(), + matches); + } + + public void testELReferencesQueryParticipantForMethod1(){ + ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>(); + + matches.add(new MatchStructure("/numberguess/web/giveup.jspx", "remainingGuesses")); + + QueryParticipantTestUtils.testSearchParticipant(project, + "src/org/jboss/seam/example/numberguess/NumberGuess.java", + QueryParticipantTestUtils.METHOD_SEARCH, + "getRemainingGuesses", + "", + new ELReferencesQueryParticipant(), + matches); + } + + public void testELReferencesQueryParticipantForMethod2(){ + ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>(); + + matches.add(new MatchStructure("/numberguess/web/giveup.jspx", "possibilities")); + + QueryParticipantTestUtils.testSearchParticipant(project, + "src/org/jboss/seam/example/numberguess/NumberGuess.java", + QueryParticipantTestUtils.METHOD_SEARCH, + "getPossibilities", + "", + new ELReferencesQueryParticipant(), + matches); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain