Author: scabanovich Date: 2011-09-21 15:21:08 -0400 (Wed, 21 Sep 2011) New Revision: 34933 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean3.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java Log: JBIDE-9733 https://issues.jboss.org/browse/JBIDE-9733 Tests added. Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml 2011-09-21 18:03:41 UTC (rev 34932) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml 2011-09-21 19:21:08 UTC (rev 34933) @@ -51,4 +51,79 @@ </v:method1> </v:MyBean1> +<v:MyBean3> + <s:replaces/> + <v:set1> + <s:value> + <s:String>111</s:String> + </s:value> + <s:value>112</s:value> + <s:value> + <s:Integer> + <s:parameters> + <s:String>113</s:String> + </s:parameters> + </s:Integer> + </s:value> + + </v:set1> + <v:set2> + <s:value> + <s:String>121</s:String> + </s:value> + <s:value>122</s:value> + <s:value> + <s:Integer> + <s:parameters> + <s:String>123</s:String> + </s:parameters> + </s:Integer> + </s:value> + + </v:set2> + <v:map> + <s:entry> + <s:key> + <s:Integer> + <s:parameters> + <s:String>211</s:String> + </s:parameters> + </s:Integer> + </s:key> + <s:value> + <s:Long> + <s:parameters> + <s:String>212</s:String> + </s:parameters> + </s:Long> + </s:value> + </s:entry> + <s:entry> + <s:key> + <s:Long> + <s:parameters> + <s:String>222</s:String> + </s:parameters> + </s:Long> + </s:key> + <s:value> + <s:Integer> + <s:parameters> + <s:String>221</s:String> + </s:parameters> + </s:Integer> + </s:value> + </s:entry> + </v:map> + <v:bean1> + <s:value> + <v:MyBean1></v:MyBean1> + </s:value> + </v:bean1> + <v:bean2> + <s:value> + <v:MyBean3></v:MyBean3> + </s:value> + </v:bean2> +</v:MyBean3> </beans> Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean3.java 2011-09-21 19:21:08 UTC (rev 34933) @@ -0,0 +1,17 @@ +package org.jboss.beans.validation.test; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class MyBean3 { + Set<String> set1 = new HashSet<String>(); + Set<Integer> set2 = new HashSet<Integer>(); + + Map<Integer,Long> map = new HashMap<Integer, Long>(); + + MyBean1 bean1; + MyBean1 bean2; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean3.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/SeamConfigValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-09-21 18:03:41 UTC (rev 34932) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-09-21 19:21:08 UTC (rev 34933) @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Path; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; import org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferences; import org.jboss.tools.cdi.seam.config.core.validation.SeamConfigValidationMessages; import org.jboss.tools.cdi.seam.solder.core.test.GenericBeanValidationTest; @@ -99,6 +100,27 @@ AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:field1")); } + public void testSettingInlineBeanValuesToBeanOrSetOrMap() throws CoreException { + //correct element of set assignment + AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 75); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 57); + //correct bean assignment + AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 119); + + AbstractResourceMarkerTest.assertMarkerIsCreated(f, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 61, 71, 102, 109, 124); + + //set + AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.INLINE_BEAN_TYPE_MISMATCH, "Integer", "String"), 62); + AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.INLINE_BEAN_TYPE_MISMATCH, "String", "Integer"), 72); + + //map + AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.INLINE_BEAN_TYPE_MISMATCH, "Long", "Integer"), 103); + AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.INLINE_BEAN_TYPE_MISMATCH, "Integer", "Long"), 110); + + //bean + AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.INLINE_BEAN_TYPE_MISMATCH, "MyBean3", "MyBean1"), 125); + } + public void testAddClassToResolveNode() throws CoreException { String path = "src/org/jboss/beans/validation/test/MyBean2.java"; GenericBeanValidationTest.writeFile(project, "src/org/jboss/beans/validation/test/MyBean2.template", path); Modified: 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 2011-09-21 18:03:41 UTC (rev 34932) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-09-21 19:21:08 UTC (rev 34933) @@ -265,9 +265,9 @@ assertTrue(sword.isInline()); IJavaAnnotation a1 = sword.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); assertNotNull(a1); - IJavaAnnotation a2 = f.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); + IJavaAnnotation a2 = f.getValueDefinitions().get(0).getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); assertTrue(a1 == a2); - IJavaAnnotation inject = f.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); + IJavaAnnotation inject = f.getValueDefinitions().get(0).getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); assertNotNull(inject); SeamFieldDefinition swordType = sword.getField("type"); @@ -282,9 +282,9 @@ assertTrue(horse.isInline()); a1 = horse.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); assertNotNull(a1); - a2 = f.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); + a2 = f.getValueDefinitions().get(0).getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER); assertTrue(a1 == a2); - inject = f.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); + inject = f.getValueDefinitions().get(0).getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); assertNotNull(inject); SeamFieldDefinition horseName = horse.getField("name");