Author: scabanovich Date: 2011-04-26 19:12:40 -0400 (Tue, 26 Apr 2011) New Revision: 30858 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/NewQualifier.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/Report.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ReportDatasource.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ExtensionTest.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:config="urn:java:org.jboss.test.config" + xmlns:test602="urn:java:org.jboss.test602.report" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> +<config:MyAnnotation> + <s:Qualifier1/> +</config:MyAnnotation> + +<test602:Report> + <s:modifies/> + <test602:NewQualifier/> +</test602:Report> + +<test602:ReportDatasource> + <s:replaces/> + <test602:NewQualifier/> +</test602:ReportDatasource> + +</beans> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/NewQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/NewQualifier.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/NewQualifier.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,21 @@ +package org.jboss.test602.report; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Qualifier +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface NewQualifier { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/NewQualifier.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/Report.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/Report.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/Report.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,5 @@ +package org.jboss.test602.report; + +public class Report { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/Report.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ReportDatasource.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ReportDatasource.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ReportDatasource.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,5 @@ +package org.jboss.test602.report; + +public class ReportDatasource { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test602/report/ReportDatasource.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-04-26 23:11:51 UTC (rev 30857) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -26,7 +26,10 @@ TestSuite suiteAll = new TestSuite("CDI Config Core Tests"); suiteAll.addTestSuite(ExtensionTest.class); + suiteAll.addTestSuite(SeamDefinitionsTest.class); - return suiteAll; + SeamConfigTestSetup suite = new SeamConfigTestSetup(suiteAll); + + return suite; } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ExtensionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ExtensionTest.java 2011-04-26 23:11:51 UTC (rev 30857) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ExtensionTest.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -3,40 +3,19 @@ import java.io.IOException; import java.util.Set; -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.IBeanMember; import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; /** * * @author Viacheslav Kabanovich * */ -public class ExtensionTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.config.core.test"; - IProject project = null; - +public class ExtensionTest extends SeamConfigTest { public ExtensionTest() {} - public void setUp() throws Exception { - project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDIConfigTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - public void testExtension() throws CoreException, IOException { ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,127 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.seam.config.core.test; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature; +import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension; +import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext; +import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition; +import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition; +import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SeamConfigTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.config.core.test"; + protected static String PROJECT_NAME = "CDIConfigTest"; + protected static String PROJECT_PATH = "/projects/CDIConfigTest"; + + protected IProject project; + protected ICDIProject cdiProject; + + public SeamConfigTest() { + project = getTestProject(); + cdiProject = CDICorePlugin.getCDIProject(project, false); + } + + public IProject getTestProject() { + if(project==null) { + try { + project = findTestProject(); + if(project==null || !project.exists()) { + project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import CDI test project: " + e.getMessage()); + } + } + return project; + } + + public static IProject findTestProject() { + return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + } + + protected CDISeamConfigExtension getConfigExtension(ICDIProject cdi) { + Set<IBuildParticipantFeature> bp = cdi.getNature().getExtensionManager().getBuildParticipantFeature(); + for (IBuildParticipantFeature p: bp) { + if(p instanceof CDISeamConfigExtension) { + return (CDISeamConfigExtension)p; + } + } + return null; + + } + + protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) { + IFile file = cdi.getNature().getProject().getFile(beanClassFilePath); + Set<IBean> beans = cdi.getBeans(file.getFullPath()); + Iterator<IBean> it = beans.iterator(); + while(it.hasNext()) { + IBean b = it.next(); + if(b instanceof IProducer) it.remove(); + } + assertEquals("Wrong number of the beans", 1, beans.size()); + Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints(); + for (IInjectionPoint injectionPoint : injections) { + if(injectionPoint instanceof IInjectionPointField) { + IInjectionPointField field = (IInjectionPointField)injectionPoint; + if(fieldName.equals(field.getField().getElementName())) { + return field; + } + } + } + fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath); + return null; + } + + protected SeamBeansDefinition getBeansDefinition(ConfigDefinitionContext context, String path) { + IFile f = project.getFile(path); + assertNotNull(f); + assertTrue(f.exists()); + SeamBeansDefinition d = context.getDefinition(f.getFullPath()); + assertNotNull(d); + return d; + } + + protected Set<SeamBeanDefinition> findBeanDefinitionByTagName(SeamBeansDefinition seamBeans, String tagname) { + Set<SeamBeanDefinition> ds = new HashSet<SeamBeanDefinition>(); + Set<SeamBeanDefinition> all = seamBeans.getBeanDefinitions(); + for (SeamBeanDefinition d: all) { + SAXElement e = d.getElement(); + if(tagname.equals(e.getName())) { + ds.add(d); + } + } + return ds; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.seam.config.core.test; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Viacheslav Kabanovich + */ +public class SeamConfigTestSetup extends TestSetup { + + protected IProject project; + + public SeamConfigTestSetup(Test test) { + super(test); + } + + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamConfigTest.PROJECT_NAME); + if(project == null || !project.exists()) { + project = ResourcesUtils.importProject(SeamConfigTest.PLUGIN_ID, SeamConfigTest.PROJECT_PATH); + } + } + + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-26 23:12:40 UTC (rev 30858) @@ -0,0 +1,48 @@ +package org.jboss.tools.cdi.seam.config.core.test; + +import java.io.IOException; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IJavaAnnotation; +import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature; +import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension; +import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext; +import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition; +import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition; +import org.jboss.tools.common.text.ITextSourceReference; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SeamDefinitionsTest extends SeamConfigTest { + public SeamDefinitionsTest() {} + + public void testBeansWithReplacesAndModifies() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext(); + SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml"); + + Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test602:Report"); + assertEquals(1, ds.size()); + SeamBeanDefinition report = ds.iterator().next(); + ITextSourceReference modifies = report.getModifiesLocation(); + assertNotNull(modifies); + IJavaAnnotation annotation = report.getAnnotation("org.jboss.test602.report.NewQualifier"); + assertNotNull(annotation); + + ds = findBeanDefinitionByTagName(d, "test602:ReportDatasource"); + assertEquals(1, ds.size()); + SeamBeanDefinition reportDatasource = ds.iterator().next(); + ITextSourceReference replaces = reportDatasource.getReplacesLocation(); + assertNotNull(replaces); + + + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain