[webbeans-commits] Webbeans SVN: r1152 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-21 16:44:44 -0500 (Wed, 21 Jan 2009)
New Revision: 1152
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java
Log:
Added validation related to @New annotation and other bindings.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java 2009-01-21 20:29:00 UTC (rev 1151)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java 2009-01-21 21:44:44 UTC (rev 1152)
@@ -21,7 +21,9 @@
import java.util.Set;
import javax.webbeans.AmbiguousDependencyException;
+import javax.webbeans.DefinitionException;
import javax.webbeans.InjectionPoint;
+import javax.webbeans.New;
import javax.webbeans.NullableDependencyException;
import javax.webbeans.UnproxyableDependencyException;
import javax.webbeans.UnsatisfiedDependencyException;
@@ -54,6 +56,10 @@
for (InjectionPoint injectionPoint : bean.getInjectionPoints())
{
Class<?> type = (Class<?>) injectionPoint.getType();
+ if (injectionPoint.getAnnotation(New.class) != null && injectionPoint.getBindings().size() > 1)
+ {
+ throw new DefinitionException("The injection point " + injectionPoint + " is annotated with @New which cannot be combined with other binding types");
+ }
Annotation[] bindingTypes = injectionPoint.getBindings().toArray(new Annotation[0]);
Set<?> resolvedBeans = CurrentManager.rootManager().resolveByType(type, bindingTypes);
if (resolvedBeans.isEmpty())
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-21 20:29:00 UTC (rev 1151)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-21 21:44:44 UTC (rev 1152)
@@ -30,10 +30,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -45,10 +45,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -60,10 +60,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -76,10 +76,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -91,10 +91,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "stub", "new" })
@@ -106,10 +106,10 @@
/**
* If the parameter type satisfies the definition of a simple Web Bean
- * implementation class, Section 3.2.1, �Which Java classes are simple Web
- * Beans?�, then the Web Bean is a simple Web Bean. If the parameter type
+ * implementation class, Section 3.2.1, �Which Java classes are simple Web
+ * Beans?�, then the Web Bean is a simple Web Bean. If the parameter type
* satisfies the definition of an enterprise Web Bean implementation class,
- * Section 3.3.2, �Which EJBs are enterprise Web Beans?�, then the Web Bean
+ * Section 3.3.2, �Which EJBs are enterprise Web Beans?�, then the Web Bean
* is an enterprise Web Bean.
*/
@Test(groups = { "new", "stub" })
@@ -120,15 +120,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -138,15 +138,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -156,15 +156,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = {"new", "stub" })
@SpecAssertion(section = "3.9")
@@ -174,15 +174,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -192,15 +192,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -210,15 +210,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -228,15 +228,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "stub", "new" })
@SpecAssertion(section = "3.9")
@@ -246,15 +246,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.9")
@@ -335,7 +335,7 @@
* enterprise Web Bean implementation class, a DefinitionException is thrown
* by the container at deployment time.
*/
- @Test(groups = { "new" , "broken"}, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.9")
public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-21 20:29:00 UTC (rev 1151)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-21 21:44:44 UTC (rev 1152)
@@ -32,10 +32,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -47,10 +47,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -62,10 +62,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -78,10 +78,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "new" })
@@ -93,10 +93,10 @@
/**
* When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
+ * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
+ * stereotypes, and such that � the implementation class is the
* declared type of the injection point.
*/
@Test(groups = { "stub", "new" })
@@ -107,15 +107,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = {"new", "stub" })
@SpecAssertion(section = "3.9")
@@ -125,15 +125,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -143,15 +143,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
@@ -161,15 +161,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new" , "stub"})
@SpecAssertion(section = "3.9")
@@ -181,15 +181,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "stub", "new" })
@SpecAssertion(section = "3.9")
@@ -199,15 +199,15 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
+ * Furthermore, this Web Bean: � has the same Web Bean constructor,
* initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
+ * annotations� that is, it has any Web Bean constructor, initializer method
* or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
+ * implementation class, � has no observer methods, producer methods or
+ * fields or disposal methods, � has the same interceptors as a Web Bean
+ * defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * � has no decorators.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.9")
@@ -288,7 +288,7 @@
* enterprise Web Bean implementation class, a DefinitionException is thrown
* by the container at deployment time.
*/
- @Test(groups = { "new", "broken" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.9")
public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
{
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1151 - doc/trunk/reference/it-IT.
by webbeans-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-01-21 15:29:00 -0500 (Wed, 21 Jan 2009)
New Revision: 1151
Modified:
doc/trunk/reference/it-IT/injection.po
Log:
Update italian translation
Modified: doc/trunk/reference/it-IT/injection.po
===================================================================
--- doc/trunk/reference/it-IT/injection.po 2009-01-21 20:26:13 UTC (rev 1150)
+++ doc/trunk/reference/it-IT/injection.po 2009-01-21 20:29:00 UTC (rev 1151)
@@ -479,7 +479,7 @@
#: injection.xml:162
#, no-c-format
msgid "The default binding type"
-msgstr "The tipo di binding predefinito"
+msgstr "Il tipo di binding predefinito"
#. Tag: para
#: injection.xml:164
@@ -936,7 +936,7 @@
#: injection.xml:419
#, no-c-format
msgid "Lifecycle callbacks, <literal>@Resource</literal>, <literal>@EJB</literal> and <literal>@PersistenceContext</literal>"
-msgstr "Lifecycle callbacks, <literal>@Resource</literal>, <literal>@EJB</literal> e <literal>@PersistenceContext</literal>"
+msgstr "Chiamare al ciclo di vita, <literal>@Resource</literal>, <literal>@EJB</literal> e <literal>@PersistenceContext</literal>"
#. Tag: para
#: injection.xml:422
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1150 - doc/trunk/reference/it-IT.
by webbeans-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-01-21 15:26:13 -0500 (Wed, 21 Jan 2009)
New Revision: 1150
Modified:
doc/trunk/reference/it-IT/ri.po
Log:
Update italian translation
Modified: doc/trunk/reference/it-IT/ri.po
===================================================================
--- doc/trunk/reference/it-IT/ri.po 2009-01-21 19:28:15 UTC (rev 1149)
+++ doc/trunk/reference/it-IT/ri.po 2009-01-21 20:26:13 UTC (rev 1150)
@@ -227,7 +227,7 @@
#: ri.xml:154
#, no-c-format
msgid "The numberguess example"
-msgstr "L'esempio Indovina Numero"
+msgstr "Esempio Indovina Numero"
#. Tag: para
#: ri.xml:156
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1149 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization: producer/method and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-21 14:28:15 -0500 (Wed, 21 Jan 2009)
New Revision: 1149
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
Log:
A few misunderstood assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-21 19:28:15 UTC (rev 1149)
@@ -54,9 +54,9 @@
}
@Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
- public void testSpecializedBeanHasNonDefaultName()
+ public void testSpecializingAndSpecializedBeanHasName()
{
- deployBeans(FarmYard_Broken.class);
+ //deployBeans(FarmYard_Broken.class);
}
@Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.2.7"})
@@ -74,10 +74,10 @@
}
@Test(groups="broken") @SpecAssertion(section="4.3.1")
- public void testProducerMethodOnSpecializedBeanNotDeployed()
+ public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean()
{
- deployBeans(Office.class, Building.class);
- assert manager.resolveByType(Waste.class).size() == 0;
+ //deployBeans(Office.class, Building.class);
+ //assert manager.resolveByType(Waste.class).size() == 0;
}
@Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-21 19:28:15 UTC (rev 1149)
@@ -52,9 +52,9 @@
}
@Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
- public void testSpecializedBeanHasNonDefaultName()
+ public void testSpecializingAndSpecializedBeanHasName()
{
- deployBeans(HighSchool_Broken.class);
+ //deployBeans(HighSchool_Broken.class);
}
@Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.4.5"})
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-21 19:28:15 UTC (rev 1149)
@@ -54,9 +54,9 @@
}
@Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
- public void testSpecializedBeanHasNonDefaultName()
+ public void testSpecializingAndSpecializedBeanHasName()
{
- deployBeans(FarmYard_Broken.class);
+ //deployBeans(FarmYard_Broken.class);
}
@Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.3.7"})
@@ -74,10 +74,10 @@
}
@Test(groups="broken") @SpecAssertion(section="4.3.1")
- public void testProducerMethodOnSpecializedBeanNotDeployed()
+ public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean()
{
- deployBeans(Office.class, Building.class);
- assert manager.resolveByType(Waste.class).size() == 0;
+ //deployBeans(Office.class, Building.class);
+ //assert manager.resolveByType(Waste.class).size() == 0;
}
@Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1148 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: inheritance/specialization and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-21 14:08:40 -0500 (Wed, 21 Jan 2009)
New Revision: 1148
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Egg.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Office.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/TractorLocal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Waste.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/YardInterface.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanSpecializationTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
Log:
Add enterprise bean specialization tests
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -1,7 +1,6 @@
package org.jboss.webbeans.tck.unit.implementation.enterprise;
import javax.webbeans.DefinitionException;
-import javax.webbeans.DeploymentException;
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
@@ -158,22 +157,6 @@
}
/**
- * However, in any deployment, there may be at most one most specialized
- * enabled enterprise Web Bean for any particular EJB enterprise bean.
- * Therefore, for each distinct EJB name in a module, there is at most one
- * Web Bean that may be called at runtime. If there is more than one most
- * specialized enabled enterprise Web Bean for a particular EJB enterprise
- * bean, a DeploymentException is thrown by the Web Bean manager at
- * initialization time.
- */
- @Test(groups = { "enterpriseBeans", "stub" }, expectedExceptions = DeploymentException.class)
- @SpecAssertion(section = "3.3")
- public void testOnlyOneEnabledSpecializedEnterpriseBeanForImplmentation()
- {
- assert false;
- }
-
- /**
* If the implementation class of an enterprise Web Bean is annotated @Interceptor
* or @Decorator, a DefinitionException is thrown by the Web Bean manager at
* initialization time.
@@ -350,14 +333,4 @@
assert createEnterpriseBean(Pitbull.class).getName().equals("pitbull");
}
- /**
- * An enterprise bean proxy implements all local interfaces of the EJB.
- */
- @Test(groups = { "specialization", "enterpriseBeans", "clientProxy", "stub" })
- @SpecAssertion(section = "3.3.8")
- public void testEnterpriseBeanProxyImplementsAllLocalInterfaces()
- {
- assert false;
- }
-
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -1,144 +0,0 @@
-package org.jboss.webbeans.tck.unit.implementation.enterprise;
-
-import javax.webbeans.DefinitionException;
-import javax.webbeans.DeploymentException;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.tck.AbstractTest;
-import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.testng.annotations.Test;
-
-/**
- * Sections
- *
- * 3.3.6. Specializing an enterprise Web Bean
- *
- * @author Nicklas Karlsson
- */
-@SpecVersion("20081206")
-public class EnterpriseBeanSpecializationTest extends AbstractTest
-{
-
- /**
- * If an implementation class of an enterprise Web Bean X defined using
- * annotations is annotated @Specializes, then the implementation class of X
- * must directly extend the implementation class of another enterprise Web
- * Bean Y defined using annotations. If the implementation class of X does
- * not directly extend the implementation class of another enterprise Web
- * Bean, a DefinitionException is thrown by the Web Bean manager at
- * initialization time
- */
- @Test(groups = { "specialization", "enterpriseBeans", "stub" })
- @SpecAssertion(section = "3.3.6")
- public void testAnnotationDefinedSpecializingEnterpriseBeanMustDirectlyExtendAnotherAnnotationDefinedEnterpriseBean()
- {
- assert false;
- }
-
- /**
- * X inherits all binding types of Y
- */
- @Test(groups = { "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testSpecializingBeanInheritsBindingTypes()
- {
- Bean<Hound> hound = createEnterpriseBean(Hound.class);
- Bean<HoundOfBaskerville> houndOfBaskerville = createEnterpriseBean(HoundOfBaskerville.class);
- assert compareBindingTypesOK(hound, houndOfBaskerville);
- }
-
- private boolean compareBindingTypesOK(Bean<Hound> hound, Bean<HoundOfBaskerville> houndOfBaskerville)
- {
- if (hound.getBindings().size() != houndOfBaskerville.getBindings().size())
- {
- return false;
- }
- if (!hound.getBindings().containsAll(houndOfBaskerville.getBindings()))
- {
- return false;
- }
- if (!houndOfBaskerville.getBindings().containsAll(hound.getBindings()))
- {
- return false;
- }
- return true;
- }
-
- /**
- * if Y has a name, X has the same name as Y.
- */
- @Test(groups = { "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testSpecializingBeanInheritsNameIfAny()
- {
- // Create the specialized class
- createEnterpriseBean(Hound.class);
- Bean<HoundOfBaskerville> houndOfBaskerville = createEnterpriseBean(HoundOfBaskerville.class);
- assert houndOfBaskerville.getName().equals("Pongo");
- }
-
- /**
- * X must support all local interfaces supported by Y. Otherwise, a
- * DefinitionException is thrown by the Web Bean manager at initialization
- * time.
- */
- @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testSpecializingNotSupportingLocalInterfacesOfSpecializedFails()
- {
- assert false;
- }
-
- /**
- * if Y supports a bean-class local view, X must also support a bean-class
- * local view. Otherwise, a DefinitionException is thrown by the Web Bean
- * manager at initialization time.
- */
- @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testSpecializingNotSupportingLocalViewOfSpecializedFails()
- {
- assert false;
- }
-
- /**
- * We say that X directly specializes Y, and we can be certain that Y will
- * never be instantiated or called by the Web Bean manager if X is enabled.
- */
- @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testEnabledSpecializationOverridesSpecialized()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testXMLDefinedSpecializationOnAnnotationDefinedBean()
- {
- assert false;
- }
-
- @Test(expectedExceptions = DeploymentException.class, groups = { "stub", "enterpriseBeans", "specialization" })
- @SpecAssertion(section = "3.3")
- public void testMultipleEnabledSpecializedEnterpriseBeanFails()
- {
- assert false;
- }
-
- @Test(expectedExceptions = DefinitionException.class, groups = { "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testAnnotationDefinedSpecializingEnterpriseBeanNotDirectlyExtendingAnnotationDefinedEnterpriseBeanFails()
- {
- createEnterpriseBean(GreaterDane.class);
- }
-
- @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "specialization", "enterpriseBeans" })
- @SpecAssertion(section = "3.3.6")
- public void testXMLDefinedSpecializingEnterpriseBeanNotImplementingAnnotationDefinedEnterpriseBeanFails()
- {
- assert false;
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Animal.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Produces;
+
+@Stateful
+class Building implements BuildingInterface
+{
+
+ @Produces
+ public Waste getWaste()
+ {
+ return new Waste();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+interface BuildingInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class Cow_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class Donkey_Broken implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Egg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Egg.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Egg.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+class Egg
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Egg.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,119 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.DefinitionException;
+import javax.webbeans.InconsistentSpecializationException;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.testng.annotations.Test;
+
+import sun.swing.SwingUtilities2.Section;
+
+/**
+ * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
+ *
+ */
+public class EnterpriseBeanSpecializationTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
+ deploymentTypes.addAll(getStandardDeploymentTypes());
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
+ assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ public void testSpecializingBeanHasNameOfSpecializedBean()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
+ public void testSpecializedBeanHasNonDefaultName()
+ {
+ deployBeans(FarmYard_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.2.7"})
+ public void testSpecializedBeanNotInstantiated()
+ {
+ deployBeans(LazyFarmer.class, Farmer.class);
+ Farmer farmer = manager.getInstanceByType(Farmer.class, LANDOWNER_LITERAL);
+ assert farmer.getClassName().equals(LazyFarmer.class.getName());
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
+ {
+ deployBeans(OrganicFarmer_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section="4.3.1")
+ public void testProducerMethodOnSpecializedBeanNotDeployed()
+ {
+ deployBeans(Office.class, Building.class);
+ assert manager.resolveByType(Waste.class).size() == 0;
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testTwoBeansSpecializeTheSameBean()
+ {
+ deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializingClassDirectlyExtendsSimpleBean()
+ {
+ deployBeans(Tractor_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializingClassDirectlyExtendsNothing()
+ {
+ deployBeans(Cow_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
+ {
+ deployBeans(Donkey_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
+ {
+ assert false;
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.webbeans.Named;
+
+
+@Named("plough")
+class FarmEquipment
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class FarmYard_Broken extends Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Named;
+
+
+@Landowner
+@Named
+@Stateful
+class Farmer implements FarmerInterface
+{
+
+ public String getClassName()
+ {
+ return Farmer.class.getName();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface FarmerInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class FishFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Landowner
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Lazy
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,19 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+
+@Specializes @Lazy
+@AnotherDeploymentType
+@Stateful
+class LazyFarmer extends Farmer
+{
+
+ @Override
+ public String getClassName()
+ {
+ return LazyFarmer.class.getName();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Office.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Office.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+
+
+
+@AnotherDeploymentType
+@Stateful
+class Office extends Building
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Office.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@Stateful
+class OrganicFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes @AnotherDeploymentType
+@Stateful
+class SheepFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/TractorLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/TractorLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+interface TractorLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/TractorLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class Tractor_Broken extends FarmEquipment implements TractorLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Waste.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Waste.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+class Waste
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Waste.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Named;
+
+@Named("backyard")
+@Stateful
+class Yard implements YardInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/YardInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/YardInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+interface YardInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/YardInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-21 19:08:40 UTC (rev 1148)
@@ -34,7 +34,7 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.3.7"})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
deployBeans(LazyFarmer.class);
@@ -44,7 +44,7 @@
assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
}
- @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.3.7"})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
deployBeans(LazyFarmer.class);
@@ -59,7 +59,7 @@
deployBeans(FarmYard_Broken.class);
}
- @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.2.7"})
+ @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.3.7"})
public void testSpecializedBeanNotInstantiated()
{
deployBeans(LazyFarmer.class, Farmer.class);
@@ -86,20 +86,20 @@
deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
}
- @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
- public void testSpecializedClassDirectlyExtendsEnterpriseBean()
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ public void testSpecializingClassDirectlyExtendsEnterpriseBean()
{
deployBeans(Tractor_Broken.class);
}
- @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
- public void testSpecializedClassDirectlyExtendsNothing()
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ public void testSpecializingClassDirectlyExtendsNothing()
{
deployBeans(Cow_Broken.class);
}
- @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
- public void testSpecializedClassImplementsInterfaceAndExtendsNothing()
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
deployBeans(Donkey_Broken.class);
}
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1147 - tck/trunk/impl and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-21 13:32:37 -0500 (Wed, 21 Jan 2009)
New Revision: 1147
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/MallShop.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Necklace.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Product.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Pupil.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Egg.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Waste.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Plough.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tractor.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java
Modified:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
Log:
refactor simple specialization tests and add producer method specialization tests
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -17,6 +17,7 @@
package javax.webbeans;
+import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target(TYPE)
+@Target({TYPE, METHOD})
@Retention(RUNTIME)
@Documented
public @interface Specializes
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/pom.xml 2009-01-21 18:32:37 UTC (rev 1147)
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>tck-utils</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -97,7 +96,20 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <testOutputDirectory>${project.build.directory}/site</testOutputDirectory>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -6,8 +6,8 @@
import javax.webbeans.RequestScoped;
import javax.webbeans.manager.Bean;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.webbeans.tck.AbstractTest;
-import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.tck.unit.event;
-public class LazyFarmer extends Farmer
+class LazyFarmer extends Farmer
{
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Plough.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Plough.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Plough.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,11 +0,0 @@
-package org.jboss.webbeans.tck.unit.implementation.simple;
-
-import javax.webbeans.Named;
-
-
-@HeavyDuty
-@Named("plough")
-class Plough
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -3,7 +3,6 @@
import java.lang.annotation.Annotation;
import java.util.List;
-import javax.webbeans.AnnotationLiteral;
import javax.webbeans.DefinitionException;
import javax.webbeans.NonexistentConstructorException;
import javax.webbeans.manager.Bean;
@@ -254,53 +253,6 @@
}.run();
}
- @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6")
- public void testSpecializedClassInheritsBindingTypes()
- {
- Bean<Tractor> bean = createSimpleBean(Tractor.class);
- assert bean.getBindings().size()==2;
- assert bean.getBindings().contains( new AnnotationLiteral<Motorized>() {} );
- assert bean.getBindings().contains( new AnnotationLiteral<HeavyDuty>() {} );
- }
-
- @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6")
- public void testSpecializedClassInheritsName()
- {
- Bean<Tractor> bean = createSimpleBean(Tractor.class);
- assert bean.getName()!=null;
- assert bean.getName().equals("plough");
- }
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
- public void testLessSpecializedClassNotInstantiated()
- {
- assert false;
- }
-
- @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.6")
- public void testSpecializedClassMustExtendAnotherWebBean()
- {
- assert false;
- }
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
- public void testSpecializedClassDeclaredInXmlInheritsBindingTypes()
- {
- assert false;
- }
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
- public void testSpecializedClassDeclaredInXmlInheritsName()
- {
- assert false;
- }
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
- public void testLessSpecializedClassDeclaredInXmlNotInstantiated()
- {
- assert false;
- }
-
@Test @SpecAssertion(section="3.2")
public void testDependentScopedBeanCanHavePublicField() throws Exception
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tractor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tractor.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tractor.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.implementation.simple;
-
-import javax.webbeans.Specializes;
-
-@Modern @Motorized @Specializes
-class Tractor extends Plough
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.webbeans.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,14 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Produces;
-
-class Building
-{
-
- @Produces
- public Waste getWaste()
- {
- return new Waste();
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-class Egg
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-class FarmYard_Broken extends Yard
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,11 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Named;
-
-
-@Landowner
-@Named
-class Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-class FishFarmer_Broken extends Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,22 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.webbeans.BindingType;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@BindingType
-@interface Landowner
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,22 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.webbeans.BindingType;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@BindingType
-@interface Lazy
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,11 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-
-@Specializes @Lazy
-@AnotherDeploymentType
-class LazyFarmer extends Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,7 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-@AnotherDeploymentType
-class Office extends Building
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-@Specializes
-class OrganicFarmer_Broken extends Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-@Specializes @AnotherDeploymentType
-class SheepFarmer_Broken extends Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,89 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.InconsistentSpecializationException;
-
-import org.jboss.webbeans.tck.AbstractTest;
-import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.testng.annotations.Test;
-
-import sun.swing.SwingUtilities2.Section;
-
-/**
- * @see Section 3.2.6, 3.3.6, 3.4.5, 6.7, 6.8, 8.4
- *
- */
-public class SpecializationTest extends AbstractTest
-{
-
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
- deploymentTypes.addAll(getStandardDeploymentTypes());
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
-
- private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
-
- @Test(groups="broken") @SpecAssertion(section = "4.3.1")
- public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
- {
- deployBeans(LazyFarmer.class);
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
- assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
- }
-
- @Test(groups="broken") @SpecAssertion(section = "4.3.1")
- public void testSpecializingBeanHasNameOfSpecializedBean()
- {
- deployBeans(LazyFarmer.class);
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
- }
-
- @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
- public void testSpecializedBeanHasNonDefaultName()
- {
- deployBeans(FarmYard_Broken.class);
- }
-
- @Test(groups="broken") @SpecAssertion(section="4.3.1")
- public void testSpecializedBeanNotDeployed()
- {
- deployBeans(LazyFarmer.class, Farmer.class);
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
- assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
- }
-
- @Test(groups="broken") @SpecAssertion(section="4.3.1")
- public void testProducerMethodOnSpecializedBeanNotDeployed()
- {
- deployBeans(Office.class, Building.class);
- assert manager.resolveByType(Waste.class).size() == 0;
- }
-
- @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
- public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
- {
- deployBeans(OrganicFarmer_Broken.class);
- }
-
- @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
- public void testTwoBeansSpecializeTheSameBean()
- {
- deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-class Waste
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java 2009-01-21 17:12:23 UTC (rev 1146)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Named;
-
-@Named("backyard")
-class Yard
-{
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class Bookshop_Broken extends Shop
+{
+
+ @Override @Specializes @Produces @AnotherDeploymentType
+ public Product getExpensiveGift()
+ {
+ return new Product();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class ClothesShop_Broken extends Shop
+{
+
+ @Specializes @Produces
+ public Product getExpensiveGift()
+ {
+ // TODO Auto-generated method stub
+ return super.getExpensiveGift();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Expensive
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class FurnitureShop_Broken extends Shop
+{
+
+ @Specializes @Produces @AnotherDeploymentType
+ public static Product getChair()
+ {
+ return new Product();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class HighSchool_Broken extends School
+{
+
+ @Override @Produces @Specializes @AnotherDeploymentType
+ public Pupil getStarPupil()
+ {
+ return super.getStarPupil();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class JewelryShop extends Shop
+{
+
+ @Override @Produces @Specializes @Sparkly @AnotherDeploymentType
+ public Product getExpensiveGift()
+ {
+ return new Necklace();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/MallShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/MallShop.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/MallShop.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+class MallShop extends Shop
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/MallShop.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Necklace.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Necklace.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Necklace.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+class Necklace extends Product
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Necklace.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class PictureShop_Broken extends Shop
+{
+
+ @Override @Produces @Specializes @AnotherDeploymentType
+ public Product getExpensiveGift()
+ {
+ // TODO Auto-generated method stub
+ return super.getExpensiveGift();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,98 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.DefinitionException;
+import javax.webbeans.InconsistentSpecializationException;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.testng.annotations.Test;
+
+import sun.swing.SwingUtilities2.Section;
+
+/**
+ * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
+ *
+ */
+public class ProducerMethodSpecializationTest extends AbstractTest
+{
+
+ private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral<Expensive>() {};
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
+ deploymentTypes.addAll(getStandardDeploymentTypes());
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.4.5"})
+ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
+ {
+ deployBeans(JewelryShop.class);
+ assert manager.resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1;
+ assert manager.resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2;
+ assert annotationSetMatches( manager.resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.4.5"})
+ public void testSpecializingBeanHasNameOfSpecializedBean()
+ {
+ deployBeans(JewelryShop.class);
+ assert manager.resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1;
+ assert manager.resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift");
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
+ public void testSpecializedBeanHasNonDefaultName()
+ {
+ deployBeans(HighSchool_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.4.5"})
+ public void testSpecializedBeanNotInstantiated()
+ {
+ deployBeans(JewelryShop.class, Shop.class);
+ Product product = manager.getInstanceByType(Product.class, EXPENSIVE_LITERAL);
+ assert product instanceof Necklace;
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
+ {
+ deployBeans(ClothesShop_Broken.class);
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testTwoBeansSpecializeTheSameBean()
+ {
+ deployBeans(PictureShop_Broken.class, Bookshop_Broken.class);
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ public void testSpecializedStaticMethod()
+ {
+ deployBeans(FurnitureShop_Broken.class);
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ public void testSpecializedMethodDoesNotOverrideAnotherProducerMethod()
+ {
+ deployBeans(FurnitureShop_Broken.class);
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod()
+ {
+ deployBeans(ShoeShop_Broken.class);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Product.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Product.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Product.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+class Product
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Product.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Pupil.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Pupil.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Pupil.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+class Pupil
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Pupil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Named;
+import javax.webbeans.Produces;
+
+class School
+{
+
+ @Produces @Named("bestPupil")
+ public Pupil getStarPupil()
+ {
+ return new Pupil();
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Specializes;
+
+class ShoeShop_Broken extends MallShop
+{
+
+ @Override @Produces @Specializes @AnotherDeploymentType
+ public Product getExpensiveGift()
+ {
+ return super.getExpensiveGift();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+import javax.webbeans.Named;
+import javax.webbeans.Produces;
+
+
+class Shop
+{
+
+ @Produces @Expensive @Named
+ public Product getExpensiveGift()
+ {
+ return new Product();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Sparkly
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Animal.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Produces;
+
+class Building
+{
+
+ @Produces
+ public Waste getWaste()
+ {
+ return new Waste();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class Cow_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class Donkey_Broken implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Egg.java (from rev 1121, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Egg.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Egg.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+class Egg
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java (from rev 1121, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Plough.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Named;
+
+
+@Named("plough")
+@Stateful
+class FarmEquipment
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class FarmYard_Broken extends Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Named;
+
+
+@Landowner
+@Named
+class Farmer
+{
+
+ public String getClassName()
+ {
+ return Farmer.class.getName();
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class FishFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Landowner
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Lazy
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+
+@Specializes @Lazy
+@AnotherDeploymentType
+class LazyFarmer extends Farmer
+{
+
+ @Override
+ public String getClassName()
+ {
+ return LazyFarmer.class.getName();
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+
+
+@AnotherDeploymentType
+class Office extends Building
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+class OrganicFarmer_Broken extends Farmer
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes @AnotherDeploymentType
+class SheepFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,107 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.DefinitionException;
+import javax.webbeans.InconsistentSpecializationException;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.testng.annotations.Test;
+
+import sun.swing.SwingUtilities2.Section;
+
+/**
+ * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
+ *
+ */
+public class SimpleBeanSpecializationTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
+ deploymentTypes.addAll(getStandardDeploymentTypes());
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
+ assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ public void testSpecializingBeanHasNameOfSpecializedBean()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
+ public void testSpecializedBeanHasNonDefaultName()
+ {
+ deployBeans(FarmYard_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.2.7"})
+ public void testSpecializedBeanNotInstantiated()
+ {
+ deployBeans(LazyFarmer.class, Farmer.class);
+ Farmer farmer = manager.getInstanceByType(Farmer.class, LANDOWNER_LITERAL);
+ assert farmer.getClassName().equals(LazyFarmer.class.getName());
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
+ {
+ deployBeans(OrganicFarmer_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section="4.3.1")
+ public void testProducerMethodOnSpecializedBeanNotDeployed()
+ {
+ deployBeans(Office.class, Building.class);
+ assert manager.resolveByType(Waste.class).size() == 0;
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testTwoBeansSpecializeTheSameBean()
+ {
+ deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializedClassDirectlyExtendsEnterpriseBean()
+ {
+ deployBeans(Tractor_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializedClassDirectlyExtendsNothing()
+ {
+ deployBeans(Cow_Broken.class);
+ }
+
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ public void testSpecializedClassImplementsInterfaceAndExtendsNothing()
+ {
+ deployBeans(Donkey_Broken.class);
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java (from rev 1121, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tractor.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class Tractor_Broken extends FarmEquipment
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Waste.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Waste.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Waste.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+class Waste
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Waste.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java (from rev 1146, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java 2009-01-21 18:32:37 UTC (rev 1147)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
+
+import javax.webbeans.Named;
+
+@Named("backyard")
+class Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1146 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: inheritance/realization and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-21 12:12:23 -0500 (Wed, 21 Jan 2009)
New Revision: 1146
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
Log:
start work on specialization tests
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -17,7 +17,6 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.jboss.webbeans.tck.unit.inheritance.specialization.LazyFarmer;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -17,8 +17,7 @@
{
private static Annotation SMELLY_LITERAL = new AnnotationLiteral<Smelly>(){};
-
-
+
@Override
protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Produces;
+
+class Building
+{
+
+ @Produces
+ public Waste getWaste()
+ {
+ return new Waste();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Building.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class FarmYard_Broken extends Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FarmYard_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -1,15 +1,11 @@
package org.jboss.webbeans.tck.unit.inheritance.specialization;
-import javax.webbeans.Observes;
+import javax.webbeans.Named;
-import org.jboss.webbeans.tck.unit.inheritance.specialization.Egg;
+@Landowner
+@Named
class Farmer
{
- public void observeEggLaying(@Observes Egg egg)
- {
-
- }
-
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class FishFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/FishFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Landowner
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Lazy
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Lazy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -1,7 +1,11 @@
package org.jboss.webbeans.tck.unit.inheritance.specialization;
+import javax.webbeans.Specializes;
-public class LazyFarmer extends Farmer
+
+@Specializes @Lazy
+@AnotherDeploymentType
+class LazyFarmer extends Farmer
{
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,7 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+@AnotherDeploymentType
+class Office extends Building
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Office.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.inheritance.specialization;
-
-import javax.webbeans.Specializes;
-
-@Specializes
-public class OrganicFarmer extends Farmer
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java (from rev 1121, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/OrganicFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Specializes;
+
+@Specializes
+class OrganicFarmer_Broken extends Farmer
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Specializes;
+
+@Specializes @AnotherDeploymentType
+class SheepFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SheepFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 16:45:35 UTC (rev 1145)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -1,25 +1,89 @@
package org.jboss.webbeans.tck.unit.inheritance.specialization;
+import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.DefinitionException;
import javax.webbeans.InconsistentSpecializationException;
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
+import sun.swing.SwingUtilities2.Section;
+
+/**
+ * @see Section 3.2.6, 3.3.6, 3.4.5, 6.7, 6.8, 8.4
+ *
+ */
public class SpecializationTest extends AbstractTest
{
-
- @Test(expectedExceptions = InconsistentSpecializationException.class, groups = { "stub", "specialization" })
- public void testInconsistentSpecialization()
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
-
+ List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
+ deploymentTypes.addAll(getStandardDeploymentTypes());
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
}
+
+ private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test
- @SpecAssertion(section = "4.3")
- public void testSpecializedBeanDirectlyExtendsLowerPriorityBean()
+ @Test(groups="broken") @SpecAssertion(section = "4.3.1")
+ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
-
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
+ assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
}
+
+ @Test(groups="broken") @SpecAssertion(section = "4.3.1")
+ public void testSpecializingBeanHasNameOfSpecializedBean()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
+ }
+
+ @Test(groups="broken", expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
+ public void testSpecializedBeanHasNonDefaultName()
+ {
+ deployBeans(FarmYard_Broken.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section="4.3.1")
+ public void testSpecializedBeanNotDeployed()
+ {
+ deployBeans(LazyFarmer.class, Farmer.class);
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+ assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+ }
+
+ @Test(groups="broken") @SpecAssertion(section="4.3.1")
+ public void testProducerMethodOnSpecializedBeanNotDeployed()
+ {
+ deployBeans(Office.class, Building.class);
+ assert manager.resolveByType(Waste.class).size() == 0;
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
+ {
+ deployBeans(OrganicFarmer_Broken.class);
+ }
+
+ @Test(groups="broken", expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ public void testTwoBeansSpecializeTheSameBean()
+ {
+ deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+class Waste
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Waste.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java 2009-01-21 17:12:23 UTC (rev 1146)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+import javax.webbeans.Named;
+
+@Named("backyard")
+class Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Yard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1145 - doc/trunk/reference/ko-KR.
by webbeans-commits＠lists.jboss.org
Author: eukim
Date: 2009-01-21 11:45:35 -0500 (Wed, 21 Jan 2009)
New Revision: 1145
Modified:
doc/trunk/reference/ko-KR/injection.po
Log:
updated
Modified: doc/trunk/reference/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/ko-KR/injection.po 2009-01-21 15:14:14 UTC (rev 1144)
+++ doc/trunk/reference/ko-KR/injection.po 2009-01-21 16:45:35 UTC (rev 1145)
@@ -8,7 +8,7 @@
"Project-Id-Version: injection\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-22 01:13+1000\n"
+"PO-Revision-Date: 2009-01-22 02:45+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -349,7 +349,7 @@
msgid ""
"A client Web Bean developer uses the binding annotation to specify exactly "
"which Web Bean should be injected."
-msgstr ""
+msgstr "클라이언트 Web Bean 개발자는 바인딩 어노테이션을 사용하여 정확히 어떤 Web Bean이 삽입되어야 하는 지를 지정합니다. "
#. Tag: para
#: injection.xml:112
@@ -473,7 +473,7 @@
msgid ""
"You can tell the Web Bean manager to ignore a member of a binding annotation "
"type by annotating the member <literal>@NonBinding</literal>."
-msgstr ""
+msgstr "Web Bean 관리자에게 <literal>@NonBinding</literal> 멤버를 어노테이션하여 바인딩 어노테이션 유형 멤버를 무시하라고 말할 수 있습니다. "
#. Tag: title
#: injection.xml:141
@@ -499,7 +499,7 @@
msgid ""
"In this case, only a Web Bean which has <emphasis>both</emphasis> binding "
"annotations would be eligible for injection."
-msgstr ""
+msgstr "이러한 경우, <emphasis>양쪽</emphasis> 바인딩 어노테이션을 갖는 Web Bean만 삽입될 수 있습니다. "
#. Tag: title
#: injection.xml:153
@@ -688,7 +688,7 @@
#: injection.xml:216
#, no-c-format
msgid "Enabling deployment types"
-msgstr ""
+msgstr "배치 유형 활성화 "
#. Tag: para
#: injection.xml:218
@@ -1268,7 +1268,7 @@
#: injection.xml:475
#, no-c-format
msgid "We can now write:"
-msgstr ""
+msgstr "이제 다음을 작성할 수 있습니다: "
#. Tag: programlisting
#: injection.xml:477
@@ -1306,7 +1306,7 @@
#: injection.xml:484
#, no-c-format
msgid "We would use this binding type at injection points as follows:"
-msgstr ""
+msgstr "다음과 같이 삽입 지점에서 이러한 바인딩 유형을 사용할 수 있습니다: "
#. Tag: programlisting
#: injection.xml:486
@@ -1322,7 +1322,7 @@
#: injection.xml:488
#, no-c-format
msgid "The following producer method does the work:"
-msgstr ""
+msgstr "다음의 생산자 방식은 다음과 같이 작업합니다: "
#. Tag: programlisting
#: injection.xml:490
@@ -1355,7 +1355,7 @@
"(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
"literal> annotation is ignored by the Web Bean manager since it is annotated "
"<literal>@NonBinding.</literal>)"
-msgstr ""
+msgstr "<literal>HttpParam</literal> 어노테이션의 <literal>value()</literal> 멤버는<literal>@NonBinding.</literal>을 어노테이션하므로 Web Bean 관리자에 의해 무시됨에 유의하시기 바랍니다. "
#. Tag: para
#: injection.xml:495
@@ -1363,7 +1363,7 @@
msgid ""
"The Web Bean manager provides a built-in Web Bean that implements the "
"<literal>InjectionPoint</literal> interface:"
-msgstr ""
+msgstr "Web Bean 관리자는 <literal>InjectionPoint</literal> 인터페이스를 구현하는 내장된 Web Bean을 제공합니다: "
#. Tag: programlisting
#: injection.xml:498
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1144 - doc/trunk/reference/ko-KR.
by webbeans-commits＠lists.jboss.org
Author: eukim
Date: 2009-01-21 10:14:14 -0500 (Wed, 21 Jan 2009)
New Revision: 1144
Modified:
doc/trunk/reference/ko-KR/injection.po
doc/trunk/reference/ko-KR/scopescontexts.po
Log:
updated
Modified: doc/trunk/reference/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/ko-KR/injection.po 2009-01-21 14:52:27 UTC (rev 1143)
+++ doc/trunk/reference/ko-KR/injection.po 2009-01-21 15:14:14 UTC (rev 1144)
@@ -8,7 +8,7 @@
"Project-Id-Version: injection\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-20 16:47+1000\n"
+"PO-Revision-Date: 2009-01-22 01:13+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -23,6 +23,7 @@
"\n"
"\n"
"\n"
+"\n"
#. Tag: title
#: injection.xml:4
@@ -258,7 +259,7 @@
#: injection.xml:88
#, no-c-format
msgid "Let's explore how the Web Beans manager determines a Web Bean to be injected."
-msgstr ""
+msgstr "Web Beans 관리자가 어떻게 Web Bean을 삽입할 지를 결정하는 방법에 대해 살펴봅시다. "
#. Tag: title
#: injection.xml:91
Modified: doc/trunk/reference/ko-KR/scopescontexts.po
===================================================================
--- doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-21 14:52:27 UTC (rev 1143)
+++ doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-21 15:14:14 UTC (rev 1144)
@@ -8,7 +8,7 @@
"Project-Id-Version: scopescontexts\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-21 18:14+1000\n"
+"PO-Revision-Date: 2009-01-22 01:12+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -415,7 +415,6 @@
#. Tag: para
#: scopescontexts.xml:179
#, no-c-format
-#, fuzzy
msgid ""
"We can force the conversation to propagate with a non-faces request by "
"including the unique identifier of the conversation as a request parameter. "
@@ -423,13 +422,13 @@
"<literal>cid</literal> for this use. The unique identifier of the "
"conversation may be obtained from the <literal>Conversation</literal> "
"object, which has the Web Beans name <literal>conversation</literal>."
-msgstr "요청 매개 변수로서 컨버세이션의 고유 식별자를 포함하여 컨버세이션이 non-faces 요청과 함께 보급되도록 강제할 수 있습니다. Web Beans 사양은 "
+msgstr "요청 매개 변수로서 컨버세이션의 고유 식별자를 포함하여 컨버세이션이 non-faces 요청과 함께 보급되도록 강제할 수 있습니다. Web Beans 사양은 이를 사용하기 위해 <literal>cid</literal> 라는 요청 매개 변수를 가집니다. 컨버세이션의 고유 식별자는 <literal>Conversation</literal> 객체에서 획득할 수 있으며, <literal>conversation</literal>이라는 Web Beans 이름을 갖습니다. "
#. Tag: para
#: scopescontexts.xml:186
#, no-c-format
msgid "Therefore, the following link propagates the conversation:"
-msgstr ""
+msgstr "따라서, 다음과 같은 링크가 컨버세이션을 보급합니다: "
#. Tag: programlisting
#: scopescontexts.xml:188
@@ -444,13 +443,14 @@
#. Tag: para
#: scopescontexts.xml:190
#, no-c-format
+#, fuzzy
msgid ""
"The Web Bean manager is also required to propagate conversations across any "
"redirect, even if the conversation is not marked long-running. This makes it "
"very easy to implement the common POST-then-redirect pattern, without resort "
"to fragile constructs such as a \"flash\" object. In this case, the Web Bean "
"manager automatically adds a request parameter to the redirect URL."
-msgstr ""
+msgstr "Web Bean 관리자는 컨버세이션이 장기 실행으로 표시되어 있지 않아도, 리다이렉트를 통해 컨버세이션을 보급해야 합니다. 이는 일반적인 "
#. Tag: title
#: scopescontexts.xml:200
@@ -476,7 +476,7 @@
"The <literal>Conversation</literal> object provides a method to set the "
"timeout. This is a hint to the Web Bean manager, which is free to ignore the "
"setting."
-msgstr ""
+msgstr "<literal>Conversation</literal> 객체는 시간 초과를 설정하기 위한 방식을 제공합니다. 이는 Web Bean 관리자에게 도움이 되며, 설정 사항을 무시하셔도 상관 없습니다. "
#. Tag: programlisting
#: scopescontexts.xml:212
@@ -488,7 +488,7 @@
#: scopescontexts.xml:219
#, no-c-format
msgid "The dependent pseudo-scope"
-msgstr ""
+msgstr "dependent pseudo-scope "
#. Tag: para
#: scopescontexts.xml:221
@@ -497,13 +497,13 @@
"In addition to the four built-in scopes, Web Beans features the so-called "
"<emphasis>dependent pseudo-scope</emphasis>. This is the default scope for a "
"Web Bean which does not explicitly declare a scope type."
-msgstr ""
+msgstr "네 가지 내장된 범위에 더하여, Web Beans는 <emphasis>dependent pseudo-scope</emphasis>라는 기능을 특징으로 합니다. 이는 범위 유형을 명시하지 않는 Web Bean에 대한 기본값 범위입니다. "
#. Tag: para
#: scopescontexts.xml:225
#, no-c-format
msgid "For example, this Web Bean has the scope type <literal>@Dependent</literal>:"
-msgstr ""
+msgstr "예를 들어, Web Bean에는 <literal>@Dependent</literal> 범위 유형이 있습니다: "
#. Tag: programlisting
#: scopescontexts.xml:227
@@ -514,13 +514,14 @@
#. Tag: para
#: scopescontexts.xml:229
#, no-c-format
+#, fuzzy
msgid ""
"When an injection point of a Web Bean resolves to a dependent Web Bean, a "
"new instance of the dependent Web Bean is created every time the first Web "
"Bean is instantiated. Instances of dependent Web Beans are never shared "
"between different Web Beans or different injection points. They are "
"<emphasis>dependent objects</emphasis> of some other Web Bean instance."
-msgstr ""
+msgstr "Web Bean의 삽입 지점이 "
#. Tag: para
#: scopescontexts.xml:235
@@ -528,7 +529,7 @@
msgid ""
"Dependent Web Bean instances are destroyed when the instance they depend "
"upon is destroyed."
-msgstr ""
+msgstr "의존하는 인스턴스가 삭제되면 의존적 Web Bean 인스턴스가 삭제됩니다. "
#. Tag: para
#: scopescontexts.xml:243
@@ -537,13 +538,13 @@
"Web Beans makes it easy to obtain a dependent instance of a Java class or "
"EJB bean, even if the class or EJB bean is already declared as a Web Bean "
"with some other scope type."
-msgstr ""
+msgstr "클래스 또는 EJB bean이 일부 다른 범위 유형과 함께 Web Bean으로 명시되어 있어도, Web Beans는 Java 클래스 또는 EJB bean의 의존적 인스턴스를 쉽게 획득할 수 있게 합니다. "
#. Tag: title
#: scopescontexts.xml:248
#, no-c-format
msgid "The <literal>@New</literal> annotation"
-msgstr ""
+msgstr "<literal>@New</literal> 어노테이션 "
#. Tag: para
#: scopescontexts.xml:250
@@ -552,7 +553,7 @@
"The built-in <literal>@New</literal> binding annotation allows "
"<emphasis>implicit</emphasis> definition of a dependent Web Bean at an "
"injection point. Suppose we declare the following injected field:"
-msgstr ""
+msgstr "내장된 <literal>@New</literal> 바인딩 어노테이션은 삽입 지점에서 의존적 Web Bean의 <emphasis>암시적</emphasis> 정의를 허용합니다. 다음과 같은 삽입 영역을 명시한다고 가정합시다: "
#. Tag: programlisting
#: scopescontexts.xml:254
@@ -568,7 +569,7 @@
"<literal>@New</literal>, API type <literal>Calculator</literal>, "
"implementation class <literal>Calculator</literal> and deployment type "
"<literal>@Standard</literal> is implicitly defined."
-msgstr ""
+msgstr "<literal>@Dependent</literal> 범위, <literal>@New</literal> 바인딩 유형, <literal>Calculator</literal> API 유형, <literal>Calculator</literal> 구현 클래스, <literal>@Standard</literal> 배치 유형과 함께 Web Bean은 암시적으로 정의됩니다. "
#. Tag: para
#: scopescontexts.xml:261
@@ -577,6 +578,8 @@
"This is true even if <literal>Calculator</literal> is <emphasis>already</"
"emphasis> declared with a different scope type, for example:"
msgstr ""
+"<literal>Calculator</literal>가 다른 범위 유형과 함께 <emphasis>이미</"
+"emphasis> 명시되어 있어도 이는 사실입니다, 예: "
#. Tag: programlisting
#: scopescontexts.xml:264
@@ -594,7 +597,7 @@
msgid ""
"So the following injected attributes each get a different instance of "
"<literal>Calculator</literal>:"
-msgstr ""
+msgstr "다음의 삽입 속성은 다른 <literal>Calculator</literal> 인스턴스를 갖습니다: "
#. Tag: programlisting
#: scopescontexts.xml:269
@@ -622,7 +625,7 @@
"of <literal>Calculator</literal> injected. The <literal>newCalculator</"
"literal> field has a new instance of <literal>Calculator</literal> injected, "
"with a lifecycle that is bound to the owning <literal>PaymentCalc</literal>."
-msgstr ""
+msgstr "<literal>calculator</literal> 영역에는 <literal>Calculator</literal>의 컨버세이션 범위 인스턴스가 삽입되어 있습니다. <literal>newCalculator</literal> 영역에는 <literal>PaymentCalc</literal> 소유로 바운딩된 수명 주기와 함께 <literal>Calculator</literal>의 새로운 인스턴스가 삽입되어 있습니다. "
#. Tag: para
#: scopescontexts.xml:276
@@ -630,5 +633,5 @@
msgid ""
"This feature is particularly useful with producer methods, as we'll see in "
"the next chapter."
-msgstr ""
+msgstr "특히 이러한 기능은 다음 장에서 다루게 될 생산자 방식에서 유용합니다. "
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1143 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: inheritance/specialization and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-21 09:52:27 -0500 (Wed, 21 Jan 2009)
New Revision: 1143
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
Log:
move test in wrong place
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java 2009-01-21 14:52:27 UTC (rev 1143)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.event;
+
+class Egg
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-21 14:40:59 UTC (rev 1142)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-21 14:52:27 UTC (rev 1143)
@@ -17,6 +17,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.unit.inheritance.specialization.LazyFarmer;
import org.testng.annotations.Test;
/**
@@ -916,4 +917,12 @@
{
assert false;
}
+
+ @Test
+ @SpecAssertion(section = "4.2")
+ public void testNonStaticObserverMethodNotInherited()
+ {
+ deployBeans(LazyFarmer.class);
+ assert manager.resolveObservers(new Egg()).isEmpty();
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java 2009-01-21 14:52:27 UTC (rev 1143)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.tck.unit.event;
+
+import javax.webbeans.Observes;
+
+class Farmer
+{
+
+ public void observeEggLaying(@Observes Egg egg)
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java 2009-01-21 14:52:27 UTC (rev 1143)
@@ -0,0 +1,7 @@
+package org.jboss.webbeans.tck.unit.event;
+
+
+public class LazyFarmer extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 14:40:59 UTC (rev 1142)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java 2009-01-21 14:52:27 UTC (rev 1143)
@@ -9,14 +9,6 @@
public class SpecializationTest extends AbstractTest
{
- @Test
- @SpecAssertion(section = "4.2")
- public void testNonStaticProducerMethodNotInherited()
- {
- deployBeans(LazyFarmer.class);
- assert manager.resolveObservers(new Egg()).isEmpty();
- }
-
@Test(expectedExceptions = InconsistentSpecializationException.class, groups = { "stub", "specialization" })
public void testInconsistentSpecialization()
{
16 years, 8 months
- 1
- 0