[weld-commits] Weld SVN: r6869 - in core/trunk: tests-arquillian/src/test/java/org/jboss/weld/tests and 2 other directories.
Author: aslak
Date: 2010-08-01 12:33:41 -0400 (Sun, 01 Aug 2010)
New Revision: 6869
Added:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver/
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/tests/el/resolver/
Modified:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver/ELResolverTest.java
Log:
WELD-493 Converted ElResolverTest to Arquillian
Copied: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver (from
rev 6868, core/trunk/tests/src/test/java/org/jboss/weld/tests/el/resolver)
Modified:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver/ELResolverTest.java
===================================================================
---
core/trunk/tests/src/test/java/org/jboss/weld/tests/el/resolver/ELResolverTest.java 2010-08-01
16:19:26 UTC (rev 6868)
+++
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver/ELResolverTest.java 2010-08-01
16:33:41 UTC (rev 6869)
@@ -16,26 +16,44 @@
*/
package org.jboss.weld.tests.el.resolver;
-import static org.testng.Assert.assertEquals;
-
import javax.el.ELContext;
import javax.el.ExpressionFactory;
+import javax.inject.Inject;
-import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.BeanArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.mock.el.EL;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import com.sun.el.ExpressionFactoryImpl;
+
/**
* Test the WeldELResolver and that it collaborates with the standard EL resolver chain.
*
* @author Pete Muir
* @author Dan Allen
*/
-@Artifact
-public class ELResolverTest extends AbstractWeldTest
+(a)RunWith(Arquillian.class)
+public class ELResolverTest
{
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(ELResolverTest.class.getPackage())
+ .addClass(EL.class)
+ .addPackages(true, ExpressionFactoryImpl.class.getPackage());
+ }
+ @Inject
+ private BeanManagerImpl beanManager;
+
/**
* Test that the WeldELResolver only works to resolve the base of an EL
* expression, in this case a named bean. Once the base is resolved, the
@@ -47,10 +65,12 @@
@Test
public void testResolveBeanPropertyOfNamedBean()
{
- ELContext elContext = EL.createELContext(getCurrentManager());
+ ELContext elContext = EL.createELContext(beanManager);
ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
- assertEquals(exprFactory.createValueExpression(elContext,
"#{beer.style}", String.class).getValue(elContext), "Belgium Strong Dark
Ale");
+ Object value = exprFactory.createValueExpression(elContext,
"#{beer.style}", String.class).getValue(elContext);
+
+ Assert.assertEquals("Belgium Strong Dark Ale", value);
}
/**
@@ -64,10 +84,10 @@
@Test
public void testResolveBeanPropertyOfProducerBean()
{
- ELContext elContext = EL.createELContext(getCurrentManager());
+ ELContext elContext = EL.createELContext(beanManager);
ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
- assertEquals(exprFactory.createValueExpression(elContext,
"#{beerOnTap.style}", String.class).getValue(elContext), "IPA");
+ Object value = exprFactory.createValueExpression(elContext,
"#{beerOnTap.style}", String.class).getValue(elContext);
+ Assert.assertEquals("IPA", value);
}
-
}