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

DATACMNS-604 - Move QueryDsl helper methods from QueryDslUtils to KV package.

Browse Source 
Moved to new class KeyValueQueryDslUtils in order to avoid class loading issues.

Original pull request: #107.
This commit is contained in:
Thomas Darimont
2014-11-27 12:21:21 +01:00
committed by Oliver Gierke
parent cb884eb0cd
commit 5448b3e63b
4 changed files with 146 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/org/springframework/data/querydsl/QueryDslUtilsUnitTests.java → src/test/java/org/springframework/data/keyvalue/repository/support/QueryDslUtilsUnitTests.java
View File

@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.querydsl;
package org.springframework.data.keyvalue.repository.support;
import static org.hamcrest.collection.IsArrayWithSize.*;
import static org.junit.Assert.*;
import static org.springframework.data.keyvalue.repository.support.KeyValueQueryDslUtils.*;
import org.hamcrest.collection.IsArrayContainingInOrder;
import org.junit.Before;
@@ -26,6 +27,7 @@ import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.domain.Sort.NullHandling;
import org.springframework.data.keyvalue.Person;
import org.springframework.data.keyvalue.QPerson;
import org.springframework.data.querydsl.SimpleEntityPathResolver;
import com.mysema.query.types.EntityPath;
import com.mysema.query.types.OrderSpecifier;
@@ -33,6 +35,7 @@ import com.mysema.query.types.path.PathBuilder;
/**
* @author Christoph Strobl
* @author Thomas Darimont
*/
public class QueryDslUtilsUnitTests {
@@ -51,7 +54,7 @@ public class QueryDslUtilsUnitTests {
*/
@Test(expected = IllegalArgumentException.class)
public void toOrderSpecifierThrowsExceptioOnNullPathBuilder() {
QueryDslUtils.toOrderSpecifier(new Sort("firstname"), null);
toOrderSpecifier(new Sort("firstname"), null);
}
/**
@@ -59,7 +62,7 @@ public class QueryDslUtilsUnitTests {
*/
@Test
public void toOrderSpecifierReturnsEmptyArrayWhenSortIsNull() {
assertThat(QueryDslUtils.toOrderSpecifier(null, builder), arrayWithSize(0));
assertThat(toOrderSpecifier(null, builder), arrayWithSize(0));
}
/**
@@ -70,7 +73,7 @@ public class QueryDslUtilsUnitTests {
Sort sort = new Sort(Direction.ASC, "firstname");
OrderSpecifier<?>[] specifiers = QueryDslUtils.toOrderSpecifier(sort, builder);
OrderSpecifier<?>[] specifiers = toOrderSpecifier(sort, builder);
assertThat(specifiers, IsArrayContainingInOrder.<OrderSpecifier<?>> arrayContaining(QPerson.person.firstname.asc()));
}
@@ -83,7 +86,7 @@ public class QueryDslUtilsUnitTests {
Sort sort = new Sort(Direction.DESC, "firstname");
OrderSpecifier<?>[] specifiers = QueryDslUtils.toOrderSpecifier(sort, builder);
OrderSpecifier<?>[] specifiers = toOrderSpecifier(sort, builder);
assertThat(specifiers,
IsArrayContainingInOrder.<OrderSpecifier<?>> arrayContaining(QPerson.person.firstname.desc()));
@@ -97,7 +100,7 @@ public class QueryDslUtilsUnitTests {
Sort sort = new Sort(Direction.DESC, "firstname").and(new Sort(Direction.ASC, "age"));
OrderSpecifier<?>[] specifiers = QueryDslUtils.toOrderSpecifier(sort, builder);
OrderSpecifier<?>[] specifiers = toOrderSpecifier(sort, builder);
assertThat(specifiers, IsArrayContainingInOrder.<OrderSpecifier<?>> arrayContaining(
QPerson.person.firstname.desc(), QPerson.person.age.asc()));
@@ -111,10 +114,9 @@ public class QueryDslUtilsUnitTests {
Sort sort = new Sort(new Sort.Order(Direction.DESC, "firstname", NullHandling.NULLS_LAST));
OrderSpecifier<?>[] specifiers = QueryDslUtils.toOrderSpecifier(sort, builder);
OrderSpecifier<?>[] specifiers = toOrderSpecifier(sort, builder);
assertThat(specifiers,
IsArrayContainingInOrder.<OrderSpecifier<?>> arrayContaining(QPerson.person.firstname.desc().nullsLast()));
}
}