HHH-19752 Add test for issue

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java

@@ -4,37 +4,87 @@
  */
 package org.hibernate.orm.test.dialect.unit.lockhint;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MySQLDialect;
-
-import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.orm.test.dialect.resolver.TestingDialectResolutionInfo;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @RequiresDialect(MySQLDialect.class)
-public class MySQLStorageEngineTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class MySQLStorageEngineTest {
 
 	@Test
 	public void testDefaultStorage() {
-		assertEquals( " engine=InnoDB", new MySQLDialect().getTableTypeString() );
+		assertThat( new MySQLDialect().getTableTypeString() ).isEqualTo( " engine=InnoDB" );
 	}
 
 	@Test
 	public void testOverrideStorage() throws NoSuchFieldException, IllegalAccessException {
 		final Field globalPropertiesField = Environment.class.getDeclaredField( "GLOBAL_PROPERTIES" );
 		globalPropertiesField.setAccessible( true );
 		final Properties systemProperties = (Properties) globalPropertiesField.get( null );
-		assertNotNull( systemProperties );
+		assertThat( systemProperties ).isNotNull();
+		final Object previousValue = systemProperties.setProperty( AvailableSettings.STORAGE_ENGINE, "myisam" );
+		try {
+			assertThat( new MySQLDialect().getTableTypeString() ).isEqualTo( " engine=MyISAM" );
+		}
+		finally {
+			if ( previousValue != null ) {
+				systemProperties.setProperty( AvailableSettings.STORAGE_ENGINE, previousValue.toString() );
+			}
+			else {
+				systemProperties.remove( AvailableSettings.STORAGE_ENGINE );
+			}
+		}
+	}
+
+	@Test
+	@SessionFactory
+	@ServiceRegistry(settings = {@Setting(name = AvailableSettings.STORAGE_ENGINE, value = "myisam")})
+	@DomainModel(annotatedClasses = {TestEntity.class})
+	public void testOverrideStorageWithConfigurationProperties(SessionFactoryScope scope) {
+		Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
+		assertThat( dialect.getTableTypeString() ).isEqualTo( " engine=MyISAM" );
+	}
+
+	@Test
+	public void testOverrideStorageEngineConfigurationPropertyHasPrecedenceOverSystemProperty()
+			throws Exception {
+		final Field globalPropertiesField = Environment.class.getDeclaredField( "GLOBAL_PROPERTIES" );
+		globalPropertiesField.setAccessible( true );
+		final Properties systemProperties = (Properties) globalPropertiesField.get( null );
+		assertThat( systemProperties ).isNotNull();
 		final Object previousValue = systemProperties.setProperty( AvailableSettings.STORAGE_ENGINE, "myisam" );
 		try {
-			assertEquals( " engine=MyISAM", new MySQLDialect().getTableTypeString() );
+			final Map<String, Object> configurationValues = new HashMap<>();
+			configurationValues.put(  AvailableSettings.STORAGE_ENGINE, "innodb" );
+			Dialect dialect = new MySQLDialect(
+					TestingDialectResolutionInfo.forDatabaseInfo(
+							"MySQL",
+							null,
+							DatabaseVersion.NO_VERSION,
+							DatabaseVersion.NO_VERSION,
+							configurationValues ) );
+			assertThat( dialect.getTableTypeString() ).isEqualTo( " engine=InnoDB" );
 		}
 		finally {
 			if ( previousValue != null ) {
@@ -46,4 +96,12 @@ public void testOverrideStorage() throws NoSuchFieldException, IllegalAccessExce
 		}
 	}
 
+	@Entity(name = "TestEntity")
+	public static class TestEntity{
+		@Id
+		private Long id;
+
+		private String name;
+	}
+
 }