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

re-enable tests

This commit is contained in:
Steve Ebersole 2021-03-19 13:56:57 -05:00
parent 6a0d848f98
commit 2589671fa1
11 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
View File

@ -15,6 +15,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.hibernate.Internal;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.jaxb.spi.Binding;
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
@ -78,25 +79,30 @@ public class ManagedResourcesImpl implements ManagedResources {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// package private
// @Internal
void addAttributeConverterDefinition(ConverterDescriptor descriptor) {
@Internal
public void addAttributeConverterDefinition(ConverterDescriptor descriptor) {
attributeConverterDescriptorMap.put( descriptor.getAttributeConverterClass(), descriptor );
}
void addAnnotatedClassReference(Class annotatedClassReference) {
@Internal
public void addAnnotatedClassReference(Class annotatedClassReference) {
annotatedClassReferences.add( annotatedClassReference );
}
void addAnnotatedClassName(String annotatedClassName) {
@Internal
public void addAnnotatedClassName(String annotatedClassName) {
annotatedClassNames.add( annotatedClassName );
}
void addAnnotatedPackageName(String annotatedPackageName) {
@Internal
public void addAnnotatedPackageName(String annotatedPackageName) {
annotatedPackageNames.add( annotatedPackageName );
}
void addXmlBinding(Binding binding) {
@Internal
public void addXmlBinding(Binding binding) {
mappingFileBindings.add( binding );
}
}

2
hibernate-core/src/test/bundles/explicitpar/META-INF/persistence.xml
View File

@ -18,7 +18,7 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<!-- custom scanner test -->
<property name="hibernate.ejb.resource_scanner" value="org.hibernate.jpa.test.packaging.CustomScanner"/>
<property name="hibernate.ejb.resource_scanner" value="org.hibernate.orm.test.bootstrap.scanning.CustomScanner"/>
<property name="hibernate.dialect" value="@db.dialect@"/>
<property name="hibernate.connection.driver_class" value="@jdbc.driver@"/>

2
hibernate-core/src/test/bundles/explicitpar2/META-INF/persistence.xml
View File

@ -21,7 +21,7 @@
<properties>
<!-- custom scanner test -->
<!--<property name="hibernate.ejb.resource_scanner" value="org.hibernate.jpa.test.packaging.CustomScanner"/>-->
<!--<property name="hibernate.ejb.resource_scanner" value="org.hibernate.orm.test.bootstrap.scanning.CustomScanner"/>-->
<property name="hibernate.dialect" value="@db.dialect@"/>
<property name="hibernate.connection.driver_class" value="@jdbc.driver@"/>

6
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/CustomScanner.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/CustomScanner.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import org.hibernate.boot.archive.scan.internal.StandardScanner;
import org.hibernate.boot.archive.scan.spi.ScanEnvironment;

8
hibernate-core/src/test/java/org/hibernate/boot/model/process/internal/IntegerToVarcharConverter.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java
View File

@ -1,4 +1,10 @@
package org.hibernate.boot.model.process.internal;
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.bootstrap.scanning;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;

6
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/JarVisitorTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import java.io.BufferedInputStream;
import java.io.File;

9
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/PackagedEntityManagerTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import java.io.File;
import java.util.HashMap;
@ -43,8 +43,8 @@ import org.hibernate.jpa.test.pack.various.Airplane;
import org.hibernate.jpa.test.pack.various.Seat;
import org.hibernate.stat.Statistics;
import org.hibernate.testing.FailureExpected;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@ -384,6 +384,7 @@ public class PackagedEntityManagerTest extends PackagingTestCase {
}
@Test
@FailureExpected( jiraKey = "none", message = "Problem with caching, specifically managing SoftLocks" )
public void testConfiguration() throws Exception {
File testPackage = buildExplicitPar();
addPackageToClasspath( testPackage );

6
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/PackagingTestCase.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import java.io.File;
import java.net.MalformedURLException;

6
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/Pasta.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;

6
hibernate-core/src/test/java/org/hibernate/jpa/test/packaging/ScannerTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java
View File

@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.jpa.test.packaging;
package org.hibernate.orm.test.bootstrap.scanning;
import java.io.File;
import java.io.InputStream;

14
hibernate-core/src/test/java/org/hibernate/boot/model/process/internal/ScanningCoordinatorTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
View File

@ -1,4 +1,10 @@
package org.hibernate.boot.model.process.internal;
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.bootstrap.scanning;
import java.net.MalformedURLException;
import java.net.URL;
@ -21,13 +27,17 @@ import org.hibernate.boot.archive.scan.spi.ScanParameters;
import org.hibernate.boot.archive.scan.spi.ScanResult;
import org.hibernate.boot.archive.scan.spi.Scanner;
import org.hibernate.boot.archive.spi.InputStreamAccess;
import org.hibernate.boot.internal.ClassmateContext;
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
import org.hibernate.boot.model.process.internal.ManagedResourcesImpl;
import org.hibernate.boot.model.process.internal.ScanningCoordinator;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.boot.spi.BootstrapContext;
import org.hibernate.boot.spi.XmlMappingBinderAccess;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.testing.logger.LoggerInspectionRule;
@ -57,6 +67,7 @@ public class ScanningCoordinatorTest extends BaseUnitTestCase {
private ManagedResourcesImpl managedResources = Mockito.mock( ManagedResourcesImpl.class );
private ScanResult scanResult = Mockito.mock( ScanResult.class );
private BootstrapContext bootstrapContext = Mockito.mock( BootstrapContext.class );
private ClassmateContext classmateContext = new ClassmateContext();
private XmlMappingBinderAccess xmlMappingBinderAccess = Mockito.mock( XmlMappingBinderAccess.class );
private ScanEnvironment scanEnvironment = Mockito.mock( ScanEnvironment.class );
@ -79,6 +90,7 @@ public class ScanningCoordinatorTest extends BaseUnitTestCase {
Mockito.reset( classLoaderService );
when( bootstrapContext.getScanEnvironment() ).thenReturn( scanEnvironment );
when( bootstrapContext.getClassmateContext() ).thenReturn( classmateContext );
when( bootstrapContext.getServiceRegistry() ).thenReturn( serviceRegistry );
when( serviceRegistry.getService( ClassLoaderService.class ) ).thenReturn( classLoaderService );