Author: akazakov
Date: 2010-03-10 11:39:54 -0500 (Wed, 10 Mar 2010)
New Revision: 20742
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2010-03-10
16:36:41 UTC (rev 20741)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2010-03-10
16:39:54 UTC (rev 20742)
@@ -30,13 +30,41 @@
// IFile file =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
// Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
Set<IBean> beans =
getBeans("org.jboss.jsr299.tck.tests.definition.name.Moose");
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the
only bean.", 1, beans.size());
+ assertEquals("There should be the only bean with
org.jboss.jsr299.tck.tests.definition.name.Moose type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose
bean.", "aMoose", bean.getName());
assertLocationEquals(bean.getNameLocation(), 918, 16);
}
/**
+ * section 2.5.2 a)
+ * section 3.1.5 a)
+ * section 2.5.1 d)
+ *
+ * @throws JavaModelException
+ */
+ public void testDefaultNamed() throws JavaModelException {
+ Set<IBean> beans =
getBeans("org.jboss.jsr299.tck.tests.definition.name.Haddock");
+ assertEquals("There should be the only bean with
org.jboss.jsr299.tck.tests.definition.name.Haddock type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNotNull("org.jboss.jsr299.tck.tests.definition.name.Haddock bean should have
an EL name.", bean.getName());
+ assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Haddock
bean.", "haddock", bean.getName());
+ }
+
+ /**
+ * section 2.7 a)
+ * section 2.7.1.3 aaa)
+ *
+ * @throws JavaModelException
+ */
+ public void testStereotypeDefaultsName() throws JavaModelException {
+ Set<IBean> beans =
getBeans("org.jboss.jsr299.tck.tests.definition.name.RedSnapper");
+ assertEquals("There should be the only bean with
org.jboss.jsr299.tck.tests.definition.name.RedSnapper type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Wrong EL name of
org.jboss.jsr299.tck.tests.definition.name.RedSnapper bean.", "redSnapper",
bean.getName());
+ }
+
+ /**
* Section 2 - Concepts
* e) A bean comprises of an optional bean EL name (continue).
*
@@ -44,8 +72,20 @@
*/
public void testNotNamedInJava() throws JavaModelException {
Set<IBean> beans =
getBeans("org.jboss.jsr299.tck.tests.definition.name.SeaBass");
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.SeaBass should have the
only bean.", 1, beans.size());
+ assertEquals("There should be the only bean with
org.jboss.jsr299.tck.tests.definition.name.SeaBass type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNull("org.jboss.jsr299.tck.tests.definition.name.SeaBass bean should not
have any EL name.", bean.getName());
}
+
+ /**
+ * section 2.5.3 a)
+ *
+ * @throws JavaModelException
+ */
+ public void testNotNamedInStereotype() throws JavaModelException {
+ Set<IBean> beans =
getBeans("org.jboss.jsr299.tck.tests.definition.name.Minnow");
+ assertEquals("There should be the only bean with
org.jboss.jsr299.tck.tests.definition.name.Minnow type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNull("org.jboss.jsr299.tck.tests.definition.name.Minnow bean should not have
any EL name.", bean.getName());
+ }
}
\ No newline at end of file