Author: dgolovin Date: 2010-11-05 18:35:54 -0400 (Fri, 05 Nov 2010) New Revision: 26313 Added: trunk/common/tests/org.jboss.tools.common.el.core.test/plugin.xml trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory1.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory2.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactoryManagerTest.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ElVarSearcherTest.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ProjectNature1.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature1.java trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature2.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/CommonELAllTests.java trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java Log: https://jira.jboss.org/browse/JBIDE-3892 Increase JUnit test's coverage up to 60% Tests are added for classes in org.jboss.tools.common.el.core.resolver package Added: trunk/common/tests/org.jboss.tools.common.el.core.test/plugin.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/plugin.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/plugin.xml 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.jboss.tools.common.el.core.elResolver"> + <el-resolver> + <factory + class="org.jboss.tools.common.el.core.test.resolver.ELResolverFactory1"></factory> + <project-nature + id="org.jboss.tools.common.el.core.test.project-nature1" + resolver-class="org.jboss.tools.common.el.core.test.resolver.ResolverProjectNature1"> + </project-nature> + <project-nature + id="org.jboss.tools.common.el.core.test.project-nature1" + resolver-class="org.jboss.tools.common.el.core.test.resolver.ResolverProjectNature2"> + </project-nature> + <factory + class="org.jboss.tools.common.el.core.test.resolver.ELResolverFactory2"> + </factory> + </el-resolver> + </extension> + <extension + id="project-nature1" + point="org.eclipse.core.resources.natures"> + <runtime> + <run + class="org.jboss.tools.common.el.core.test.resolver.ProjectNature1"> + </run> + </runtime> + </extension> + +</plugin> Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/plugin.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/CommonELAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/CommonELAllTests.java 2010-11-05 22:20:39 UTC (rev 26312) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/CommonELAllTests.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.test; +import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; +import org.jboss.tools.common.el.core.test.resolver.ELResolverFactoryManagerTest; +import org.jboss.tools.common.el.core.test.resolver.ElVarSearcherTest; import org.jboss.tools.test.util.ProjectImportTestSetup; import junit.framework.Test; @@ -27,6 +30,8 @@ suite.addTestSuite(ELParserTest.class); suite.addTestSuite(ELModelTest.class); suite.addTestSuite(RelevanceCheckTest.class); + suite.addTestSuite(ElVarSearcherTest.class); + suite.addTestSuite(ELResolverFactoryManagerTest.class); return suite; } } Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory1.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory1.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory1.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,19 @@ +package org.jboss.tools.common.el.core.test.resolver; + +import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELResolverFactory; + +public class ELResolverFactory1 implements ELResolverFactory { + + public ELResolverFactory1() { + // TODO Auto-generated constructor stub + } + + @Override + public ELResolver createResolver(IResource resource) { + // TODO Auto-generated method stub + return new ResolverProjectNature1(); + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory2.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory2.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory2.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,9 @@ +package org.jboss.tools.common.el.core.test.resolver; + +public class ELResolverFactory2 { + + public ELResolverFactory2() { + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactory2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactoryManagerTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactoryManagerTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactoryManagerTest.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,34 @@ +package org.jboss.tools.common.el.core.test.resolver; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; +import org.jboss.tools.test.resource.ResourceFactory; +import org.junit.Test; + +public class ELResolverFactoryManagerTest extends TestCase{ + + public void testGetInstance() { + assertNotNull(ELResolverFactoryManager.getInstance()); + } + + public void testGetResolvers() throws CoreException, IOException { + assertNotNull(ELResolverFactoryManager.getInstance().getResolvers(ResourceFactory.createFile("test"))); + assertTrue(ELResolverFactoryManager.getInstance().getResolvers(ResourceFactory.createFile("test")).length==0); + + String fileContent = "<html><body var=\"test1\" value=\"#{value1}\"><p var=\"test2\" value=\"#{value2}\"/></body></html>"; + IFile file = ResourceFactory.createFile(fileContent,"Test1","test1.xml"); + IProjectDescription descr = file.getProject().getDescription(); + descr.setNatureIds(new String[] {ProjectNature1.ID}); + file.getProject().setDescription(descr, null); + ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file); + assertTrue("Expected 2 relovers to be loaded because of other two don't implement appropriate interfaces",resolvers.length==2); + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ELResolverFactoryManagerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ElVarSearcherTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ElVarSearcherTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ElVarSearcherTest.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,72 @@ +package org.jboss.tools.common.el.core.test.resolver; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jface.text.BadLocationException; +import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; +import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; +import org.jboss.tools.common.el.core.resolver.Var; +import org.jboss.tools.common.text.TextProposal; +import org.jboss.tools.test.resource.ResourceFactory; + +public class ElVarSearcherTest extends TestCase{ + + public void testSetFile() { + ELCompletionEngine fakeEngine = new FakeELCompletionEngine(); + IFile file = ResourceFactory.createFile("${test}"); + ElVarSearcher varSearcher = new ElVarSearcher(null,fakeEngine); + varSearcher.setFile(file); + } + + public void testFindAllVarsIFileInt() throws CoreException, IOException { + ELCompletionEngine fakeEngine = new FakeELCompletionEngine(); + String fileContent = "<html><body var=\"test1\" value=\"#{value1}\"><p var=\"test2\" value=\"#{value2}\"/></body></html>"; + IFile file = ResourceFactory.createFile(fileContent,"Test1","test.xml"); + ElVarSearcher varSearcher = new ElVarSearcher(file,fakeEngine); + List<Var> vars = varSearcher.findAllVars(file,fileContent.indexOf("#{value2}")); + assertTrue(vars.size()==2); + } + + private static class FakeELCompletionEngine implements ELCompletionEngine { + public ELResolution resolveELOperand(IFile file, + ELExpression operand, boolean returnEqualedVariablesOnly, + List<Var> vars, ElVarSearcher varSearcher) + throws BadLocationException, StringIndexOutOfBoundsException { + return new ELResolutionImpl(operand); + } + + public ELParserFactory getParserFactory() { + return ELParserUtil.getJbossFactory(); + } + + public List<TextProposal> getProposals(ELContext context, String el, int offset) { + return Collections.emptyList(); + } + + public ELResolution resolve(ELContext context, ELExpression operand, int offset) { + return new ELResolutionImpl(operand); + } + + public List<TextProposal> getProposals(ELContext context, int offset) { + return Collections.emptyList(); + } + + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + return null; + } + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ElVarSearcherTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ProjectNature1.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ProjectNature1.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ProjectNature1.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,29 @@ +package org.jboss.tools.common.el.core.test.resolver; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectNature; +import org.eclipse.core.runtime.CoreException; + +public class ProjectNature1 implements IProjectNature { + public static final String ID = "org.jboss.tools.common.el.core.test.project-nature1"; + IProject prj; + + @Override + public void configure() throws CoreException { + } + + @Override + public void deconfigure() throws CoreException { + } + + @Override + public IProject getProject() { + return prj; + } + + @Override + public void setProject(IProject project) { + prj = project; + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ProjectNature1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature1.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature1.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature1.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,52 @@ +package org.jboss.tools.common.el.core.test.resolver; +import java.util.List; + +import org.eclipse.jdt.core.IJavaElement; +import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; +import org.jboss.tools.common.text.TextProposal; + + +public class ResolverProjectNature1 implements ELResolver { + + public ResolverProjectNature1() { + // TODO Auto-generated constructor stub + } + + @Override + public List<TextProposal> getProposals(ELContext context, String el, + int offset) { + // TODO Auto-generated method stub + return null; + } + + @Override + public List<TextProposal> getProposals(ELContext context, int offset) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ELResolution resolve(ELContext context, ELExpression operand, + int offset) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ELParserFactory getParserFactory() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature2.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature2.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature2.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,8 @@ +package org.jboss.tools.common.el.core.test.resolver; + +public class ResolverProjectNature2 { + + public ResolverProjectNature2() { + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/ResolverProjectNature2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-11-05 22:20:39 UTC (rev 26312) +++ trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-11-05 22:35:54 UTC (rev 26313) @@ -11,9 +11,11 @@ org.eclipse.ui.ide, org.apache.xerces;bundle-version="[2.9.0,3.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="3.5.0", - org.eclipse.text;bundle-version="3.5.0" + org.eclipse.text;bundle-version="3.5.0", + org.eclipse.ui.ide.application;bundle-version="1.0.200" Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.tools.test.util, +Export-Package: org.jboss.tools.test.resource, + org.jboss.tools.test.util, org.jboss.tools.test.util.xpl, org.jboss.tools.tests Bundle-ClassPath: . Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -0,0 +1,65 @@ +package org.jboss.tools.test.resource; + +import java.io.IOException; +import java.io.StringBufferInputStream; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.jboss.tools.test.util.ResourcesUtils; + +public class ResourceFactory { + + static public final IFile createFile(String content) { + Object proxy = Proxy.newProxyInstance(IFile.class.getClassLoader(), new Class<?> [] {IFile.class}, new FileInvocationHandler(content)); + return (IFile)proxy; + } + + static public final IFile createFile(String content, IPath fullPath) { + Object proxy = Proxy.newProxyInstance(IFile.class.getClassLoader(), new Class<?> [] {IFile.class}, new FileInvocationHandler(content,fullPath)); + return (IFile)proxy; + } + + static public final IFile createFile(String content, String project, String fileName) throws CoreException, IOException { + IProject prj = ResourcesUtils.createEclipseProject("Test"); + IFile result = prj.getFile(fileName); + result.create(new StringBufferInputStream(content), true, null); + return result; + } + + public static class FileInvocationHandler implements InvocationHandler { + + private String content; + private IPath fullPath; + + public FileInvocationHandler(String content) { + super(); + this.content = content; + } + + public FileInvocationHandler(String content,IPath fullPath) { + this(content); + this.fullPath = fullPath; + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) + throws Throwable { + Object result = null; + if(method.equals(IFile.class.getMethod("getContents"))) { + result = new StringBufferInputStream(content); + } else if(method.equals(IFile.class.getMethod("exists"))) { + result = Boolean.TRUE; + } else if(method.equals(IFile.class.getMethod("getFullPath"))){ + result = fullPath; + } + return result; + } + + + } +} Property changes on: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-05 22:20:39 UTC (rev 26312) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-05 22:35:54 UTC (rev 26313) @@ -15,7 +15,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.io.StringBufferInputStream; import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -111,6 +113,21 @@ return project; } + public static IProject createEclipseProject(String name) + throws CoreException, IOException { + String descriptionText = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><projectDescription><name>{0}</name></projectDescription>"; + IProjectDescription descr = ResourcesPlugin.getWorkspace().loadProjectDescription(new StringBufferInputStream(MessageFormat.format(descriptionText,name))); + descr.setLocation(null); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( + descr.getName()); + NullProgressMonitor nullProgress = new NullProgressMonitor(); + if(!project.exists()) { + project.create(descr, nullProgress); + } + project.open(IResource.BACKGROUND_REFRESH, nullProgress); + return project; + } + public static IProject createEclipseProject(Bundle bundle, String templateLocation) throws CoreException, IOException {