[weld-commits] Weld SVN: r6844 - in core/trunk/tests-arquillian/src: test/java/org/jboss/weld/tests/builtinBeans and 1 other directories.

Author: aslak Date: 2010-07-29 13:12:39 -0400 (Thu, 29 Jul 2010) New Revision: 6844 Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java Log: WELD-493 Fixed failing test Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java =================================================================== --- core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java 2010-07-29 17:09:30 UTC (rev 6843) +++ core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java 2010-07-29 17:12:39 UTC (rev 6844) @@ -31,11 +31,12 @@ import java.util.List; import java.util.Set; +import javassist.util.proxy.ProxyObject; + import javax.el.ELContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.util.TypeLiteral; -import org.jboss.weld.bean.proxy.Proxy; import org.jboss.weld.exceptions.UnsatisfiedResolutionException; import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.mock.el.EL; @@ -172,6 +173,6 @@ public static boolean isProxy(Object proxy) { - return proxy instanceof Proxy; + return proxy instanceof ProxyObject; } } Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java 2010-07-29 17:09:30 UTC (rev 6843) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java 2010-07-29 17:12:39 UTC (rev 6844) @@ -28,6 +28,8 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; +import junit.framework.Assert; + @SessionScoped public class Consumer implements Serializable { @@ -60,15 +62,15 @@ public void check() { - assert Checker.checkBeanManager(beanManager); + Assert.assertTrue(Checker.checkBeanManager(beanManager)); // Not working incontainer as there is no principal //assert Checker.checkPrincipal(principal); - assert Checker.checkUserTransaction(userTransaction); - assert Checker.checkValidator(validator); - assert Checker.checkValidatorFactory(validatorFactory); - assert Checker.checkInstance(cow); - assert Checker.checkEvent(event, observer); + Assert.assertTrue(Checker.checkUserTransaction(userTransaction)); + Assert.assertTrue(Checker.checkValidator(validator)); + Assert.assertTrue(Checker.checkValidatorFactory(validatorFactory)); + Assert.assertTrue(Checker.checkInstance(cow)); + Assert.assertTrue(Checker.checkEvent(event, observer)); } Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java 2010-07-29 17:09:30 UTC (rev 6843) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java 2010-07-29 17:12:39 UTC (rev 6844) @@ -37,7 +37,8 @@ public static Archive<?> deploy() { return ShrinkWrap.create(BeanArchive.class) - .addPackage(SerializationTest.class.getPackage()); + .addPackage(SerializationTest.class.getPackage()) + .addClass(Utils.class); } /*