This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1995ba5 OWB-1371 add IT for Request and Session Scope
1995ba5 is described below
commit 1995ba5c894394a13ccb6b580760930e5ed10a85
Author: Mark Struberg <[email protected]>
AuthorDate: Sat Feb 27 23:37:34 2021 +0100
OWB-1371 add IT for Request and Session Scope
---
.../web/tomcat7/test/TestRequestBean.java} | 38 +++++++-------------
.../webbeans/web/tomcat7/test/TestServlet.java | 40 ++++++++++++++++++++--
.../web/tomcat7/test/TestSessionBean.java} | 39 +++++++--------------
.../web/tomcat7/test/OwbTomcatPluginIT.java | 25 +++++++++++---
4 files changed, 84 insertions(+), 58 deletions(-)
diff --git
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
similarity index 52%
copy from
webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
copy to
webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
index bf31118..7dca68e 100644
---
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
+++
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
@@ -18,37 +18,25 @@
*/
package org.apache.webbeans.web.tomcat7.test;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.lang.StringBuilder;
-import java.net.URL;
+import javax.enterprise.context.RequestScoped;
/**
- * Simple requests to the tomcat installation
+ * Test bean which gets used in the TestServlet.
*/
-public class OwbTomcatPluginIT
+@RequestScoped
+public class TestRequestBean
{
- @Test
- public void testTomcatRequest() throws Exception
- {
- // Get the response
- StringBuilder builder = new StringBuilder();
- try (BufferedReader rd = new BufferedReader(
- new InputStreamReader(new
URL("http://localhost:9082/owbtomcat7it/test.test";).openStream())))
- {
- String line = "";
- while ((line = rd.readLine()) != null)
- {
- builder.append(line);
- }
- }
+ int i = 1000;
- Assert.assertEquals(":thumb_up:", builder.toString());
+ public int getI()
+ {
+ return i;
+ }
+
+ public void setI(int i)
+ {
+ this.i = i;
}
}
diff --git
a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
index 92040e8..59c97b7 100644
---
a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
+++
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
/**
@@ -35,7 +36,7 @@ public class TestServlet implements Servlet
{
@Inject
- private TestBean tb;
+ private TestBean injectedTestBean;
public void destroy()
{
@@ -54,13 +55,13 @@ public class TestServlet implements Servlet
public void service(ServletRequest req, ServletResponse res) throws
ServletException, IOException
{
- if (tb != null)
+ if (injectedTestBean != null)
{
throw new RuntimeException("That's unexpected, we are in fatwar
mode so cannot activate the tomcat7 " +
"plugin and yet injection is working!");
}
// now grab the beans by hand
- tb = CDI.current().select(TestBean.class).get();
+ TestBean tb = CDI.current().select(TestBean.class).get();
ServletContext context =
CDI.current().select(ServletContext.class).get();
@@ -76,6 +77,39 @@ public class TestServlet implements Servlet
{
throw new RuntimeException("CDI Injection missing servlet
request!");
}
+
+ TestRequestBean requestBean =
CDI.current().select(TestRequestBean.class).get();
+ TestSessionBean sessionBean =
CDI.current().select(TestSessionBean.class).get();
+
+
+ String action = req.getParameter("action");
+ if ("setRequest".equals(action))
+ {
+ requestBean.setI(Integer.parseInt(req.getParameter("val")));
+ requestBean.setI(requestBean.getI() + 100);
+ res.getWriter().write("" + requestBean.getI());
+ return;
+ }
+
+ if ("setSession".equals(action))
+ {
+ sessionBean.setI(Integer.parseInt(req.getParameter("val")));
+ res.getWriter().write("" + sessionBean.getI());
+ return;
+ }
+
+ if ("getSession".equals(action))
+ {
+ res.getWriter().write(sessionBean.getI());
+ return;
+ }
+
+ if ("clearSession".equals(action))
+ {
+ ((HttpServletRequest)req).getSession(true).invalidate();
+ }
+
+
res.getWriter().write(":thumb_up:");
}
diff --git
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
similarity index 52%
copy from
webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
copy to
webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
index bf31118..d633544 100644
---
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
+++
b/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
@@ -18,37 +18,24 @@
*/
package org.apache.webbeans.web.tomcat7.test;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.lang.StringBuilder;
-import java.net.URL;
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
/**
- * Simple requests to the tomcat installation
+ * Test bean which gets used in the TestServlet.
*/
-public class OwbTomcatPluginIT
+@SessionScoped
+public class TestSessionBean implements Serializable
{
- @Test
- public void testTomcatRequest() throws Exception
- {
- // Get the response
- StringBuilder builder = new StringBuilder();
- try (BufferedReader rd = new BufferedReader(
- new InputStreamReader(new
URL("http://localhost:9082/owbtomcat7it/test.test";).openStream())))
- {
-
- String line = "";
- while ((line = rd.readLine()) != null)
- {
- builder.append(line);
- }
- }
+ int i = 2000;
- Assert.assertEquals(":thumb_up:", builder.toString());
+ public int getI()
+ {
+ return i;
}
+ public void setI(int i)
+ {
+ this.i = i;
+ }
}
diff --git
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
b/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
index bf31118..e726d0e 100644
---
a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
+++
b/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
@@ -23,6 +23,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.StringBuilder;
import java.net.URL;
@@ -35,10 +36,27 @@ public class OwbTomcatPluginIT
@Test
public void testTomcatRequest() throws Exception
{
- // Get the response
+
+ {
+ // Get the response
+ String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test";);
+ Assert.assertEquals(":thumb_up:", response);
+ }
+ {
+ String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test?action=setRequest&val=3500";);
+ Assert.assertEquals("3600", response);
+ }
+
+ {
+ String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test?action=setSession&val=500";);
+ Assert.assertEquals("500", response);
+ }
+ }
+
+ private String getResponse(String url) throws IOException {
StringBuilder builder = new StringBuilder();
try (BufferedReader rd = new BufferedReader(
- new InputStreamReader(new
URL("http://localhost:9082/owbtomcat7it/test.test";).openStream())))
+ new InputStreamReader(new URL(url).openStream())))
{
String line = "";
@@ -47,8 +65,7 @@ public class OwbTomcatPluginIT
builder.append(line);
}
}
-
- Assert.assertEquals(":thumb_up:", builder.toString());
+ return builder.toString();
}
}
