Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-07-28 22:05:40 +02:00
parent a3163ceb88
commit 8cc0fa5ae1
6 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,20 +18,21 @@ package org.springframework.web.filter;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.Before;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.util.FileCopyUtils;
import static org.junit.Assert.*;
/**
* Test for {@link AbstractRequestLoggingFilter} and sub classes.
*
@@ -41,11 +42,13 @@ public class RequestLoggingFilterTests {
private MyRequestLoggingFilter filter;
@Before
public void createFilter() throws Exception {
filter = new MyRequestLoggingFilter();
}
@Test
public void uri() throws Exception {
final MockHttpServletRequest request = new MockHttpServletRequest("POST", "/hotels");
@@ -53,17 +56,17 @@ public class RequestLoggingFilterTests {
request.setQueryString("booking=42");
FilterChain filterChain = new NoopFilterChain();
FilterChain filterChain = new NoOpFilterChain();
filter.doFilter(request, response, filterChain);
assertNotNull(filter.beforeRequestMessage);
assertTrue(filter.beforeRequestMessage.indexOf("uri=/hotel") != -1);
assertFalse(filter.beforeRequestMessage.indexOf("booking=42") != -1);
assertTrue(filter.beforeRequestMessage.contains("uri=/hotel"));
assertFalse(filter.beforeRequestMessage.contains("booking=42"));
assertNotNull(filter.afterRequestMessage);
assertTrue(filter.afterRequestMessage.indexOf("uri=/hotel") != -1);
assertFalse(filter.afterRequestMessage.indexOf("booking=42") != -1);
assertTrue(filter.afterRequestMessage.contains("uri=/hotel"));
assertFalse(filter.afterRequestMessage.contains("booking=42"));
}
@Test
@@ -75,15 +78,15 @@ public class RequestLoggingFilterTests {
request.setQueryString("booking=42");
FilterChain filterChain = new NoopFilterChain();
FilterChain filterChain = new NoOpFilterChain();
filter.doFilter(request, response, filterChain);
assertNotNull(filter.beforeRequestMessage);
assertTrue(filter.beforeRequestMessage.indexOf("uri=/hotels?booking=42") != -1);
assertTrue(filter.beforeRequestMessage.contains("uri=/hotels?booking=42"));
assertNotNull(filter.afterRequestMessage);
assertTrue(filter.afterRequestMessage.indexOf("uri=/hotels?booking=42") != -1);
assertTrue(filter.afterRequestMessage.contains("uri=/hotels?booking=42"));
}
@Test
@@ -109,7 +112,7 @@ public class RequestLoggingFilterTests {
filter.doFilter(request, response, filterChain);
assertNotNull(filter.afterRequestMessage);
assertTrue(filter.afterRequestMessage.indexOf("Hello World") != -1);
assertTrue(filter.afterRequestMessage.contains("Hello World"));
}
@Test
@@ -135,7 +138,7 @@ public class RequestLoggingFilterTests {
filter.doFilter(request, response, filterChain);
assertNotNull(filter.afterRequestMessage);
assertTrue(filter.afterRequestMessage.indexOf(requestBody) != -1);
assertTrue(filter.afterRequestMessage.contains(requestBody));
}
@Test
@@ -162,10 +165,11 @@ public class RequestLoggingFilterTests {
filter.doFilter(request, response, filterChain);
assertNotNull(filter.afterRequestMessage);
assertTrue(filter.afterRequestMessage.indexOf("Hel") != -1);
assertFalse(filter.afterRequestMessage.indexOf("Hello World") != -1);
assertTrue(filter.afterRequestMessage.contains("Hel"));
assertFalse(filter.afterRequestMessage.contains("Hello World"));
}
private static class MyRequestLoggingFilter extends AbstractRequestLoggingFilter {
private String beforeRequestMessage;
@@ -183,7 +187,8 @@ public class RequestLoggingFilterTests {
}
}
private static class NoopFilterChain implements FilterChain {
private static class NoOpFilterChain implements FilterChain {
@Override
public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {