root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish FlashMapManagerTests

This commit is contained in:
Rossen Stoyanchev 2015-03-19 15:04:13 -04:00
parent 41e437066e
commit 46537a76ed
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,10 +16,13 @@
package org.springframework.web.servlet.support; package org.springframework.web.servlet.support;
import static org.junit.Assert.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -32,7 +35,6 @@ import org.springframework.util.MultiValueMap;
import org.springframework.web.servlet.FlashMap; import org.springframework.web.servlet.FlashMap;
import org.springframework.web.util.WebUtils; import org.springframework.web.util.WebUtils;
import static org.junit.Assert.*;
/** /**
* Test fixture for testing {@link AbstractFlashMapManager} methods. * Test fixture for testing {@link AbstractFlashMapManager} methods.
@ -47,6 +49,7 @@ public class FlashMapManagerTests {
private MockHttpServletResponse response; private MockHttpServletResponse response;
@Before @Before
public void setup() { public void setup() {
this.flashMapManager = new TestFlashMapManager(); this.flashMapManager = new TestFlashMapManager();
@ -54,13 +57,14 @@ public class FlashMapManagerTests {
this.response = new MockHttpServletResponse(); this.response = new MockHttpServletResponse();
} }
@Test @Test
public void retrieveAndUpdateMatchByPath() { public void retrieveAndUpdateMatchByPath() {
FlashMap flashMap = new FlashMap(); FlashMap flashMap = new FlashMap();
flashMap.put("key", "value"); flashMap.put("key", "value");
flashMap.setTargetRequestPath("/path"); flashMap.setTargetRequestPath("/path");
this.flashMapManager.setFlashMaps(flashMap); this.flashMapManager.setFlashMaps(Arrays.asList(flashMap));
this.request.setRequestURI("/path"); this.request.setRequestURI("/path");
FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response); FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response);
@ -76,7 +80,7 @@ public class FlashMapManagerTests {
flashMap.put("key", "value"); flashMap.put("key", "value");
flashMap.setTargetRequestPath("/accounts"); flashMap.setTargetRequestPath("/accounts");
this.flashMapManager.setFlashMaps(flashMap); this.flashMapManager.setFlashMaps(Arrays.asList(flashMap));
this.request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/accounts"); this.request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/accounts");
this.request.setRequestURI("/mvc/accounts"); this.request.setRequestURI("/mvc/accounts");
@ -92,7 +96,7 @@ public class FlashMapManagerTests {
flashMap.put("key", "value"); flashMap.put("key", "value");
flashMap.setTargetRequestPath("/path"); flashMap.setTargetRequestPath("/path");
this.flashMapManager.setFlashMaps(flashMap); this.flashMapManager.setFlashMaps(Arrays.asList(flashMap));
this.request.setRequestURI("/path/"); this.request.setRequestURI("/path/");
FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response); FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response);
@ -107,7 +111,7 @@ public class FlashMapManagerTests {
flashMap.put("key", "value"); flashMap.put("key", "value");
flashMap.addTargetRequestParam("number", "one"); flashMap.addTargetRequestParam("number", "one");
this.flashMapManager.setFlashMaps(flashMap); this.flashMapManager.setFlashMaps(Arrays.asList(flashMap));
this.request.setParameter("number", (String) null); this.request.setParameter("number", (String) null);
FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response); FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response);
@ -137,7 +141,7 @@ public class FlashMapManagerTests {
flashMap.addTargetRequestParam("id", "1"); flashMap.addTargetRequestParam("id", "1");
flashMap.addTargetRequestParam("id", "2"); flashMap.addTargetRequestParam("id", "2");
this.flashMapManager.setFlashMaps(flashMap); this.flashMapManager.setFlashMaps(Arrays.asList(flashMap));
this.request.setParameter("id", "1"); this.request.setParameter("id", "1");
FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response); FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response);
@ -165,7 +169,7 @@ public class FlashMapManagerTests {
flashMapTwo.put("key2", "value2"); flashMapTwo.put("key2", "value2");
flashMapTwo.setTargetRequestPath("/one/two"); flashMapTwo.setTargetRequestPath("/one/two");
this.flashMapManager.setFlashMaps(emptyFlashMap, flashMapOne, flashMapTwo); this.flashMapManager.setFlashMaps(Arrays.asList(emptyFlashMap, flashMapOne, flashMapTwo));
this.request.setRequestURI("/one/two"); this.request.setRequestURI("/one/two");
FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response); FlashMap inputFlashMap = this.flashMapManager.retrieveAndUpdate(this.request, this.response);
@ -285,17 +289,15 @@ public class FlashMapManagerTests {
private List<FlashMap> flashMaps; private List<FlashMap> flashMaps;
public void setFlashMaps(List<FlashMap> flashMaps) {
this.flashMaps = new CopyOnWriteArrayList<>(flashMaps);
}
public List<FlashMap> getFlashMaps() { public List<FlashMap> getFlashMaps() {
return this.flashMaps; return this.flashMaps;
} }
public void setFlashMaps(FlashMap... flashMaps) {
setFlashMaps(Arrays.asList(flashMaps));
}
public void setFlashMaps(List<FlashMap> flashMaps) {
this.flashMaps = new CopyOnWriteArrayList<FlashMap>(flashMaps);
}
@Override @Override
protected List<FlashMap> retrieveFlashMaps(HttpServletRequest request) { protected List<FlashMap> retrieveFlashMaps(HttpServletRequest request) {
@ -303,8 +305,8 @@ public class FlashMapManagerTests {
} }
@Override @Override
protected void updateFlashMaps(List<FlashMap> flashMaps, HttpServletRequest request, HttpServletResponse response) { protected void updateFlashMaps(List<FlashMap> maps, HttpServletRequest request, HttpServletResponse response) {
this.flashMaps = flashMaps; this.flashMaps = maps;
} }
} }