Skip to content

Commit

Permalink
Update test for get attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@cziegeler
cziegeler committed Jun 20, 2024
1 parent b63df19 commit dbc6b92
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 40 deletions.
44 changes: 34 additions & 10 deletions ...rappers-1.0.x/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,14 +36,15 @@
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<>();

Expand Down Expand Up @@ -229,20 +228,44 @@ public AsyncContext startAsync() throws IllegalStateException {
}

@Override
public AsyncContext startAsync(javax.servlet.ServletRequest servletRequest, ServletResponse servletResponse)
public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
};
}

@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());
Expand All @@ -253,15 +276,16 @@ public AsyncContext startAsync(javax.servlet.ServletRequest servletRequest, Serv
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));

Expand Down
42 changes: 32 additions & 10 deletions .../wrappers-1.0.x/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,14 +36,15 @@
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<>();

Expand Down Expand Up @@ -229,20 +228,43 @@ public AsyncContext startAsync() throws IllegalStateException {
}

@Override
public AsyncContext startAsync(jakarta.servlet.ServletRequest servletRequest, ServletResponse servletResponse)
public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
};
}

@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());
Expand All @@ -257,11 +279,11 @@ public AsyncContext startAsync(jakarta.servlet.ServletRequest servletRequest, Se
}

@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));

Expand Down
44 changes: 34 additions & 10 deletions http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,14 +36,15 @@
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<>();

Expand Down Expand Up @@ -229,20 +228,44 @@ public AsyncContext startAsync() throws IllegalStateException {
}

@Override
public AsyncContext startAsync(javax.servlet.ServletRequest servletRequest, ServletResponse servletResponse)
public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
};
}

@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());
Expand All @@ -253,15 +276,16 @@ public AsyncContext startAsync(javax.servlet.ServletRequest servletRequest, Serv
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));

Expand Down
42 changes: 32 additions & 10 deletions http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -39,14 +37,15 @@
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<>();

Expand Down Expand Up @@ -225,7 +224,7 @@ public AsyncContext startAsync() throws IllegalStateException {
}

@Override
public AsyncContext startAsync(jakarta.servlet.ServletRequest servletRequest, ServletResponse servletResponse)
public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
throws IllegalStateException {
return null;
}
Expand All @@ -248,12 +247,35 @@ public ServletConnection getServletConnection() {
}

@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());
Expand All @@ -268,11 +290,11 @@ public ServletConnection getServletConnection() {
}

@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));

Expand Down

0 comments on commit dbc6b92

Please sign in to comment.