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

DATACMNS-1554 - Polishing.

Browse Source 
Replace AtTest(expected = …) and ExpectedException with the corresponding AssertJ assertThatExceptionOfType(…) and assertThatIllegalArgumentException().isThrownBy(…).
This commit is contained in:
Mark Paluch
2019-07-10 11:47:46 +02:00
parent 660006b8c9
commit 704913c866
79 changed files with 457 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java
View File

@@ -20,9 +20,8 @@ import static org.springframework.data.web.SortDefaultUnitTests.*;
import javax.servlet.http.HttpServletRequest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.core.MethodParameter;
import org.springframework.data.domain.AbstractPageRequest;
import org.springframework.data.domain.PageRequest;
@@ -53,8 +52,6 @@ public abstract class PageableDefaultUnitTests {
static final AbstractPageRequest REFERENCE_WITH_SORT_FIELDS = PageRequest.of(PAGE_NUMBER, PAGE_SIZE,
Sort.by(SORT_FIELDS));
@Rule public ExpectedException exception = ExpectedException.none();
@Test
public void supportsPageable() {
assertThat(getResolver().supportsParameter(getParameterOfMethod("supportedMethod"))).isTrue();
@@ -107,10 +104,9 @@ public abstract class PageableDefaultUnitTests {
HandlerMethodArgumentResolver resolver = getResolver();
assertThat(resolver.supportsParameter(parameter)).isTrue();
exception.expect(IllegalStateException.class);
exception.expectMessage("unique");
resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null);
assertThatIllegalStateException()
.isThrownBy(() -> resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null)) //
.withMessageContaining("unique");
}
@Test
@@ -122,10 +118,9 @@ public abstract class PageableDefaultUnitTests {
HandlerMethodArgumentResolver resolver = getResolver();
assertThat(resolver.supportsParameter(parameter)).isTrue();
exception.expect(IllegalStateException.class);
exception.expectMessage("Ambiguous");
resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null);
assertThatIllegalStateException()
.isThrownBy(() -> resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null)) //
.withMessageContaining("Ambiguous");
}
protected void assertSupportedAndResult(MethodParameter parameter, Pageable pageable) throws Exception {

26
src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java
View File

@@ -56,24 +56,28 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
assertSupportedAndResult(supportedMethodParameter, PageRequest.of(0, 100), request);
}
@Test(expected = IllegalArgumentException.class)
@Test
public void rejectsEmptyPageParameterName() {
new PageableHandlerMethodArgumentResolver().setPageParameterName("");
assertThatIllegalArgumentException()
.isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setPageParameterName(""));
}
@Test(expected = IllegalArgumentException.class)
@Test
public void rejectsNullPageParameterName() {
new PageableHandlerMethodArgumentResolver().setPageParameterName(null);
assertThatIllegalArgumentException()
.isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setPageParameterName(null));
}
@Test(expected = IllegalArgumentException.class)
@Test
public void rejectsEmptySizeParameterName() {
new PageableHandlerMethodArgumentResolver().setSizeParameterName("");
assertThatIllegalArgumentException()
.isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setSizeParameterName(""));
}
@Test(expected = IllegalArgumentException.class)
@Test
public void rejectsNullSizeParameterName() {
new PageableHandlerMethodArgumentResolver().setSizeParameterName(null);
assertThatIllegalArgumentException()
.isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setSizeParameterName(null));
}
@Test
@@ -104,10 +108,8 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
MethodParameter parameter = new MethodParameter(Sample.class.getMethod("invalidDefaultPageSize", Pageable.class),
0);
exception.expect(IllegalStateException.class);
exception.expectMessage("invalidDefaultPageSize");
assertSupportedAndResult(parameter, DEFAULT_PAGE_REQUEST);
assertThatIllegalStateException().isThrownBy(() -> assertSupportedAndResult(parameter, DEFAULT_PAGE_REQUEST)) //
.withMessageContaining("invalidDefaultPageSize");
}
@Test // DATACMNS-408

9
src/test/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolverUnitTests.java
View File

