Author: rmannibucau
Date: Sun Oct 30 18:03:39 2011
New Revision: 1195198
URL: http://svn.apache.org/viewvc?rev=1195198&view=rev
Log:
adding some tests on getServletContext().getResource*
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesServletExporter.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/test.getresources
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesServletExporter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesServletExporter.java?rev=1195198&r1=1195197&r2=1195198&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesServletExporter.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesServletExporter.java
Sun Oct 30 18:03:39 2011
@@ -16,6 +16,17 @@ public class GetResourcesServletExporter
@Override protected void doGet(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
resp.setContentType("text/plain");
final PrintWriter writer = resp.getWriter();
- writer.write("found=" + GetResourcesHolder.RESOURCE_NUMBER);
+ writer.write("foundFromListener=" +
GetResourcesHolder.RESOURCE_NUMBER);
+
+ try {
+ // all this tests will throw an exception if it fails
+
getServletContext().getResource("/config/test.getresources").openStream().close();
+
getServletContext().getResourceAsStream("/config/test.getresources").close();
+ getServletContext().getResourcePaths("/config/").iterator().next();
+
+ writer.write("servletContextGetResource=ok");
+ } catch (Exception e) {
+ writer.write("servletContextGetResource=ko");
+ }
}
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java?rev=1195198&r1=1195197&r2=1195198&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
Sun Oct 30 18:03:39 2011
@@ -1,6 +1,5 @@
package org.apache.openejb.arquillian.tests.getresources;
-import org.apache.openejb.arquillian.tests.Tests;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -22,7 +21,7 @@ import static org.apache.openejb.arquill
* @author rmannibucau
*/
@RunWith(Arquillian.class)
-public class GetResourcesTest {
+ public class GetResourcesTest {
public static final String TEST_NAME =
GetResourcesTest.class.getSimpleName();
@Deployment(testable = false) public static WebArchive createDeployment() {
@@ -30,6 +29,7 @@ public class GetResourcesTest {
.addClass(GetResourcesServletExporter.class)
.addClass(GetResourcesListener.class)
.addClass(GetResourcesHolder.class)
+
.addAsWebResource(Thread.currentThread().getContextClassLoader().getResource("test.getresources"),
"/config/test.getresources")
.addAsLibraries(new File("target/test-libs/junit.jar"))
.setWebXML(new StringAsset(
Descriptors.create(WebAppDescriptor.class)
@@ -37,6 +37,7 @@ public class GetResourcesTest {
}
@Test public void check() throws IOException {
- assertOutput("http://localhost:9080/"; + TEST_NAME + "/get-resources",
"found=1");
+ assertOutput("http://localhost:9080/"; + TEST_NAME + "/get-resources",
"foundFromListener=1");
+ assertOutput("http://localhost:9080/"; + TEST_NAME + "/get-resources",
"servletContextGetResource=ok");
}
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/test.getresources
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/test.getresources?rev=1195198&r1=1195197&r2=1195198&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/test.getresources
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/test.getresources
Sun Oct 30 18:03:39 2011
@@ -0,0 +1 @@
+ok
