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

DATACOUCH-320 - Adapt to API changes in mapping subsystem.

Browse Source
This commit is contained in:
Mark Paluch
2017-07-03 10:07:20 +02:00
parent b2219b9b90
commit 9218b09f26
11 changed files with 142 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java
View File

@@ -88,11 +88,8 @@ public class BasicCouchbasePersistentPropertyTests {
assertTrue(sdkIdProperty.isIdProperty());
assertTrue(springIdProperty.isIdProperty());
Optional<CouchbasePersistentProperty> property = test.getIdProperty();
assertTrue(property.isPresent());
property.ifPresent(actual -> {
assertEquals(springIdProperty, actual);
});
CouchbasePersistentProperty property = test.getIdProperty();
assertEquals(springIdProperty, property);
}
@Test
@@ -103,11 +100,8 @@ public class BasicCouchbasePersistentPropertyTests {
CouchbasePersistentProperty idProperty = getPropertyFor(id);
test.addPersistentProperty(idProperty);
Optional<CouchbasePersistentProperty> property = test.getIdProperty();
assertTrue(property.isPresent());
property.ifPresent(actual -> {
assertEquals(idProperty, actual);
});
CouchbasePersistentProperty property = test.getIdProperty();
assertEquals(idProperty, property);
}
@Test
@@ -123,19 +117,10 @@ public class BasicCouchbasePersistentPropertyTests {
// when "overriding" Spring @Id with SDK's @Id...
test.addPersistentProperty(springIdProperty);
Optional<CouchbasePersistentProperty> property = test.getIdProperty();
assertTrue(property.isPresent());
property.ifPresent(actual -> {
assertEquals(springIdProperty, actual);
});
assertEquals(springIdProperty, test.getIdProperty());
test.addPersistentProperty(sdkIdProperty);
property = test.getIdProperty();
assertTrue(property.isPresent());
property.ifPresent(actual -> {
assertEquals(springIdProperty, actual);
});
assertEquals(springIdProperty, test.getIdProperty());
}
/**

2
src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
View File

@@ -46,7 +46,7 @@ import org.springframework.data.couchbase.UnitTestApplicationConfig;
import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions;
import org.springframework.data.couchbase.core.convert.CouchbaseJsr310Converters.LocalDateTimeToLongConverter;
import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
import org.springframework.data.mapping.model.MappingException;
import org.springframework.data.mapping.MappingException;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;