@@ -21,9 +21,8 @@ import java.lang.reflect.Method;
import java.util.Optional;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.MethodParameter;
import org.springframework.data.domain.Pageable;
@@ -41,8 +40,6 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests {
PagedResourcesAssemblerArgumentResolver resolver;
public @Rule ExpectedException exception = ExpectedException.none();
@Before
public void setUp() {
@@ -160,8 +157,8 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests {
Method method = Controller.class.getMethod(methodName, PagedResourcesAssembler.class, Pageable.class,
Pageable.class);
exception.expect(IllegalStateException.class);
resolver.resolveArgument(new MethodParameter(method, 0), null, null, null);
assertThatIllegalStateException()
.isThrownBy(() -> resolver.resolveArgument(new MethodParameter(method, 0), null, null, null));
}
@RequestMapping("/")

8
src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
View File

@@ -191,14 +191,14 @@ public class PagedResourcesAssemblerUnitTests {
assertThat(((EmbeddedWrapper) element).getRelTargetType()).isEqualTo(Person.class);
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-699
@Test // DATACMNS-699
public void emptyPageCreatorRejectsPageWithContent() {
assembler.toEmptyModel(createPage(1), Person.class);
assertThatIllegalArgumentException().isThrownBy(() -> assembler.toEmptyModel(createPage(1), Person.class));
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-699
@Test // DATACMNS-699
public void emptyPageCreatorRejectsNullType() {
assembler.toEmptyModel(EMPTY_PAGE, null);
assertThatIllegalArgumentException().isThrownBy(() -> assembler.toEmptyModel(EMPTY_PAGE, null));
}
@Test // DATACMNS-701

19
src/test/java/org/springframework/data/web/SortDefaultUnitTests.java
View File

@@ -17,9 +17,8 @@ package org.springframework.data.web;
import static org.assertj.core.api.Assertions.*;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.core.MethodParameter;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
@@ -32,6 +31,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
*
* @since 1.6
* @author Oliver Gierke
* @author Mark Paluch
*/
public abstract class SortDefaultUnitTests {
@@ -45,8 +45,6 @@ public abstract class SortDefaultUnitTests {
static final Sort SORT = Sort.by(SORT_DIRECTION, SORT_FIELDS);
@Rule public ExpectedException exception = ExpectedException.none();
@Test
public void parsesSimpleSortStringCorrectly() {
@@ -92,19 +90,18 @@ public abstract class SortDefaultUnitTests {
}
@Test
public void rejectsDoubleAnnotatedMethod() throws Exception {
public void rejectsDoubleAnnotatedMethod() {
MethodParameter parameter = getParameterOfMethod("invalid");
HandlerMethodArgumentResolver resolver = new SortHandlerMethodArgumentResolver();
assertThat(resolver.supportsParameter(parameter)).isTrue();
exception.expect(IllegalArgumentException.class);
exception.expectMessage(SortDefault.class.getSimpleName());
exception.expectMessage(SortDefaults.class.getSimpleName());
exception.expectMessage(parameter.toString());
resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null);
assertThatIllegalArgumentException()
.isThrownBy(() -> resolver.resolveArgument(parameter, null, TestUtils.getWebRequest(), null)) //
.withMessageContaining(SortDefault.class.getSimpleName()) //
.withMessageContaining(SortDefaults.class.getSimpleName()) //
.withMessageContaining(parameter.toString());
}
@Test

17
src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java
View File

@@ -21,9 +21,8 @@ import static org.springframework.data.web.querydsl.QuerydslPredicateArgumentRes
import java.util.Optional;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.core.MethodParameter;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -52,13 +51,10 @@ import com.querydsl.core.types.dsl.BooleanExpression;
*
* @author Christoph Strobl
* @author Oliver Gierke
* @author Mark Paluch
*/
public class QuerydslPredicateArgumentResolverUnitTests {
static final TypeInformation<?> USER_TYPE = ClassTypeInformation.from(User.class);
public @Rule ExpectedException exception = ExpectedException.none();
QuerydslPredicateArgumentResolver resolver;
MockHttpServletRequest request;
@@ -81,9 +77,10 @@ public class QuerydslPredicateArgumentResolverUnitTests {
.isTrue();
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-669
@Test // DATACMNS-669
public void supportsParameterShouldThrowExceptionWhenMethodParameterIsNoPredicateButAnnotatedAsSuch() {
resolver.supportsParameter(getMethodParameterFor("nonPredicateWithAnnotation", String.class));
assertThatIllegalArgumentException().isThrownBy(
() -> resolver.supportsParameter(getMethodParameterFor("nonPredicateWithAnnotation", String.class)));
}
@Test // DATACMNS-669
@@ -100,7 +97,7 @@ public class QuerydslPredicateArgumentResolverUnitTests {
Predicate predicate = resolver.resolveArgument(getMethodParameterFor("simpleFind", Predicate.class), null,
new ServletWebRequest(request), null);
assertThat(predicate).isEqualTo((Predicate) QUser.user.firstname.eq("rand"));
assertThat(predicate).isEqualTo(QUser.user.firstname.eq("rand"));
}
@Test // DATACMNS-669
@@ -112,7 +109,7 @@ public class QuerydslPredicateArgumentResolverUnitTests {
Predicate predicate = resolver.resolveArgument(getMethodParameterFor("simpleFind", Predicate.class), null,
new ServletWebRequest(request), null);
assertThat(predicate).isEqualTo((Predicate) QUser.user.firstname.eq("rand").and(QUser.user.lastname.eq("al'thor")));
assertThat(predicate).isEqualTo(QUser.user.firstname.eq("rand").and(QUser.user.lastname.eq("al'thor")));
}
@Test // DATACMNS-669