HHH-19846 - Remove JUnit4: org.hibernate.orm.test.dialect.resolver

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectFactoryTest.java

@@ -19,26 +19,27 @@
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
 import org.hibernate.orm.test.dialect.TestingDialects;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Steve Ebersole
  */
-public class DialectFactoryTest extends BaseUnitTestCase {
+public class DialectFactoryTest {
 	private StandardServiceRegistry registry;
 	private DialectFactoryImpl dialectFactory;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		final BootstrapServiceRegistry bootReg = new BootstrapServiceRegistryBuilder().applyClassLoader(
 				DialectFactoryTest.class.getClassLoader()
@@ -49,7 +50,7 @@ public void setUp() {
 		dialectFactory.injectServices( (ServiceRegistryImplementor) registry );
 	}
 
-	@After
+	@AfterEach
 	public void destroy() {
 		if ( registry != null ) {
 			registry.close();
@@ -80,7 +81,7 @@ public void testExplicitlySuppliedDialectClassName() {
 			fail();
 		}
 		catch ( HibernateException e ) {
-			assertEquals( "unexpected exception type", StrategySelectionException.class, e.getClass() );
+			assertEquals( StrategySelectionException.class, e.getClass(), "unexpected exception type" );
 		}
 
 		configValues.put( Environment.DIALECT, "java.lang.Object" );
@@ -89,7 +90,7 @@ public void testExplicitlySuppliedDialectClassName() {
 			fail();
 		}
 		catch ( HibernateException e ) {
-			assertEquals( "unexpected exception type", ClassCastException.class, e.getCause().getClass() );
+			assertEquals( ClassCastException.class, e.getCause().getClass(), "unexpected exception type" );
 		}
 	}
 
@@ -163,8 +164,6 @@ public void testCustomDialects() {
 		resolvers.addResolver( new TestingDialects.MyDialectResolver1() );
 		resolvers.addResolver( new TestingDialects.MyDialectResolver2() );
 		resolvers.addResolver( new TestingDialects.MyOverridingDialectResolver1() );
-		//DialectFactory.registerDialectResolver( "org.hibernate.dialect.NoSuchDialectResolver" );
-		//DialectFactory.registerDialectResolver( "java.lang.Object" );
 
 		testDetermination( "MyDatabase1", TestingDialects.MyDialect1.class, resolvers );
 		testDetermination( "MyDatabase2", 1, TestingDialects.MyDialect21.class, resolvers );

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java

@@ -4,8 +4,8 @@
  */
 package org.hibernate.orm.test.dialect.resolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.orm.test.dialect.TestingDialects;
@@ -14,15 +14,15 @@
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Steve Ebersole
  */
-public class DialectResolverTest extends BaseUnitTestCase {
+public class DialectResolverTest {
 	@Test
-	public void testDialects() throws Exception {
+	public void testDialects() {
 		DialectResolverSet resolvers = new DialectResolverSet();
 
 		resolvers.addResolverAtFirst( new TestingDialects.MyDialectResolver1() );
@@ -39,7 +39,7 @@ public void testDialects() throws Exception {
 	}
 
 	@Test
-	public void testErrorAndOrder() throws Exception {
+	public void testErrorAndOrder() {
 		DialectResolverSet resolvers = new DialectResolverSet();
 
 		resolvers.addResolverAtFirst( new TestingDialects.MyDialectResolver1() );
@@ -52,7 +52,7 @@ public void testErrorAndOrder() throws Exception {
 	}
 
 	@Test
-	public void testBasicDialectResolver() throws Exception {
+	public void testBasicDialectResolver() {
 		DialectResolverSet resolvers = new DialectResolverSet();
 		// Simulating MyDialectResolver1 by BasicDialectResolvers
 		resolvers.addResolver( new BasicDialectResolver( "MyDatabase1", TestingDialects.MyDialect1.class ) );

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/StandardDialectResolverTest.java

@@ -11,18 +11,17 @@
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
 
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Unit test of the {@link StandardDialectResolver} class.
  *
  * @author Bryan Turner
  */
-public class StandardDialectResolverTest extends BaseUnitTestCase {
+public class StandardDialectResolverTest {
 
 	@Test
 	public void testResolveDialectInternalForSQLServer2000() {
@@ -183,12 +182,12 @@ private static void runDialectTest(
 		}
 		String dbms = builder.toString();
 
-		assertNotNull( "Dialect for " + dbms + " should not be null", dialect );
+		assertNotNull( dialect, "Dialect for " + dbms + " should not be null" );
 		// Make sure to test that the actual dialect class is as expected
 		// (not just an instance of the expected dialect.
-		assertEquals( "Dialect for " + dbms + " should be " + expectedDialect.getSimpleName(),
-					expectedDialect,
-					dialect.getClass()
-		);
+		assertEquals( expectedDialect,
+				dialect.getClass(),
+				"Dialect for " + dbms + " should be " + expectedDialect.getSimpleName()
+				);
 	}
 }