This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new dbc6b9291c Update test for get attribute
dbc6b9291c is described below
commit dbc6b9291c95de76b325c2553d18f0c79dd910d0
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Jun 20 07:19:05 2024 +0200
Update test for get attribute
---
.../http/jakartawrappers/ServletRequestTest.java | 44 +++++++++++++++++-----
.../http/javaxwrappers/ServletRequestTest.java | 42 ++++++++++++++++-----
.../http/jakartawrappers/ServletRequestTest.java | 44 +++++++++++++++++-----
.../http/javaxwrappers/ServletRequestTest.java | 42 ++++++++++++++++-----
4 files changed, 132 insertions(+), 40 deletions(-)
diff --git
a/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
b/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
index 322068352f..bf9e6df4da 100644
---
a/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
+++
b/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.felix.http.jakartawrappers;
-import jakarta.servlet.ServletRequest;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -38,14 +36,15 @@ import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.junit.Test;
public class ServletRequestTest {
- private javax.servlet.ServletRequest createRequest() {
- return new javax.servlet.ServletRequest() {
+ private ServletRequest createRequest() {
+ return new ServletRequest() {
final private Map<String, Object> attributes = new HashMap<>();
@@ -229,7 +228,7 @@ public class ServletRequestTest {
}
@Override
- public AsyncContext startAsync(javax.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
@@ -237,12 +236,36 @@ public class ServletRequestTest {
}
@Test public void testAttributeGetterSetter() {
- final javax.servlet.ServletRequest sr = createRequest();
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest sr = createRequest();
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testAttributeGetterSetterMultipleLayers() {
+ final ServletRequest sr = createRequest();
+ final jakarta.servlet.ServletRequest layer1 =
ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest layer2 =
org.apache.felix.http.javaxwrappers.ServletRequestWrapper.getWrapper(layer1);
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(layer2);
req.setAttribute("foo", "bar");
assertEquals("bar", req.getAttribute("foo"));
req.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
req.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
sr.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
final List<String> names = Collections.list(req.getAttributeNames());
assertEquals(2, names.size());
@@ -253,15 +276,16 @@ public class ServletRequestTest {
assertNull(req.getAttribute("foo"));
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertNull(req.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
assertFalse(req.getAttributeNames().hasMoreElements());
}
@Test public void testProvidedAttributes() {
- final javax.servlet.ServletRequest sr = createRequest();
- sr.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ final ServletRequest sr = createRequest();
+ sr.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, "500");
sr.setAttribute("foo", "bar");
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
assertEquals("bar", req.getAttribute("foo"));
assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
diff --git
a/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
b/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
index 54bd7ecc95..ae6b0df22a 100644
---
a/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
+++
b/http/wrappers-1.0.x/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.felix.http.javaxwrappers;
-import javax.servlet.ServletRequest;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -38,14 +36,15 @@ import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import org.junit.Test;
public class ServletRequestTest {
- private jakarta.servlet.ServletRequest createRequest() {
- return new jakarta.servlet.ServletRequest() {
+ private ServletRequest createRequest() {
+ return new ServletRequest() {
final private Map<String, Object> attributes = new HashMap<>();
@@ -229,7 +228,7 @@ public class ServletRequestTest {
}
@Override
- public AsyncContext startAsync(jakarta.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
@@ -237,12 +236,35 @@ public class ServletRequestTest {
}
@Test public void testAttributeGetterSetter() {
- final jakarta.servlet.ServletRequest sr = createRequest();
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest sr = createRequest();
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+ req.removeAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testAttributeGetterSetterMultipleLayers() {
+ final ServletRequest sr = createRequest();
+ final javax.servlet.ServletRequest layer1 =
ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest layer2 =
org.apache.felix.http.jakartawrappers.ServletRequestWrapper.getWrapper(layer1);
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(layer2);
req.setAttribute("foo", "bar");
assertEquals("bar", req.getAttribute("foo"));
req.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
sr.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
final List<String> names = Collections.list(req.getAttributeNames());
assertEquals(2, names.size());
@@ -257,11 +279,11 @@ public class ServletRequestTest {
}
@Test public void testProvidedAttributes() {
- final jakarta.servlet.ServletRequest sr = createRequest();
- sr.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ final ServletRequest sr = createRequest();
+ sr.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, "500");
sr.setAttribute("foo", "bar");
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
assertEquals("bar", req.getAttribute("foo"));
assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
diff --git
a/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
b/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
index 322068352f..bf9e6df4da 100644
---
a/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
+++
b/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.felix.http.jakartawrappers;
-import jakarta.servlet.ServletRequest;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -38,14 +36,15 @@ import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.junit.Test;
public class ServletRequestTest {
- private javax.servlet.ServletRequest createRequest() {
- return new javax.servlet.ServletRequest() {
+ private ServletRequest createRequest() {
+ return new ServletRequest() {
final private Map<String, Object> attributes = new HashMap<>();
@@ -229,7 +228,7 @@ public class ServletRequestTest {
}
@Override
- public AsyncContext startAsync(javax.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
@@ -237,12 +236,36 @@ public class ServletRequestTest {
}
@Test public void testAttributeGetterSetter() {
- final javax.servlet.ServletRequest sr = createRequest();
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest sr = createRequest();
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testAttributeGetterSetterMultipleLayers() {
+ final ServletRequest sr = createRequest();
+ final jakarta.servlet.ServletRequest layer1 =
ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest layer2 =
org.apache.felix.http.javaxwrappers.ServletRequestWrapper.getWrapper(layer1);
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(layer2);
req.setAttribute("foo", "bar");
assertEquals("bar", req.getAttribute("foo"));
req.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
req.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
sr.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
final List<String> names = Collections.list(req.getAttributeNames());
assertEquals(2, names.size());
@@ -253,15 +276,16 @@ public class ServletRequestTest {
assertNull(req.getAttribute("foo"));
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertNull(req.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
assertFalse(req.getAttributeNames().hasMoreElements());
}
@Test public void testProvidedAttributes() {
- final javax.servlet.ServletRequest sr = createRequest();
- sr.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ final ServletRequest sr = createRequest();
+ sr.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, "500");
sr.setAttribute("foo", "bar");
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final jakarta.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
assertEquals("bar", req.getAttribute("foo"));
assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
diff --git
a/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
b/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
index 8700eb3a28..64702a0b1c 100644
---
a/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
+++
b/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.felix.http.javaxwrappers;
-import javax.servlet.ServletRequest;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -39,14 +37,15 @@ import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import org.junit.Test;
public class ServletRequestTest {
- private jakarta.servlet.ServletRequest createRequest() {
- return new jakarta.servlet.ServletRequest() {
+ private ServletRequest createRequest() {
+ return new ServletRequest() {
final private Map<String, Object> attributes = new HashMap<>();
@@ -225,7 +224,7 @@ public class ServletRequestTest {
}
@Override
- public AsyncContext startAsync(jakarta.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
@@ -248,12 +247,35 @@ public class ServletRequestTest {
}
@Test public void testAttributeGetterSetter() {
- final jakarta.servlet.ServletRequest sr = createRequest();
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest sr = createRequest();
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+ req.removeAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testAttributeGetterSetterMultipleLayers() {
+ final ServletRequest sr = createRequest();
+ final javax.servlet.ServletRequest layer1 =
ServletRequestWrapper.getWrapper(sr);
+ final ServletRequest layer2 =
org.apache.felix.http.jakartawrappers.ServletRequestWrapper.getWrapper(layer1);
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(layer2);
req.setAttribute("foo", "bar");
assertEquals("bar", req.getAttribute("foo"));
req.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertEquals("500",
sr.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
final List<String> names = Collections.list(req.getAttributeNames());
assertEquals(2, names.size());
@@ -268,11 +290,11 @@ public class ServletRequestTest {
}
@Test public void testProvidedAttributes() {
- final jakarta.servlet.ServletRequest sr = createRequest();
- sr.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ final ServletRequest sr = createRequest();
+ sr.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, "500");
sr.setAttribute("foo", "bar");
- final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ final javax.servlet.ServletRequest req =
ServletRequestWrapper.getWrapper(sr);
assertEquals("bar", req.getAttribute("foo"));
assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
