Author: dblevins
Date: Sat Sep 10 00:09:32 2011
New Revision: 1167410
URL: http://svn.apache.org/viewvc?rev=1167410&view=rev
Log:
Slight runner changeup
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/Runner.java
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletPersistenceInjectionTest.java
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/Runner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/Runner.java?rev=1167410&view=auto
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/Runner.java
(added)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/Runner.java
Sat Sep 10 00:09:32 2011
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+
+/**
+* @version $Rev$ $Date$
+*/
+public class Runner {
+
+ public static void run(HttpServletRequest req, HttpServletResponse resp,
Object obj) throws IOException {
+ req.getQueryString();
+ final Class<?> clazz = obj.getClass();
+ final Method[] methods = clazz.getMethods();
+
+ resp.setContentType("text/plain");
+ final PrintWriter writer = resp.getWriter();
+
+ for (Method method : methods) {
+ if (method.getName().startsWith("test")) {
+
+ writer.print(method.getName());
+
+ writer.print("=");
+
+ try {
+ method.invoke(obj);
+ writer.println("true");
+ } catch (Throwable e) {
+ writer.println("false");
+ }
+ }
+ }
+ }
+}
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletPersistenceInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletPersistenceInjectionTest.java?rev=1167410&r1=1167409&r2=1167410&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletPersistenceInjectionTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletPersistenceInjectionTest.java
Sat Sep 10 00:09:32 2011
@@ -42,8 +42,6 @@ import javax.transaction.UserTransaction
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
import java.net.URL;
import static junit.framework.Assert.assertNotNull;
@@ -89,6 +87,7 @@ public class ServletPersistenceInjection
return archive;
}
+
public static class PersistenceServlet extends HttpServlet {
@Resource
@@ -102,27 +101,7 @@ public class ServletPersistenceInjection
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- final Class<? extends PersistenceServlet> clazz = this.getClass();
- final Method[] methods = clazz.getMethods();
-
- resp.setContentType("text/plain");
- final PrintWriter writer = resp.getWriter();
-
- for (Method method : methods) {
- if (method.getName().startsWith("test")) {
-
- writer.print(method.getName());
-
- writer.print("=");
-
- try {
- method.invoke(this);
- writer.println("true");
- } catch (Throwable e) {
- writer.println("false");
- }
- }
- }
+ Runner.run(req, resp, this);
}
public void testEntityManagerFactory() {
