[webbeans-commits] Webbeans SVN: r285 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans: test/ejb/model and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Nov 9 02:54:33 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-09 02:54:33 -0500 (Sun, 09 Nov 2008)
New Revision: 285
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
Log:
Refactor to remove *Model and *Constructor and xmlAnnotatedItem, part 2
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java 2008-11-09 07:52:05 UTC (rev 284)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java 2008-11-09 07:54:33 UTC (rev 285)
@@ -26,8 +26,8 @@
private void setupGameGenerator() throws NoSuchMethodException
{
- SimpleBean<Game> gameBean = Util.createSimpleWebBean(Game.class, manager);
- SimpleBean<Generator> generatorBean = Util.createSimpleWebBean(Generator.class, manager);
+ SimpleBean<Game> gameBean = Util.createSimpleBean(Game.class, manager);
+ SimpleBean<Generator> generatorBean = Util.createSimpleBean(Generator.class, manager);
Method method = Generator.class.getDeclaredMethod("next");
method.setAccessible(true);
ProducerMethodBean<Integer> nextBean = Util.createProducerMethodBean(int.class, method, manager, generatorBean);
@@ -65,10 +65,10 @@
private void setupTextTranslator()
{
- SimpleBean<SentenceParser> spBean = Util.createSimpleWebBean(SentenceParser.class, manager);
- SimpleBean<SentenceTranslator> stBean = Util.createSimpleWebBean(SentenceTranslator.class, manager);
- SimpleBean<MockSentenceTranslator> mstBean = Util.createSimpleWebBean(MockSentenceTranslator.class, manager);
- SimpleBean<TextTranslator> ttBean = Util.createSimpleWebBean(TextTranslator.class, manager);
+ SimpleBean<SentenceParser> spBean = Util.createSimpleBean(SentenceParser.class, manager);
+ SimpleBean<SentenceTranslator> stBean = Util.createSimpleBean(SentenceTranslator.class, manager);
+ SimpleBean<MockSentenceTranslator> mstBean = Util.createSimpleBean(MockSentenceTranslator.class, manager);
+ SimpleBean<TextTranslator> ttBean = Util.createSimpleBean(TextTranslator.class, manager);
manager.addBean(spBean);
manager.addBean(stBean);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-09 07:52:05 UTC (rev 284)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-09 07:54:33 UTC (rev 285)
@@ -68,7 +68,7 @@
public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod()
{
EnterpriseBean<Armant> whippet = Util.createEnterpriseBean(Armant.class, manager);
- assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy");
+ assert whippet.getRemoveMethod().getAnnotatedItem().getName().equals("destroy");
}
@Test
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java 2008-11-09 07:52:05 UTC (rev 284)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java 2008-11-09 07:54:33 UTC (rev 285)
@@ -1,38 +1,38 @@
-package org.jboss.webbeans.test.mock;
-
-import org.jboss.webbeans.event.ObserverImpl;
-import org.jboss.webbeans.injectable.InjectableMethod;
-import org.jboss.webbeans.model.bean.BeanModel;
-
-/**
- * An implementation used for unit testing only.
- * @author David Allen
- *
- */
-public class MockObserverImpl<T> extends ObserverImpl<T> {
-
- private Object specializedInstance;
-
-
-
- public MockObserverImpl(BeanModel<?, ?> beanModel,
- InjectableMethod<Object> observer, Class<T> eventType)
- {
- super(beanModel, observer, eventType);
- }
-
- @Override
- protected final Object getInstance() {
- return specializedInstance;
- }
-
- /**
- * The most specialized instance of this observer type.
- * @param instance The instance to use for testing
- */
- public final void setInstance(Object instance)
- {
- specializedInstance = instance;
- }
-
-}
+package org.jboss.webbeans.test.mock;
+
+import org.jboss.webbeans.bean.EventBean;
+import org.jboss.webbeans.event.ObserverImpl;
+import org.jboss.webbeans.introspector.impl.InjectableMethod;
+
+/**
+ * An implementation used for unit testing only.
+ * @author David Allen
+ *
+ */
+public class MockObserverImpl<T> extends ObserverImpl<T> {
+
+ private Object specializedInstance;
+
+
+
+ public MockObserverImpl(EventBean<T> beanModel,
+ InjectableMethod<Object> observer, Class<T> eventType)
+ {
+ super(beanModel, observer, eventType);
+ }
+
+ @Override
+ protected final Object getInstance() {
+ return specializedInstance;
+ }
+
+ /**
+ * The most specialized instance of this observer type.
+ * @param instance The instance to use for testing
+ */
+ public final void setInstance(Object instance)
+ {
+ specializedInstance = instance;
+ }
+
+}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-09 07:52:05 UTC (rev 284)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-09 07:54:33 UTC (rev 285)
@@ -1,86 +1,28 @@
package org.jboss.webbeans.test.util;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import java.util.HashMap;
import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.bean.AbstractBean;
+import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedMethod;
-import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
-import org.jboss.webbeans.introspector.impl.SimpleAnnotatedMethod;
-import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
-import org.jboss.webbeans.model.bean.ProducerMethodBeanModel;
-import org.jboss.webbeans.model.bean.SimpleBeanModel;
public class Util
{
- public static <T> SimpleBean<T> createSimpleWebBean(Class<T> clazz, ManagerImpl manager)
+ public static <T> SimpleBean<T> createSimpleBean(Class<T> clazz, ManagerImpl manager)
{
- return new SimpleBean<T>(createSimpleModel(clazz, manager), manager);
+ return new SimpleBean<T>(clazz, manager);
}
public static <T> EnterpriseBean<T> createEnterpriseBean(Class<T> clazz, ManagerImpl manager)
{
- return new EnterpriseBean<T>(createEnterpriseBeanModel(clazz, manager), manager);
+ return new EnterpriseBean<T>(clazz, manager);
}
- public static <T> SimpleBeanModel<T> createSimpleModel(Class<T> clazz, ManagerImpl manager)
+ public static <T> ProducerMethodBean<T> createProducerMethodBean(Class<T> type, Method method, ManagerImpl manager, AbstractClassBean<?> declaringBean)
{
- return new SimpleBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), null, manager);
+ return new ProducerMethodBean<T>(method, declaringBean, manager);
}
- public static <T> SimpleBeanModel<T> createSimpleModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager)
- {
- return new SimpleBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
- }
-
- private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl manager)
- {
- return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), null, manager);
- }
-
- private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager)
- {
- return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
- }
-
- public static <T> ProducerMethodBean<T> createProducerMethodBean(Class<T> type, Method method, ManagerImpl manager, AbstractBean<?> declaringBean)
- {
- return new ProducerMethodBean<T>(createProducerMethodBeanModel(type, method, null, manager, declaringBean), manager);
- }
-
- public static <T> ProducerMethodBean<T> createProducerMethodBean(Class<T> type, Method method, ManagerImpl manager)
- {
- return createProducerMethodBean(type, method, manager, null);
- }
-
- private static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, ManagerImpl manager)
- {
- return createProducerMethodBeanModel(type, method, null, manager);
- }
-
- private static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager, AbstractBean<?> declaringBean)
- {
- return new ProducerMethodBeanModel<T>(new SimpleAnnotatedMethod<T>(method), xmlAnnotatedMethod, manager, declaringBean);
- }
-
- @Deprecated
- public static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager)
- {
- return createProducerMethodBeanModel(type, method, xmlAnnotatedMethod, manager, null);
- }
-
- @Deprecated
- public static <T> AnnotatedClass<T> getEmptyAnnotatedType(Class<T> type)
- {
- return new SimpleAnnotatedClass<T>(type, new HashMap<Class<? extends Annotation>, Annotation>());
- }
-
-
-
}
More information about the weld-commits
mailing list