Author: akazakov Date: 2011-09-09 20:02:46 -0400 (Fri, 09 Sep 2011) New Revision: 34622 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/resin-javaee-4.0.16.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-3.0.0.CR1.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-api-3.0.0.CR1.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/MyQualifier.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/ Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/.project 2011-09-09 22:57:44 UTC (rev 34621) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/.project 2011-09-10 00:02:46 UTC (rev 34622) @@ -43,7 +43,6 @@ <nature>org.jboss.tools.jst.web.kb.kbnature</nature> <nature>org.jboss.tools.cdi.core.cdinature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.jboss.tools.jsf.jsfnature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature> </natures> </projectDescription> Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/resin-javaee-4.0.16.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/resin-javaee-4.0.16.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-3.0.0.CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-3.0.0.CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-api-3.0.0.CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/seam-jms-api-3.0.0.CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java 2011-09-10 00:02:46 UTC (rev 34622) @@ -0,0 +1,42 @@ +package org.jboss.tools.seam.jms.validation.test; + +import javax.inject.Inject; +import javax.jms.Connection; +import javax.jms.Queue; +import javax.jms.QueueReceiver; +import javax.jms.QueueSender; +import javax.jms.Session; +import javax.jms.Topic; +import javax.jms.TopicPublisher; +import javax.jms.TopicSubscriber; + +import org.jboss.seam.jms.annotations.JmsDestination; + +public class JmsResourceInjection { + + @Inject Queue broken; + + @Inject @JmsDestination(jndiName = "/jms/Q") Connection cOk; + @Inject @MyQualifier Connection c1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") Session sOk; + @Inject @MyQualifier Session s1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") Topic tOk; + @Inject @MyQualifier Topic t1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") Queue qOk; + @Inject @MyQualifier Queue q1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") TopicPublisher tpOk; + @Inject @MyQualifier TopicPublisher tp1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") QueueSender qsOk; + @Inject @MyQualifier QueueSender qs1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") TopicSubscriber tsOk; + @Inject @MyQualifier TopicSubscriber ts1Ok; + + @Inject @JmsDestination(jndiName = "/jms/Q") QueueReceiver qrOk; + @Inject @MyQualifier QueueReceiver qr1Ok; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/MyQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/MyQualifier.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/MyQualifier.java 2011-09-10 00:02:46 UTC (rev 34622) @@ -0,0 +1,24 @@ +package org.jboss.tools.seam.jms.validation.test; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import org.jboss.seam.jms.annotations.JmsDestination; + +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 +@JmsDestination(jndiName = "/jms/Q") +public @interface MyQualifier { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/src/org/jboss/tools/seam/jms/validation/test/MyQualifier.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-09-09 22:57:44 UTC (rev 34621) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-09-10 00:02:46 UTC (rev 34622) @@ -17,6 +17,7 @@ import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.cdi.seam.core.test.international.BundleModelTest; import org.jboss.tools.cdi.seam.core.test.international.SeamResourceBundlesTest; +import org.jboss.tools.cdi.seam.core.test.jms.SeamJmsValidationTest; import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTest; import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTestSetup; import org.jboss.tools.cdi.seam.core.test.servlet.SeamServletValidationTest; @@ -41,6 +42,7 @@ suite.addTestSuite(SeamServletValidationTest.class); suite.addTestSuite(SeamResourceBundlesTest.class); suite.addTestSuite(BundleModelTest.class); + suite.addTestSuite(SeamJmsValidationTest.class); suiteAll.addTest(new SeamCoreTestSetup(suite)); suite = new TestSuite("Seam Persistence Project Tests"); Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java 2011-09-10 00:02:46 UTC (rev 34622) @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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.core.test.jms; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; +import org.jboss.tools.cdi.seam.core.test.international.SeamCoreTest; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class SeamJmsValidationTest extends SeamCoreTest { + + /** + * See https://issues.jboss.org/browse/JBIDE-9685 + * + * @throws Exception + */ + public void testJmsResourceInjection() throws Exception { + IFile file = getTestProject().getFile("src/org/jboss/tools/seam/jms/validation/test/JmsResourceInjection.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 17); + assertNoError(file, 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41); + } + + private void assertNoError(IFile file, Integer... integers) throws Exception { + for (Integer integer : integers) { + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, integer); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, integer); + } + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain