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

DATAJPA-189, DATAJPA-190 - Improvements to MergingPersistenceUnitManager.

Browse Source 
MergingPersistenceUnitManager now also merges mapping file locations. We also make sure now that the persistence unit root URL does not get added twice accidentally as some persistence providers refuse to work then.
This commit is contained in:
Oliver Gierke
2012-04-12 09:35:53 +02:00
parent f441087cf4
commit 393d3e2000
4 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java
View File

@@ -25,7 +25,6 @@ import java.util.Arrays;
import javax.persistence.spi.PersistenceUnitInfo;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -59,11 +58,7 @@ public class MergingPersistenceUnitManagerUnitTests {
verify(newInfo).addJarFileUrl(jarFileUrl);
}
/**
* @FIXME - Reactivate as soon as Spring 3.1.1 gets released
*/
@Test
@Ignore
public void mergesManagedClassesCorrectly() {
MergingPersistenceUnitManager manager = new MergingPersistenceUnitManager();
@@ -74,5 +69,54 @@ public class MergingPersistenceUnitManagerUnitTests {
PersistenceUnitInfo info = manager.obtainPersistenceUnitInfo("pu");
assertThat(info.getManagedClassNames().size(), is(2));
assertThat(info.getManagedClassNames(), hasItems(User.class.getName(), Role.class.getName()));
assertThat(info.getMappingFileNames().size(), is(2));
assertThat(info.getMappingFileNames(), hasItems("foo.xml", "bar.xml"));
System.out.println(info.getPersistenceUnitRootUrl());
}
@Test
public void addsOldPersistenceUnitRootUrlIfDifferentFromNewOne() throws MalformedURLException {
MutablePersistenceUnitInfo newInfo = new MutablePersistenceUnitInfo();
newInfo.setPersistenceUnitRootUrl(new URL("file:bar"));
when(oldInfo.getPersistenceUnitRootUrl()).thenReturn(new URL("file:/foo"));
MergingPersistenceUnitManager manager = new MergingPersistenceUnitManager();
manager.postProcessPersistenceUnitInfo(newInfo, oldInfo);
assertThat(newInfo.getJarFileUrls().size(), is(1));
assertThat(newInfo.getJarFileUrls(), hasItems(oldInfo.getPersistenceUnitRootUrl()));
}
@Test
public void doesNotAddNewPuRootUrlIfNull() throws MalformedURLException {
MutablePersistenceUnitInfo newInfo = new MutablePersistenceUnitInfo();
when(oldInfo.getPersistenceUnitRootUrl()).thenReturn(new URL("file:/foo"));
MergingPersistenceUnitManager manager = new MergingPersistenceUnitManager();
manager.postProcessPersistenceUnitInfo(newInfo, oldInfo);
assertThat(newInfo.getJarFileUrls().isEmpty(), is(true));
}
@Test
public void doesNotAddNewPuRootUrlIfAlreadyOnTheListOfJarFileUrls() throws MalformedURLException {
when(oldInfo.getPersistenceUnitRootUrl()).thenReturn(new URL("file:foo"));
MutablePersistenceUnitInfo newInfo = new MutablePersistenceUnitInfo();
newInfo.setPersistenceUnitRootUrl(new URL("file:bar"));
newInfo.addJarFileUrl(oldInfo.getPersistenceUnitRootUrl());
MergingPersistenceUnitManager manager = new MergingPersistenceUnitManager();
manager.postProcessPersistenceUnitInfo(newInfo, oldInfo);
assertThat(newInfo.getJarFileUrls().size(), is(1));
assertThat(newInfo.getJarFileUrls(), hasItems(oldInfo.getPersistenceUnitRootUrl()));
}
}