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

PoC: migrate from JUnit 4 to JUnit Jupiter Assertions

This commit is contained in:
Sam Brannen 2018-09-06 14:31:36 +02:00
parent 8658a357c8
commit fd352b84b3
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
View File

@ -22,6 +22,8 @@ import java.time.ZonedDateTime;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.function.Executable;
import reactor.core.publisher.MonoProcessor;
import org.springframework.http.CacheControl;
@ -33,7 +35,7 @@ import org.springframework.mock.http.client.reactive.MockClientHttpRequest;
import org.springframework.mock.http.client.reactive.MockClientHttpResponse;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
@ -51,32 +53,11 @@ public class HeaderAssertionTests {
headers.add("foo", "bar");
HeaderAssertions assertions = headerAssertions(headers);
// Success
assertions.valueEquals("foo", "bar");
assertDoesNotThrow(() -> assertions.valueEquals("foo", "bar"));
try {
assertions.valueEquals("what?!", "bar");
fail("Missing header expected");
}
catch (AssertionError error) {
// expected
}
try {
assertions.valueEquals("foo", "what?!");
fail("Wrong value expected");
}
catch (AssertionError error) {
// expected
}
try {
assertions.valueEquals("foo", "bar", "what?!");
fail("Wrong # of values expected");
}
catch (AssertionError error) {
// expected
}
assertThrows(() -> assertions.valueEquals("what?!", "bar"), "Missing header expected");
assertThrows(() -> assertions.valueEquals("foo", "what?!"), "Wrong value expected");
assertThrows(() -> assertions.valueEquals("foo", "bar", "what?!"), "Wrong # of values expected");
}
@Test
@ -104,7 +85,6 @@ public class HeaderAssertionTests {
catch (AssertionError error) {
// expected
}
}
@Test
@ -263,4 +243,8 @@ public class HeaderAssertionTests {
return new HeaderAssertions(result, mock(WebTestClient.ResponseSpec.class));
}
public static AssertionError assertThrows(Executable executable, String message) {
return Assertions.assertThrows(AssertionError.class, executable, message);
}
}