Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18106 - Handling source element in @WithClasses annotation

This commit is contained in:
Cedomir Igaly 2024-05-16 10:12:42 +02:00 committed by Gavin King
parent 4e41ee9bcd
commit e73eb458b4
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java
View File

@ -26,6 +26,7 @@ import org.junit.runners.model.Statement;
public class CompilationRunner extends BlockJUnit4ClassRunner {
private final List<Class<?>> testEntities;
private final List<Class<?>> preCompileEntities;
private final List<String> sources;
private final List<String> mappingFiles;
private final Map<String, String> processorOptions;
private final String packageName;
@ -36,6 +37,7 @@ public class CompilationRunner extends BlockJUnit4ClassRunner {
super( clazz );
this.testEntities = new ArrayList<>();
this.preCompileEntities = new ArrayList<>();
this.sources = new ArrayList<>();
this.mappingFiles = new ArrayList<>();
this.processorOptions = new HashMap<>();
Package pkg = clazz.getPackage();
@ -64,6 +66,7 @@ public class CompilationRunner extends BlockJUnit4ClassRunner {
getTestClass().getJavaClass(),
testEntities,
preCompileEntities,
sources,
mappingFiles,
processorOptions,
ignoreCompilationErrors
@ -74,6 +77,7 @@ public class CompilationRunner extends BlockJUnit4ClassRunner {
if ( withClasses != null ) {
Collections.addAll( testEntities, withClasses.value() );
Collections.addAll( preCompileEntities, withClasses.preCompile() );
Collections.addAll( sources, withClasses.sources() );
}
}
@ -116,7 +120,7 @@ public class CompilationRunner extends BlockJUnit4ClassRunner {
}
private boolean annotationProcessorNeedsToRun() {
return !testEntities.isEmpty() || !mappingFiles.isEmpty();
return !testEntities.isEmpty() || !sources.isEmpty() || !mappingFiles.isEmpty();
}
}

18
tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
View File

@ -42,6 +42,7 @@ public class CompilationStatement extends Statement {
private final Class<?> testClass;
private final List<Class<?>> testEntities;
private final List<Class<?>> preCompileEntities;
private final List<String> sources;
private final List<String> xmlMappingFiles;
private final Map<String, String> processorOptions;
private final boolean ignoreCompilationErrors;
@ -51,6 +52,7 @@ public class CompilationStatement extends Statement {
Class<?> testClass,
List<Class<?>> testEntities,
List<Class<?>> proCompileEntities,
List<String> sources,
List<String> xmlMappingFiles,
Map<String, String> processorOptions,
boolean ignoreCompilationErrors) {
@ -58,6 +60,7 @@ public class CompilationStatement extends Statement {
this.testClass = testClass;
this.testEntities = testEntities;
this.preCompileEntities = proCompileEntities;
this.sources = sources;
this.xmlMappingFiles = xmlMappingFiles;
this.processorOptions = processorOptions;
this.ignoreCompilationErrors = ignoreCompilationErrors;
@ -68,11 +71,11 @@ public class CompilationStatement extends Statement {
public void evaluate() throws Throwable {
// some test needs to compile some classes prior to the actual classes under test
if ( !preCompileEntities.isEmpty() ) {
compile( getCompilationUnits( preCompileEntities ) );
compile( getCompilationUnits( preCompileEntities, null ) );
}
// now we compile the actual test classes
compile( getCompilationUnits( testEntities ) );
compile( getCompilationUnits( testEntities, sources ) );
if ( !ignoreCompilationErrors ) {
TestUtil.assertNoCompilationError( compilationDiagnostics );
@ -81,12 +84,21 @@ public class CompilationStatement extends Statement {
originalStatement.evaluate();
}
private List<File> getCompilationUnits(List<Class<?>> classesToCompile) {
private List<File> getCompilationUnits(List<Class<?>> classesToCompile, List<String> sources) {
List<File> javaFiles = new ArrayList<File>();
for ( Class<?> testClass : classesToCompile ) {
String pathToSource = getPathToSource( testClass );
javaFiles.add( new File( pathToSource ) );
}
if ( sources != null ) {
final var resourcesBaseDir = TestUtil.getResourcesBaseDir( testClass );
for ( String source : sources ) {
javaFiles.add(
new File( resourcesBaseDir,
source.replace( PACKAGE_SEPARATOR, File.separator ) + ".java" ) );
}
}
return javaFiles;
}