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

DATACMNS-867 - Second draft.

Browse Source
This commit is contained in:
Oliver Gierke
2016-06-21 16:52:28 +02:00
parent 57ed50a730
commit d4811e29d9
222 changed files with 2297 additions and 2138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java
View File

@@ -40,15 +40,15 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests {
QUser user = QUser.user;
QPageRequest pageRequest = new QPageRequest(0, 10, user.firstname.asc());
assertThat(pageRequest.getSort()).isEqualTo(new QSort(user.firstname.asc()));
assertThat(pageRequest.getSort()).isEqualTo(QSort.by(user.firstname.asc()));
}
@Test
public void constructsQPageRequestWithQSort() {
QUser user = QUser.user;
QPageRequest pageRequest = new QPageRequest(0, 10, new QSort(user.firstname.asc()));
QPageRequest pageRequest = new QPageRequest(0, 10, QSort.by(user.firstname.asc()));
assertThat(pageRequest.getSort()).isEqualTo(new QSort(user.firstname.asc()));
assertThat(pageRequest.getSort()).isEqualTo(QSort.by(user.firstname.asc()));
}
}

7
src/test/java/org/springframework/data/querydsl/QSortUnitTests.java
View File

@@ -41,11 +41,6 @@ import com.querydsl.core.types.dsl.StringPath;
*/
public class QSortUnitTests {
@Test(expected = IllegalArgumentException.class) // DATACMNS-402
public void shouldThrowIfNoOrderSpecifiersAreGiven() {
new QSort();
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-402
public void shouldThrowIfNullIsGiven() {
new QSort((List<OrderSpecifier<?>>) null);
@@ -165,7 +160,7 @@ public class QSortUnitTests {
StringPath path = new PathBuilderFactory().create(User.class).getString("firstname");
QSort sort = new QSort(new OrderSpecifier<String>(com.querydsl.core.types.Order.ASC, path));
QSort sort = new QSort(new OrderSpecifier<>(com.querydsl.core.types.Order.ASC, path));
assertThat(sort).contains(new Order(Direction.ASC, "firstname"));
}

20
src/test/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapterUnitTests.java
View File

@@ -15,11 +15,10 @@
*/
package org.springframework.data.querydsl;
import static org.mockito.Matchers.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.Serializable;
import java.lang.reflect.Method;
import org.junit.Before;
import org.junit.Test;
@@ -27,10 +26,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.repository.support.RepositoryInvoker;
import org.springframework.util.MultiValueMap;
import com.querydsl.core.types.Predicate;
@@ -57,7 +54,7 @@ public class QuerydslRepositoryInvokerAdapterUnitTests {
@Test // DATACMNS-669
public void forwardsFindAllToExecutorWithPredicate() {
Sort sort = new Sort("firstname");
Sort sort = Sort.by("firstname");
adapter.invokeFindAll(sort);
verify(executor, times(1)).findAll(predicate, sort);
@@ -67,7 +64,7 @@ public class QuerydslRepositoryInvokerAdapterUnitTests {
@Test // DATACMNS-669
public void forwardsFindAllWithPageableToExecutorWithPredicate() {
PageRequest pageable = new PageRequest(0, 10);
PageRequest pageable = PageRequest.of(0, 10);
adapter.invokeFindAll(pageable);
verify(executor, times(1)).findAll(predicate, pageable);
@@ -91,15 +88,14 @@ public class QuerydslRepositoryInvokerAdapterUnitTests {
verify(delegate, times(1)).hasSaveMethod();
adapter.invokeDelete(any(Serializable.class));
verify(delegate, times(1)).invokeDelete(any(Serializable.class));
verify(delegate, times(1)).invokeDelete(any());
adapter.invokeFindOne(any(Serializable.class));
verify(delegate, times(1)).invokeFindOne(any(Serializable.class));
verify(delegate, times(1)).invokeFindOne(any());
adapter.invokeQueryMethod(any(Method.class), (MultiValueMap<String, String>) any(MultiValueMap.class),
any(Pageable.class), any(Sort.class));
verify(delegate, times(1)).invokeQueryMethod(any(Method.class),
(MultiValueMap<String, String>) any(MultiValueMap.class), any(Pageable.class), any(Sort.class));
adapter.invokeQueryMethod(any(), any(), any(), any());
verify(delegate, times(1)).invokeQueryMethod(any(), any(), any(), any());
adapter.invokeSave(any());
verify(delegate, times(1)).invokeSave(any());

2
src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java
View File

@@ -173,7 +173,7 @@ public class QuerydslPredicateBuilderUnitTests {
Predicate predicate = builder.getPredicate(USER_TYPE, values, DEFAULT_BINDINGS);
assertThat(predicate).isEqualTo((Predicate) QUser.user.addresses.any().street.eq("VALUE"));
assertThat(predicate).isEqualTo(QUser.user.addresses.any().street.eq("VALUE"));
}
@Test // DATACMNS-941