[weld-commits] Weld SVN: r6871 - in core/trunk: tests/src/test/resources/org/jboss/weld/tests and 3 other directories.

Author: aslak Date: 2010-08-01 13:01:26 -0400 (Sun, 01 Aug 2010) New Revision: 6871 Added: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/ core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/jsp/ Removed: core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/ Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/JspTest.java Log: WELD-493 Converted JspTest to Arquillian Copied: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp (from rev 6868, core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp) Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/JspTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java 2010-08-01 16:19:26 UTC (rev 6868) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/JspTest.java 2010-08-01 17:01:26 UTC (rev 6871) @@ -32,14 +32,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import junit.framework.Assert; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WebXml; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.api.Run; +import org.jboss.arquillian.api.RunModeType; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.weld.tests.category.Integration; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebClient; @@ -48,31 +53,36 @@ * @author Nicklas Karlsson * @author Dan Allen */ -@Artifact(addCurrentPackage = false) -@IntegrationTest(runLocally = true) -@Resources( { - @Resource(destination = "index.jsp", source = "index.jsp"), - @Resource(destination = "home.jspx", source = "home.jspx"), - @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") -}) -(a)WebXml("web.xml") -public class JspTest extends AbstractWeldTest +(a)Category(Integration.class) +(a)RunWith(Arquillian.class) +(a)Run(RunModeType.AS_CLIENT) +public class JspTest { + @Deployment + public static WebArchive createDeployment() + { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addWebResource(JspTest.class.getPackage(), "web.xml", "web.xml") + .addWebResource(JspTest.class.getPackage(), "faces-config.xml", "faces-config.xml") + .addResource(JspTest.class.getPackage(), "index.jsp", "index.jsp") + .addResource(JspTest.class.getPackage(), "home.jspx", "home.jspx") + .addWebResource(EmptyAsset.INSTANCE, "beans.xml"); + } - @Test(groups = { "contexts" }) + @Test public void testConversationPropagationToNonExistentConversationLeadsException() throws Exception { WebClient client = new WebClient(); client.setThrowExceptionOnFailingStatusCode(false); Page page = client.getPage(getPath("/index.jsp")); - assert page.getWebResponse().getStatusCode() == 200; - assert page.getWebResponse().getRequestUrl().toString().contains("home.jsf"); + + Assert.assertEquals(200, page.getWebResponse().getStatusCode()); + Assert.assertTrue(page.getWebResponse().getRequestUrl().toString().contains("home.jsf")); } - @Override - protected String getPath(String viewId) + protected String getPath(String page) { - return getContextPath() + viewId; + // TODO: this should be moved out and be handled by Arquillian + return "http://localhost:8080/test/" + page; } - } \ No newline at end of file Copied: core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/jsp (from rev 6868, core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp)