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

DATACMNS-867 - Adapt codebase after rebase on forward ports.

Browse Source
This commit is contained in:
Oliver Gierke
2016-12-20 13:47:18 +01:00
parent 9b3dd05baa
commit 2210f2e8e9
12 changed files with 60 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java
View File

@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

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

@@ -59,11 +59,11 @@ public class QuerydslBindingsUnitTests {
}
@Test // DATACMNS-669
public void returnsNullIfNoBindingRegisteredForPath() {
public void returnsEmptyOptionalIfNoBindingRegisteredForPath() {
PathInformation path = PropertyPathInformation.of("lastname", User.class);
assertThat(bindings.getBindingForPath(path)).isNull();
assertThat(bindings.getBindingForPath(path)).isEmpty();
}
@Test // DATACMNS-669
@@ -102,7 +102,7 @@ public class QuerydslBindingsUnitTests {
PathInformation path = PropertyPathInformation.of("inceptionYear", User.class);
assertThat(bindings.getBindingForPath(path)).isNull();
assertThat(bindings.getBindingForPath(path)).isEmpty();
}
@Test // DATACMNS-669

8
src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java
View File

@@ -15,10 +15,8 @@
*/
package org.springframework.data.repository.core.support;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Matchers.any;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import lombok.Getter;
@@ -101,7 +99,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests {
@Test // DATACMNS-928
public void doesNotCreatePublishingMethodIfNoAnnotationDetected() {
assertThat(EventPublishingMethod.of(Object.class), is(nullValue()));
assertThat(EventPublishingMethod.of(Object.class)).isNull();
}
@Test // DATACMNS-928

4
src/test/java/org/springframework/data/repository/core/support/ExampleSpecificationAccessorUnitTests.java
View File

@@ -255,8 +255,8 @@ public class ExampleSpecificationAccessorUnitTests {
ExampleMatcher matcher = ExampleMatcher.matching()//
.withMatcher("firstname", exact());
assertThat(new ExampleMatcherAccessor(matcher).getPropertySpecifier("firstname").getStringMatcher(),
is(StringMatcher.EXACT));
assertThat(new ExampleMatcherAccessor(matcher).getPropertySpecifier("firstname").getStringMatcher())
.isEqualTo(StringMatcher.EXACT);
}
static class Person {

2
src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java
View File

@@ -55,7 +55,7 @@ public class RepositoryFactoryBeanSupportUnitTests {
public void initializationFailsWithMissingRepositoryInterface() {
assertThatExceptionOfType(IllegalArgumentException.class)//
.isThrownBy(() -> new DummyRepositoryFactoryBean().afterPropertiesSet())//
.isThrownBy(() -> new DummyRepositoryFactoryBean(null))//
.withMessageContaining("Repository interface");
}

52
src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.data.repository.util;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.repository.util.QueryExecutionConverters.*;
import javaslang.collection.HashMap;
import javaslang.collection.HashSet;
import javaslang.collection.LinkedHashMap;
import javaslang.collection.LinkedHashSet;
import javaslang.collection.Seq;
import javaslang.collection.Traversable;
import reactor.core.publisher.Flux;
@@ -29,7 +29,6 @@ import rx.Observable;
import rx.Single;
import scala.Option;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -44,7 +43,6 @@ import org.reactivestreams.Publisher;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.concurrent.ListenableFuture;
import com.google.common.base.Optional;
@@ -201,12 +199,12 @@ public class QueryExecutionConvertersUnitTests {
@Test // DATACMNS-937
public void unwrapsEmptyJavaslangOption() {
assertThat(QueryExecutionConverters.unwrap(optionNone())).isNull();
assertThat(QueryExecutionConverters.unwrap(javaslang.control.Option.none())).isNull();
}
@Test // DATACMNS-937
public void unwrapsJavaslangOption() {
assertThat(QueryExecutionConverters.unwrap(option("string"))).isEqualTo("string");
assertThat(QueryExecutionConverters.unwrap(javaslang.control.Option.of("string"))).isEqualTo("string");
}
@Test // DATACMNS-940
@@ -257,9 +255,9 @@ public class QueryExecutionConvertersUnitTests {
@Test // DATACMNS-940
public void unwrapsJavaslangCollectionsToJavaOnes() {
assertThat(unwrap(javaslangList(1, 2, 3))).isInstanceOf(List.class);
assertThat(unwrap(javaslangSet(1, 2, 3))).isInstanceOf(Set.class);
assertThat(unwrap(javaslangMap("key", "value"))).isInstanceOf(Map.class);
assertThat(unwrap(javaslang.collection.List.of(1, 2, 3))).isInstanceOf(List.class);
assertThat(unwrap(LinkedHashSet.of(1, 2, 3))).isInstanceOf(Set.class);
assertThat(unwrap(LinkedHashMap.of("key", "value"))).isInstanceOf(Map.class);
}
@Test // DATACMNS-1005
@@ -268,40 +266,4 @@ public class QueryExecutionConvertersUnitTests {
Set<Class<?>> allowedPageableTypes = QueryExecutionConverters.getAllowedPageableTypes();
assertThat(allowedPageableTypes).contains(Page.class, Slice.class, List.class, Seq.class);
}
@SuppressWarnings("unchecked")
private static javaslang.control.Option<Object> optionNone() {
Method method = ReflectionUtils.findMethod(javaslang.control.Option.class, "none");
return (javaslang.control.Option<Object>) ReflectionUtils.invokeMethod(method, null);
}
@SuppressWarnings("unchecked")
private static <T> javaslang.control.Option<T> option(T source) {
Method method = ReflectionUtils.findMethod(javaslang.control.Option.class, "of", Object.class);
return (javaslang.control.Option<T>) ReflectionUtils.invokeMethod(method, null, source);
}
@SuppressWarnings("unchecked")
private static <T> javaslang.collection.List<T> javaslangList(T... values) {
Method method = ReflectionUtils.findMethod(javaslang.collection.List.class, "ofAll", Iterable.class);
return (javaslang.collection.List<T>) ReflectionUtils.invokeMethod(method, null, Arrays.asList(values));
}
@SuppressWarnings("unchecked")
private static <T> javaslang.collection.Set<T> javaslangSet(T... values) {
Method method = ReflectionUtils.findMethod(HashSet.class, "ofAll", Iterable.class);
return (javaslang.collection.Set<T>) ReflectionUtils.invokeMethod(method, null, Arrays.asList(values));
}
@SuppressWarnings("unchecked")
private static <K, V> javaslang.collection.Map<K, V> javaslangMap(K key, V value) {
Method method = ReflectionUtils.findMethod(HashMap.class, "ofAll", Map.class);
return (javaslang.collection.Map<K, V>) ReflectionUtils.invokeMethod(method, null,
Collections.singletonMap(key, value));
}
}

13
src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
View File

@@ -393,7 +393,9 @@ public class ClassTypeInformationUnitTests {
ClassTypeInformation<SampleTraversable> information = ClassTypeInformation.from(SampleTraversable.class);
assertThat(information.getComponentType().getType(), is(typeCompatibleWith(Integer.class)));
assertThat(information.getComponentType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(Integer.class);
});
}
@Test // DATACMNS-940
@@ -401,8 +403,13 @@ public class ClassTypeInformationUnitTests {
ClassTypeInformation<SampleMap> information = ClassTypeInformation.from(SampleMap.class);
assertThat(information.getComponentType().getType(), is(typeCompatibleWith(String.class)));
assertThat(information.getMapValueType().getType(), is(typeCompatibleWith(Integer.class)));
assertThat(information.getComponentType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(String.class);
});
assertThat(information.getMapValueType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(Integer.class);
});
}
static class StringMapContainer extends MapContainer<String> {