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

DATAJPA-785 - Adapted test cases to build against Hibernate 5 GA.

Browse Source 
Added a few flushes and transaction rearrangements for low level integration tests to accommodate changes in flushing behavior in Hibernate 5 GA.
This commit is contained in:
Oliver Gierke
2015-08-28 15:52:49 +02:00
parent 635e11fc06
commit c41060e9a6
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -54,13 +54,13 @@
<profile>
<id>hibernate-5</id>
<properties>
<hibernate>5.0.0.Beta2</hibernate>
<hibernate>5.0.0.Final</hibernate>
</properties>
</profile>
<profile>
<id>hibernate-5-next</id>
<properties>
<hibernate>5.0.0-SNAPSHOT</hibernate>
<hibernate>5.0.1-SNAPSHOT</hibernate>
</properties>
<repositories>
<repository>

1
src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java
View File

@@ -70,6 +70,7 @@ public class Jsr310JpaConvertersIntegrationTests extends AbstractAttributeConver
sample.localDateTime = LocalDateTime.now();
em.persist(sample);
em.flush();
em.clear();
DateTimeSample result = em.find(DateTimeSample.class, sample.id);

1
src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java
View File

@@ -70,6 +70,7 @@ public class ThreeTenBackPortJpaConvertersIntegrationTests extends AbstractAttri
sample.localDateTime = LocalDateTime.now();
em.persist(sample);
em.flush();
em.clear();
DateTimeSample result = em.find(DateTimeSample.class, sample.id);

25
src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,9 +57,9 @@ public class JpaMetamodelMappingContextIntegrationTests {
@Configuration
@ImportResource("classpath:infrastructure.xml")
@EnableJpaRepositories(basePackageClasses = CategoryRepository.class,//
@EnableJpaRepositories(basePackageClasses = CategoryRepository.class, //
includeFilters = @Filter(value = { CategoryRepository.class, ProductRepository.class },
type = FilterType.ASSIGNABLE_TYPE))
type = FilterType.ASSIGNABLE_TYPE) )
static class Config {
}
@@ -131,22 +131,29 @@ public class JpaMetamodelMappingContextIntegrationTests {
@Test
public void lookingUpIdentifierOfProxyDoesNotInitializeProxy() {
new TransactionTemplate(transactionManager).execute(new TransactionCallback<Void>() {
TransactionTemplate template = new TransactionTemplate(transactionManager);
final Category category = template.execute(new TransactionCallback<Category>() {
@Override
public Category doInTransaction(TransactionStatus status) {
Product product = products.save(new Product());
return categories.save(new Category(product));
}
});
template.execute(new TransactionCallback<Void>() {
@Override
public Void doInTransaction(TransactionStatus status) {
Product product = products.save(new Product());
Category category = categories.save(new Category(product));
em.clear();
Category loaded = categories.findOne(category.getId());
Product loadedProduct = loaded.getProduct();
JpaPersistentEntity<?> entity = context.getPersistentEntity(Product.class);
IdentifierAccessor accessor = entity.getIdentifierAccessor(loadedProduct);
assertThat(accessor.getIdentifier(), is((Object) product.getId()));
assertThat(accessor.getIdentifier(), is((Object) category.getProduct().getId()));
assertThat(loadedProduct, is(instanceOf(HibernateProxy.class)));
assertThat(((HibernateProxy) loadedProduct).getHibernateLazyInitializer().isUninitialized(), is(true));