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

DATAJPA-353 - Fixed mapping file locations detected by CPSPUPP to conform to the JPA spec.

Browse Source 
Adjusted scanForMappingFileLocations(…) in ClasspathScanningPersistenceUnitPostProcessor to resolve the paths to class-path loadable paths. Updated test cases accordingly. Added test case and required resources to verify that mapping files with recursive wildcard pattern can be found from multiple locations in class path.

Original pull request: #24.
This commit is contained in:
Thomas Darimont
2013-07-16 17:16:24 +02:00
committed by Oliver Gierke
parent 4ff0671105
commit f25032abfa
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2011-2013 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.
@@ -31,12 +31,12 @@ import org.springframework.orm.jpa.persistenceunit.PersistenceUnitPostProcessor;
* Unit tests for {@link ClasspathScanningPersistenceUnitPostProcessor}.
*
* @author Oliver Gierke
* @author Thomas Darimont
*/
@RunWith(MockitoJUnitRunner.class)
public class ClasspathScanningPersistenceUnitPostProcessorUnitTests {
@Mock
MutablePersistenceUnitInfo pui;
@Mock MutablePersistenceUnitInfo pui;
String basePackage = getClass().getPackage().getName();
@Test(expected = IllegalArgumentException.class)
@@ -75,19 +75,35 @@ public class ClasspathScanningPersistenceUnitPostProcessorUnitTests {
@Test
public void findsMappingFile() {
DefaultResourceLoader loader = new DefaultResourceLoader();
String expected = getClass().getResource("mapping.xml").toString();
ClasspathScanningPersistenceUnitPostProcessor processor = new ClasspathScanningPersistenceUnitPostProcessor(
basePackage);
processor.setMappingFileNamePattern("*.xml");
processor.setResourceLoader(loader);
processor.setResourceLoader(new DefaultResourceLoader());
processor.postProcessPersistenceUnitInfo(pui);
String expected = getClass().getPackage().getName().replace('.', '/') + "/mapping.xml";
verify(pui).addManagedClassName(SampleEntity.class.getName());
verify(pui).addMappingFileName(expected);
}
/**
* @see DATAJPA-353
*/
@Test
public void shouldFindJpaMappingFilesFromMultipleLocationsOnClasspath() {
ClasspathScanningPersistenceUnitPostProcessor processor = new ClasspathScanningPersistenceUnitPostProcessor(
basePackage);
processor.setResourceLoader(new DefaultResourceLoader());
processor.setMappingFileNamePattern("**/*orm.xml");
processor.postProcessPersistenceUnitInfo(pui);
verify(pui).addMappingFileName("org/springframework/data/jpa/support/module1/module1-orm.xml");
verify(pui).addMappingFileName("org/springframework/data/jpa/support/module2/module2-orm.xml");
}
@Entity
public static class SampleEntity {