[webbeans-commits] Webbeans SVN: r962 - in tck/trunk: impl/src/main/java/org/jboss/webbeans/tck/tests/definition and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-14 08:55:02 -0500 (Wed, 14 Jan 2009)
New Revision: 962
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java
Log:
removed isBeanNameDefaulted()
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:54:53 UTC (rev 961)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:55:02 UTC (rev 962)
@@ -64,13 +64,6 @@
* @param bean
* @return
*/
- boolean isBeanNameDefaulted(Bean<?> bean);
-
- /**
- *
- * @param bean
- * @return
- */
Set<Class<?>> getRequiredTypes(Bean<?> bean);
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-14 13:54:53 UTC (rev 961)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-14 13:55:02 UTC (rev 962)
@@ -113,7 +113,6 @@
public void testSterotypeDefaultsName()
{
Bean<RedSnapper> model = getSimpleBean(RedSnapper.class);
- assert configuration().getBeans().isBeanNameDefaulted(model);
assert model.getName().equals("redSnapper");
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r961 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-14 08:54:53 -0500 (Wed, 14 Jan 2009)
New Revision: 961
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
Log:
Implement getEnabledDeploymentTypes()
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-14 13:50:42 UTC (rev 960)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-14 13:54:53 UTC (rev 961)
@@ -25,8 +25,7 @@
public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
- // TODO Auto-generated method stub
- return null;
+ return CurrentManager.rootManager().getEnabledDeploymentTypes();
}
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r960 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-14 08:50:42 -0500 (Wed, 14 Jan 2009)
New Revision: 960
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
Log:
removed getBindings(), added missing method
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-14 13:49:25 UTC (rev 959)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-14 13:50:42 UTC (rev 960)
@@ -38,12 +38,6 @@
return EnterpriseBean.of(clazz, CurrentManager.rootManager());
}
- public Set<Annotation> getBindings(Bean<?> bean)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
public Set<Class<?>> getRequiredTypes(Bean<?> bean)
{
// TODO Auto-generated method stub
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-14 13:49:25 UTC (rev 959)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-14 13:50:42 UTC (rev 960)
@@ -22,5 +22,11 @@
{
CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes);
}
+
+ public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r959 - tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-14 08:49:25 -0500 (Wed, 14 Jan 2009)
New Revision: 959
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
Log:
removed getBindings() from api interface
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:46:43 UTC (rev 958)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:49:25 UTC (rev 959)
@@ -78,5 +78,4 @@
* @return
*/
Set<Class<? extends Annotation>> getSupportedScopes(Bean<?> bean);
-
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r958 - in tck/trunk: impl/src/main/java/org/jboss/webbeans/tck/tests/definition and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-14 08:46:43 -0500 (Wed, 14 Jan 2009)
New Revision: 958
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java
Log:
remove getBindings
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:43:03 UTC (rev 957)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 13:46:43 UTC (rev 958)
@@ -79,9 +79,4 @@
*/
Set<Class<? extends Annotation>> getSupportedScopes(Bean<?> bean);
- /**
- *
- * @return
- */
- Set<Annotation> getBindings(Bean<?> bean);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-14 13:43:03 UTC (rev 957)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-14 13:46:43 UTC (rev 958)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.tests.definition;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.lang.reflect.Method;
import javax.webbeans.Production;
@@ -47,7 +45,7 @@
public void testBindingTypesNonEmpty()
{
Bean<?> model = getSimpleBean(RedSnapper.class);
- assert configuration().getBeans().getBindings(model).size() > 0;
+ assert model.getBindings().size() > 0;
}
@Test
17 years, 3 months
[webbeans-commits] Webbeans SVN: r957 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck: tests and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-14 08:43:03 -0500 (Wed, 14 Jan 2009)
New Revision: 957
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java
Log:
remove TCKUtils, use WebBeansTCKImpl.configuration() instead
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,89 +0,0 @@
-package org.jboss.webbeans.tck.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.jboss.webbeans.tck.api.Beans;
-import org.jboss.webbeans.tck.api.Contexts;
-import org.jboss.webbeans.tck.api.Managers;
-
-import org.jboss.webbeans.tck.impl.util.DeploymentProperties;
-import org.jboss.webbeans.tck.impl.util.Reflections;
-
-/**
- *
- * @author Shane Bryzak
- *
- */
-public class TckUtils
-{
- private static DeploymentProperties deploymentProperties = new DeploymentProperties();
-
- public static Managers getManagers()
- {
- Managers managers = null;
-
- for (Class<? extends Managers> cls : deploymentProperties.getClasses(Managers.class.getName(), Managers.class))
- {
- Constructor<? extends Managers> constructor = Reflections.getConstructor(cls);
- if (constructor != null)
- {
- try
- {
- managers = constructor.newInstance();
- }
- catch (Exception ex)
- {
- // Do something with the exception (log it?)
- }
- }
- }
-
- return managers;
- }
-
- public static Contexts getContexts()
- {
- Contexts contexts = null;
-
- for (Class<? extends Contexts> cls : deploymentProperties.getClasses(Contexts.class.getName(), Contexts.class))
- {
- Constructor<? extends Contexts> constructor = Reflections.getConstructor(cls);
- if (constructor != null)
- {
- try
- {
- contexts = constructor.newInstance();
- }
- catch (Exception ex)
- {
- // Do something with the exception (log it?)
- }
- }
- }
-
- return contexts;
- }
-
- public static Beans getBeans()
- {
- Beans beans = null;
-
- for (Class<? extends Beans> cls : deploymentProperties.getClasses(Beans.class.getName(), Beans.class))
- {
- Constructor<? extends Beans> constructor = Reflections.getConstructor(cls);
- if (constructor != null)
- {
- try
- {
- beans = constructor.newInstance();
- }
- catch (Exception ex)
- {
- // Do something with the exception (log it?)
- }
- }
- }
-
- return beans;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.tck.tests;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -14,8 +15,6 @@
import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Manager;
-import org.jboss.webbeans.tck.impl.TckUtils;
-import org.jboss.webbeans.tck.impl.WebBeansTCKImpl;
import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType;
import org.testng.annotations.BeforeMethod;
@@ -31,18 +30,18 @@
@BeforeMethod
public final void before()
{
- manager = WebBeansTCKImpl.configuration().getManagers().createManager();
- WebBeansTCKImpl.configuration().getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class));
+ manager = configuration().getManagers().createManager();
+ configuration().getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class));
}
public <T> Bean<T> getSimpleBean(Class<T> beanClass)
{
- return WebBeansTCKImpl.configuration().getBeans().createSimpleBean(beanClass);
+ return configuration().getBeans().createSimpleBean(beanClass);
}
public <T> Bean<?> getProducerMethodBean(Method method, Bean<?> producerBean)
{
- return WebBeansTCKImpl.configuration().getBeans().createProducerMethodBean(method, producerBean);
+ return configuration().getBeans().createProducerMethodBean(method, producerBean);
}
/*
@@ -76,7 +75,7 @@
@SuppressWarnings("unchecked")
protected void addStandardDeploymentTypesForTests()
{
- TckUtils.getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class));
+ configuration().getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class));
}
/*
protected <T> void addToEjbCache(Class<T> clazz)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,5 +1,7 @@
package org.jboss.webbeans.tck.tests.definition;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import java.lang.reflect.Method;
import javax.webbeans.Production;
@@ -8,7 +10,6 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.jboss.webbeans.tck.impl.TckUtils;
import org.jboss.webbeans.tck.impl.test.beans.Animal;
import org.jboss.webbeans.tck.impl.test.beans.DeadlyAnimal;
import org.jboss.webbeans.tck.impl.test.beans.DeadlySpider;
@@ -24,36 +25,41 @@
* This test class should be used for common assertions about Web Beans
*
* @author Pete Muir
- *
+ *
*/
@SpecVersion("20081206")
-public class CommonWebBeanTest extends AbstractTest
+public class CommonWebBeanTest extends AbstractTest
{
-
- // TODO This should actually somehow test the reverse - that the container throws a definition exception if any of these occur
- @Test @SpecAssertion(section="2")
+ // TODO This should actually somehow test the reverse - that the container
+ // throws a definition exception if any of these occur
+
+ @Test
+ @SpecAssertion(section = "2")
public void testApiTypesNonEmpty()
{
Bean<?> model = getSimpleBean(RedSnapper.class);
assert model.getTypes().size() > 0;
}
- @Test @SpecAssertion(section="2")
+ @Test
+ @SpecAssertion(section = "2")
public void testBindingTypesNonEmpty()
{
Bean<?> model = getSimpleBean(RedSnapper.class);
- assert TckUtils.getBeans().getBindings(model).size() > 0;
+ assert configuration().getBeans().getBindings(model).size() > 0;
}
- @Test @SpecAssertion(section="2")
+ @Test
+ @SpecAssertion(section = "2")
public void testHasScopeType()
{
Bean<?> model = getSimpleBean(RedSnapper.class);
assert model.getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="2")
+ @Test
+ @SpecAssertion(section = "2")
public void testHasDeploymentType()
{
Bean<?> model = getSimpleBean(RedSnapper.class);
@@ -61,7 +67,8 @@
}
@SuppressWarnings("unchecked")
- @Test(groups="producerMethod") @SpecAssertion(section="5.2")
+ @Test(groups = "producerMethod")
+ @SpecAssertion(section = "5.2")
public void testIsNullable() throws Exception
{
Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class);
@@ -74,8 +81,8 @@
assert spiderBean.isNullable();
}
-
- @Test @SpecAssertion(section={"3.2.2", "2.2"})
+ @Test
+ @SpecAssertion(section = { "3.2.2", "2.2" })
public void testApiTypes()
{
Bean<Tarantula> bean = getSimpleBean(Tarantula.class);
@@ -88,7 +95,8 @@
assert bean.getTypes().contains(DeadlyAnimal.class);
}
- @Test @SpecAssertion(section="2.2")
+ @Test
+ @SpecAssertion(section = "2.2")
public void testFinalApiType()
{
getSimpleBean(DependentFinalTuna.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,10 +1,11 @@
package org.jboss.webbeans.tck.tests.definition;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import javax.webbeans.Production;
import javax.webbeans.Standard;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.TckUtils;
import org.jboss.webbeans.tck.tests.AbstractTest;
import org.testng.annotations.Test;
@@ -21,9 +22,9 @@
@Test @SpecAssertion(section={"2.5.6", "2.5.7"})
public void testDefaultEnabledDeploymentTypes()
{
- assert TckUtils.getManagers().getEnabledDeploymentTypes().size() == 2;
- assert TckUtils.getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert TckUtils.getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class);
+ assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2;
+ assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,5 +1,7 @@
package org.jboss.webbeans.tck.tests.definition;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -12,7 +14,6 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.jboss.webbeans.tck.impl.TckUtils;
import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType;
import org.jboss.webbeans.tck.impl.test.beans.BlackWidow;
@@ -113,7 +114,7 @@
@Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6")
public void testBeanWithDisabledDeploymentTypeNotInstantiated()
{
- TckUtils.getManagers().setEnabledDeploymentTypes(
+ configuration().getManagers().setEnabledDeploymentTypes(
Arrays.asList(Standard.class, AnotherDeploymentType.class,
HornedAnimalDeploymentType.class));
@@ -126,20 +127,20 @@
@Test @SpecAssertion(section={"2.5.6", "2.5.7"})
public void testCustomDeploymentTypes()
{
- TckUtils.getManagers().setEnabledDeploymentTypes(
+ configuration().getManagers().setEnabledDeploymentTypes(
Arrays.asList(Standard.class, AnotherDeploymentType.class,
HornedAnimalDeploymentType.class));
- assert TckUtils.getManagers().getEnabledDeploymentTypes().size() == 3;
- assert TckUtils.getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert TckUtils.getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class);
- assert TckUtils.getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class);
+ assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3;
+ assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class);
+ assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class);
}
@SuppressWarnings("unchecked")
@Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6")
public void testStandardMustBeDeclared()
{
- TckUtils.getManagers().setEnabledDeploymentTypes(
+ configuration().getManagers().setEnabledDeploymentTypes(
Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class));
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-14 13:18:35 UTC (rev 956)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-14 13:43:03 UTC (rev 957)
@@ -1,11 +1,12 @@
package org.jboss.webbeans.tck.tests.definition;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import javax.webbeans.DefinitionException;
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.jboss.webbeans.tck.impl.TckUtils;
import org.jboss.webbeans.tck.impl.test.beans.Haddock;
import org.jboss.webbeans.tck.impl.test.beans.Minnow;
import org.jboss.webbeans.tck.impl.test.beans.Moose;
@@ -112,7 +113,7 @@
public void testSterotypeDefaultsName()
{
Bean<RedSnapper> model = getSimpleBean(RedSnapper.class);
- assert TckUtils.getBeans().isBeanNameDefaulted(model);
+ assert configuration().getBeans().isBeanNameDefaulted(model);
assert model.getName().equals("redSnapper");
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r956 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: introspector/jlr and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-14 08:18:35 -0500 (Wed, 14 Jan 2009)
New Revision: 956
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
Log:
fix errors
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 13:02:29 UTC (rev 955)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 13:18:35 UTC (rev 956)
@@ -172,7 +172,7 @@
ProxyFactory proxyFactory = Proxies.getProxyFactory(getTypes());
@SuppressWarnings("unchecked")
- Class<T> proxyClass = proxyFactory.createClass().asSubclass(getType());
+ Class<T> proxyClass = proxyFactory.createClass();
this.proxyClass = proxyClass;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 13:02:29 UTC (rev 955)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 13:18:35 UTC (rev 956)
@@ -246,17 +246,23 @@
*/
public T invoke(Object instance, ManagerImpl manager)
{
- return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager)));
+ @SuppressWarnings("unchecked")
+ T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager));
+ return result;
}
public T invokeOnInstance(Object instance, ManagerImpl manager)
{
- return getType().cast(Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager)));
+ @SuppressWarnings("unchecked")
+ T result = (T) Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager));
+ return result;
}
public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, ManagerImpl manager)
{
- return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager)));
+ @SuppressWarnings("unchecked")
+ T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager));
+ return result;
}
/**
@@ -270,7 +276,9 @@
*/
public T invoke(Object instance, Object... parameters)
{
- return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, parameters));
+ @SuppressWarnings("unchecked")
+ T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, parameters);
+ return result;
}
/**
17 years, 3 months
[webbeans-commits] Webbeans SVN: r955 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-14 08:02:29 -0500 (Wed, 14 Jan 2009)
New Revision: 955
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
Log:
minor
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-14 09:55:27 UTC (rev 954)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-14 13:02:29 UTC (rev 955)
@@ -59,7 +59,7 @@
* @param annotations The annotations array
* @param type The type of the parameter
*/
- public AnnotatedParameterImpl(Annotation[] annotations, Class<T> type)
+ private AnnotatedParameterImpl(Annotation[] annotations, Class<T> type)
{
super(buildAnnotationMap(annotations));
this.type = type;
17 years, 3 months
[webbeans-commits] Webbeans SVN: r954 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-14 04:55:27 -0500 (Wed, 14 Jan 2009)
New Revision: 954
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
Log:
added new interface method stubs
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-14 07:58:21 UTC (rev 953)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-14 09:55:27 UTC (rev 954)
@@ -1,6 +1,8 @@
package org.jboss.webbeans.test.tck;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.util.Set;
import javax.webbeans.manager.Bean;
@@ -36,4 +38,28 @@
return EnterpriseBean.of(clazz, CurrentManager.rootManager());
}
+ public Set<Annotation> getBindings(Bean<?> bean)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set<Class<?>> getRequiredTypes(Bean<?> bean)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set<Class<? extends Annotation>> getSupportedScopes(Bean<?> bean)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isBeanNameDefaulted(Bean<?> bean)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
17 years, 3 months
[webbeans-commits] Webbeans SVN: r953 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-14 02:58:21 -0500 (Wed, 14 Jan 2009)
New Revision: 953
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java
Log:
fixed imports
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-14 07:58:12 UTC (rev 952)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-14 07:58:21 UTC (rev 953)
@@ -2,7 +2,7 @@
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.test.annotations.FishStereotype;
+import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype;
@FishStereotype
@RequestScoped
17 years, 3 months