some minor cleanups to tests

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/boot/BootLoggingTests.java

@@ -33,7 +33,6 @@
  *
  * @author Steve Ebersole
  */
-@SuppressWarnings("JUnitMalformedDeclaration")
 @MessageKeyInspection(
 		messageKey = "HHH10001005",
 		logger = @Logger( loggerName = ConnectionInfoLogger.LOGGER_NAME )

hibernate-core/src/test/java/org/hibernate/orm/test/boot/SessionFactoryNamingTests.java

@@ -23,7 +23,6 @@
 /**
  * @author Steve Ebersole
  */
-@SuppressWarnings("JUnitMalformedDeclaration")
 @MessageKeyInspection(
 		messageKey = "HHH020277",
 		logger = @Logger( loggerName = SessionFactoryRegistryMessageLogger.LOGGER_NAME )
@@ -41,10 +40,6 @@ void testExplicitJndiName(SessionFactoryScope scope, MessageKeyWatcher logWatche
 		assertThat( logWatcher.wasTriggered() ).isTrue();
 	}
 
-
-
-
-
 	@Test
 	@DomainModel
 	@ServiceRegistry( settings = @Setting( name = AvailableSettings.SESSION_FACTORY_NAME_IS_JNDI, value = "true" ) )

hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/LobCreationCheckSkipTest.java

@@ -13,7 +13,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * @author Vlad Mihalcea

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropExtraWarningsTest.java

@@ -4,12 +4,10 @@
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
+import jakarta.persistence.EntityManagerFactory;
 import org.hibernate.SessionFactory;
 import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-
+import org.hibernate.engine.jdbc.spi.SQLExceptionLogging;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Logger;
@@ -18,11 +16,13 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.EntityManagerFactory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @JiraKey("HHH-18296")
-@MessageKeyInspection(messageKey = "SQL Warning", logger = @Logger(loggerNameClass = SqlExceptionHelper.class))
-@RequiresDialect(value = PostgreSQLDialect.class, comment = "Only the PostgreSQL driver is known to generate 'success' warnings on table drop")
+@MessageKeyInspection(messageKey = "HHH",
+		logger = @Logger(loggerName = SQLExceptionLogging.WARN_NAME))
+@RequiresDialect(value = PostgreSQLDialect.class,
+		comment = "Only the PostgreSQL driver is known to generate 'success' warnings on table drop")
 public class SchemaCreateDropExtraWarningsTest extends EntityManagerFactoryBasedFunctionalTest {
 
 	@Override
@@ -35,15 +35,13 @@ public void testNoWarning(MessageKeyWatcher watcher) {
 		// Create the emf in test, so that we can capture logs
 		try ( EntityManagerFactory emf = produceEntityManagerFactory() ) {
 			// No warnings on startup
-			assertThat( watcher.getTriggeredMessages() )
-					.isEmpty();
+			assertFalse( watcher.wasTriggered() );
 
 			emf.unwrap( SessionFactory.class )
 					.getSchemaManager()
 					.dropMappedObjects( false );
 			// No warnings on explicit drop
-			assertThat( watcher.getTriggeredMessages() )
-					.isEmpty();
+			assertFalse( watcher.wasTriggered() );
 		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java

@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Vlad Mihacea

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/VarcharEnumTypeTest.java

@@ -23,7 +23,7 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @MessageKeyInspection(
 		logger = @Logger( loggerName = JdbcBindingLogging.NAME ),