Author: scabanovich
Date: 2011-09-29 13:08:40 -0400 (Thu, 29 Sep 2011)
New Revision: 35164
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
Log:
JBIDE-9777
https://issues.jboss.org/browse/JBIDE-9777
Vetoing type definition in dependent projects is improved.
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java 2011-09-29
17:08:40 UTC (rev 35164)
@@ -0,0 +1,24 @@
+package org.jboss.beans.test01;
+
+import javax.inject.Named;
+/**
+ * Test 07-1.
+ * Sources contain simple bean class MyBean1 with qualifier
@Named("test07-1-a").
+ * Seam config xml in a dependent project contains declaration:
+ * <test07:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test07-1-b</s:Named>
+ * </test07:MyBean1>
+ *
+ * ASSERT: Model contains 1 named bean with name "test07-1-a".
+ * ASSERT: Model contains no named bean with name "test07-1-b".
+ * ASSERT: Model of dependent project contains no named bean with name
"test07-1-a".
+ * ASSERT: Model of dependent project contains 1 named bean with name
"test07-1-b".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@Named("test07-1-a")
+public class MyBean1 {
+
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml 2011-09-29
17:08:40 UTC (rev 35164)
@@ -0,0 +1,14 @@
+<?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:test07="urn:java:org.jboss.beans.test07"
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://jboss.org/schema/cdi/beans_1_0.xsd">
+
+<!-- Test 07-1 -->
+<test07:MyBean1>
+ <s:modifies/>
+ <s:Named>test07-1-b</s:Named>
+</test07:MyBean1>
+
+</beans>
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
___________________________________________________________________
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/SeamBeansTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-29
17:07:07 UTC (rev 35163)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-29
17:08:40 UTC (rev 35164)
@@ -756,6 +756,33 @@
}
+ /**
+ * Test 07-1.
+ * Sources contain simple bean class MyBean1 with qualifier
@Named("test07-1-a").
+ * Seam config xml in a dependent project contains declaration:
+ * <test07:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test07-1-b</s:Named>
+ * </test07:MyBean1>
+ *
+ * ASSERT: Model contains 1 named bean with name "test07-1-a".
+ * ASSERT: Model contains no named bean with name "test07-1-b".
+ * ASSERT: Model of dependent project contains no named bean with name
"test07-1-a".
+ * ASSERT: Model of dependent project contains 1 named bean with name
"test07-1-b".
+ */
+ public void testModifyingBeanInDependentProject() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false,
"org.jboss.beans.test07.MyBean1");
+ assertEquals(1, beans1.size());
+ IBean b = beans1.iterator().next();
+ assertEquals("test07-1-a", b.getName());
+
+ //The same in dependent project
+ beans1 = cdiDependentProject.getBeans(false,
"org.jboss.beans.test07.MyBean1");
+ assertEquals(1, beans1.size());
+ b = beans1.iterator().next();
+ assertEquals("test07-1-b", b.getName());
+ }
+
protected Set<IBean> getBeansByClassName(String className) {
return cdiProject.getBeans(false, className, new String[0]);
}