Author: akazakov
Date: 2010-12-01 12:11:53 -0500 (Wed, 01 Dec 2010)
New Revision: 27072
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByNameTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Cod.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Plaice.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Salmon.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Sole.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7776 - Fixed
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Cod.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Cod.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Cod.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -19,7 +19,7 @@
import javax.enterprise.inject.Alternative;
import javax.inject.Named;
-@Named("whitefish")
+@Named("whitefishJBT") // Original tck name was "whitefish". modified
for JBT tests to "whitefishJBT"
@Alternative
class Cod implements Animal
{
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Plaice.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Plaice.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Plaice.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -18,7 +18,7 @@
import javax.inject.Named;
-@Named("whitefish")
+@Named("whitefishJBT") // Original tck name was "whitefish". modified
for JBT tests to "whitefishJBT"
@Whitefish
class Plaice implements Animal
{
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Salmon.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Salmon.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Salmon.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -18,7 +18,7 @@
import javax.inject.Named;
-@Named("fish")
+@Named("fishJBT") // Original tck name was "fish". modified for JBT
tests to "fishJBT"
class Salmon implements Animal
{
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Sole.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Sole.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/byname/Sole.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -19,7 +19,7 @@
import javax.enterprise.inject.Alternative;
import javax.inject.Named;
-@Named("fish")
+@Named("fishJBT") // Original tck name was "fish". modified for JBT
tests to "fishJBT"
@Alternative
class Sole implements Animal
{
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -32,6 +32,7 @@
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierWithMembersTest;
+import org.jboss.tools.cdi.core.test.tck.ResolutionByNameTest;
import org.jboss.tools.cdi.core.test.tck.ResolutionByTypeTest;
import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.SelectedAlternativeTest;
@@ -56,6 +57,7 @@
TestSuite suiteAll = new TestSuite("CDI Core Tests");
TestSuite suite = new TestSuite("TCK Tests");
+ suite.addTestSuite(ResolutionByNameTest.class);
suite.addTestSuite(BeanDefinitionTest.class);
suite.addTestSuite(NameDefinitionTest.class);
suite.addTestSuite(QualifierDefinitionTest.class);
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByNameTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByNameTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByNameTest.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ResolutionByNameTest extends TCKTest {
+
+ /**
+ * section 5.3.1 ca),
+ * section 11.3.5 aa),
+ * section 11.3.5 b)
+ *
+ * @throws CoreException
+ */
+ public void testAmbiguousELNamesResolved() throws CoreException {
+ // Cod, Plaice and AlaskaPlaice are named "whitefishJBT" - Cod is a
not-enabled policy, AlaskaPlaice specializes Plaice
+ Set<IBean> beans = cdiProject.getBeans("whitefishJBT", true);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans,
"org.jboss.jsr299.tck.tests.lookup.byname.AlaskaPlaice");
+
+ IFile f =
tckProject.getFile("/JavaSource/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml");
+ assertTrue("File /JavaSource/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml
not found", f != null && f.exists());
+
+ IPath old = ((CDIProject)cdiProject).replaceBeanXML(f.getFullPath());
+
+ assertTrue("Old beans.xml is not found", old != null);
+
+ try {
+ beans = cdiProject.getBeans("whitefishJBT", true);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans,
"org.jboss.jsr299.tck.tests.lookup.byname.AlaskaPlaice");
+
+ // Both Salmon and Sole are named "fishJBT" - Sole is an enabled
policy
+ beans = cdiProject.getBeans("fishJBT", false);
+ assertEquals("Wrong number of the beans", 2, beans.size());
+ assertContainsBeanClasses(beans,
"org.jboss.jsr299.tck.tests.lookup.byname.Salmon",
"org.jboss.jsr299.tck.tests.lookup.byname.Sole");
+
+ beans = cdiProject.getBeans("fishJBT", true);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans,
"org.jboss.jsr299.tck.tests.lookup.byname.Sole");
+ } finally {
+ old = ((CDIProject)cdiProject).replaceBeanXML(old);
+ }
+ }
+}
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByNameTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-12-01
17:11:12 UTC (rev 27071)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-12-01
17:11:53 UTC (rev 27072)
@@ -209,7 +209,7 @@
static class JavaFileFilter implements FileFilter {
public boolean accept(File pathname) {
String name = pathname.getName();
- return (pathname.isDirectory() && !name.endsWith(".svn")) ||
(name.endsWith(".java") && !name.endsWith("Test.java"));
+ return (pathname.isDirectory() && !name.endsWith(".svn")) ||
((name.endsWith(".java") || name.equals("beans.xml")) &&
!name.endsWith("Test.java"));
}
}