Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git
into easymock_update

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a0a70581
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a0a70581
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a0a70581

Branch: refs/heads/master
Commit: a0a70581f91db9bd4c7cd5104f400dc83d479c54
Parents: d8e4cb8 eddd8e0
Author: victorsosa <victor.s...@peopleware.do>
Authored: Thu Mar 3 17:49:06 2016 -0400
Committer: victorsosa <victor.s...@peopleware.do>
Committed: Thu Mar 3 17:56:44 2016 -0400

----------------------------------------------------------------------
 .../interceptor/CookieInterceptorTest.java      | 25 --------------------
 1 file changed, 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/a0a70581/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index f4b41ee,211a9bd..6542f81
--- 
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@@ -392,15 -384,15 +384,6 @@@ public class CookieInterceptorTest exte
          assertFalse(excludedName.get(pollution4));
          assertFalse(excludedName.get(pollution5));
          assertFalse(excludedName.get(pollution6));
--
--        assertFalse(excludedValue.get(pollution1));
--        assertFalse(excludedValue.get(pollution2));
--        assertFalse(excludedValue.get(pollution3));
--        assertFalse(excludedValue.get(pollution4));
--        assertFalse(excludedValue.get(pollution5));
--        assertFalse(excludedValue.get(pollution6));
--        
--        
      }
  
      public void testCookiesWithStrutsInternalsAccess() throws Exception {

Reply via email to