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

HHH-17030 Followup: move schema check to launcher listener

This commit is contained in:
marko-bekhta 2024-05-27 18:00:01 +02:00 committed by Marko Bekhta
parent 86a2b19b77
commit 045053ff8a
15 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-agroal/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-c3p0/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-community-dialects/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-core/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

4
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
View File

@ -26,10 +26,6 @@ import org.jboss.logging.Logger;
@RunWith(EnversRunner.class)
public abstract class AbstractEnversTest {
static {
DatabaseCleaner.clearSchemas();
}
protected final Logger log = Logger.getLogger( getClass() );
private String auditStrategy;

1
hibernate-envers/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-hikaricp/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-jcache/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-jfr/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-micrometer/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

1
hibernate-spatial/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener

7
hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
View File

@ -62,13 +62,6 @@ public class BytecodeEnhancedTestEngine extends HierarchicalTestEngine<JupiterEn
@Override
public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
// Make sure this runs first
try {
BaseUnitTestCase.checkClearSchema();
}
catch (Throwable e) {
throw new RuntimeException( e );
}
JupiterConfiguration configuration = new CachingJupiterConfiguration(
new DefaultJupiterConfiguration( discoveryRequest.getConfigurationParameters() ) );
JupiterEngineDescriptor engineDescriptor = new BytecodeEnhancedEngineDescriptor( uniqueId, configuration );

20
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
View File

@ -16,8 +16,6 @@ import jakarta.transaction.SystemException;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.BeforeClassOnce;
import org.hibernate.testing.cleaner.DatabaseCleaner;
import org.hibernate.testing.jdbc.leak.ConnectionLeakUtil;
import org.hibernate.testing.jta.TestingJtaPlatformImpl;
import org.junit.After;
@ -36,24 +34,6 @@ import org.jboss.logging.Logger;
@RunWith( CustomRunner.class )
public abstract class BaseUnitTestCase {
private static Throwable schemaClearError;
static {
try {
DatabaseCleaner.clearSchemas();
}
catch (Throwable t) {
schemaClearError = t;
}
}
@BeforeClassOnce
public static void checkClearSchema() throws Throwable {
if (schemaClearError!=null) {
throw schemaClearError;
}
}
protected final Logger log = Logger.getLogger( getClass() );
private static boolean enableConnectionLeakDetection = Boolean.TRUE.toString()

27
hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java Normal file
View File

@ -0,0 +1,27 @@
/*
* 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.testing.schema;
import org.hibernate.testing.cleaner.DatabaseCleaner;
import org.junit.platform.launcher.LauncherSession;
import org.junit.platform.launcher.LauncherSessionListener;
/**
* This listener should be called before the discovery request is sent to the test engines.
* <p>
* Note, it is on purpose not registered as a service within the {@code hibernate-testing} (i.e. in {@code META-INF/services} of this jar).
* This is to prevent this listener be invoked by non Hibernate ORM users of the {@code hibernate-testing} lib.
* <p>
* See also <a href="https://junit.org/junit5/docs/current/user-guide/#launcher-api-launcher-session-listeners-tool-example-usage">...</a>
*/
public class CheckClearSchemaListener implements LauncherSessionListener {
@Override
public void launcherSessionOpened(LauncherSession session) {
DatabaseCleaner.clearSchemas();
}
}

1
hibernate-vector/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener Normal file
View File

@ -0,0 +1 @@
org.hibernate.testing.schema.CheckClearSchemaListener