From 574378dc6fddf4753c720f303696fa82bc8abc15 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Wed, 20 Dec 2017 15:40:11 +0000 Subject: [PATCH] HHH-12106 - Fix Test --- ...stTest.java => SqlServerQuoteSchemaTest.java} | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) rename hibernate-core/src/test/java/org/hibernate/test/schemaupdate/{SqlServerQuoteSchemaTestTest.java => SqlServerQuoteSchemaTest.java} (89%) diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTestTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTestTest.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java index 7f22ebfdd9..f6cade36da 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTestTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java @@ -21,19 +21,13 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; -import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.naturalid.inheritance.cache.ExtendedEntity; -import org.hibernate.test.naturalid.inheritance.cache.MyEntity; import org.junit.Test; import static org.hamcrest.core.Is.is; @@ -46,7 +40,7 @@ */ @TestForIssue( jiraKey = "HHH-12106" ) @RequiresDialect( SQLServerDialect.class ) -public class SqlServerQuoteSchemaTestTest extends BaseCoreFunctionalTestCase { +public class SqlServerQuoteSchemaTest extends BaseCoreFunctionalTestCase { private File output; @@ -88,9 +82,13 @@ protected void afterSessionFactoryBuilt() { } @Override - protected void cleanupTest() throws Exception { + protected void cleanupTest() { try { - output.delete(); + doInHibernate( this::sessionFactory, session -> { + session.createNativeQuery( + "DROP SCHEMA [my-schema]" ) + .executeUpdate(); + } ); } catch (Exception ignore) { }