From 2c99cd3bbf39d005bb19a9200c67bddb867e5d6c Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 17 Oct 2016 09:33:26 -0500 Subject: [PATCH] Remove MatcherAssertionErrors Spring 5 removes MatcherAssertionErrors. We should not have been using this class anyways. This commit updates to using assertj in favor of MatcherAssertionErrors. Issue gh-4080 --- .../WhiteListedAllowFromStrategyTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java index 09c25ccacf..2c6ddb1ff5 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java @@ -22,8 +22,8 @@ import org.springframework.security.web.header.writers.frameoptions.WhiteListedA import java.util.ArrayList; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; -import static org.springframework.test.util.MatcherAssertionErrors.assertThat; /** * Test for the {@code WhiteListedAllowFromStrategy}. @@ -53,7 +53,7 @@ public class WhiteListedAllowFromStrategyTests { request.setParameter("from", "http://www.test.com"); String result = strategy.getAllowFromValue(request); - assertThat(result, is("http://www.test.com")); + assertThat(result).isEqualTo("http://www.test.com"); } @Test @@ -67,7 +67,7 @@ public class WhiteListedAllowFromStrategyTests { request.setParameter("from", "http://www.test.com"); String result = strategy.getAllowFromValue(request); - assertThat(result, is("http://www.test.com")); + assertThat(result).isEqualTo("http://www.test.com"); } @Test @@ -80,7 +80,7 @@ public class WhiteListedAllowFromStrategyTests { request.setParameter("from", "http://www.test123.com"); String result = strategy.getAllowFromValue(request); - assertThat(result, is("DENY")); + assertThat(result).isEqualTo("DENY"); } @Test @@ -92,7 +92,7 @@ public class WhiteListedAllowFromStrategyTests { MockHttpServletRequest request = new MockHttpServletRequest(); String result = strategy.getAllowFromValue(request); - assertThat(result, is("DENY")); + assertThat(result).isEqualTo("DENY"); }