From 120019b343d79216d9a49ae2fec45164860ed073 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 29 Sep 2021 02:11:49 -0500 Subject: [PATCH] HHH-14848 - Move Ant tasks + support from hibernate-core into tooling/hibernate-ant --- .../tool/schema/scripts/MultiLineImportExtractorTest.java | 4 ++-- .../test/tool/schema/scripts/MultiLineImportFileTest.java | 5 ++--- .../MultiLineImportWithSpacesAfterTheLastStatementTest.java | 4 ++-- .../schema/scripts/MultiLineImportWithTabsAndSpacesTest.java | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java index 27cc90ba34..05bbce0e3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java @@ -12,7 +12,7 @@ import java.io.InputStreamReader; import java.io.StringReader; import java.util.List; -import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class MultiLineImportExtractorTest { public static final String IMPORT_FILE = "org/hibernate/orm/test/tool/schema/scripts/multi-line-statements2.sql"; - private final MultipleLinesSqlCommandExtractor extractor = new MultipleLinesSqlCommandExtractor(); + private final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); @Test public void testExtraction() throws IOException { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java index 0633272599..e7c7875b82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.tool.schema.scripts; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.RequiresDialect; @@ -18,7 +18,6 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -37,7 +36,7 @@ public class MultiLineImportFileTest extends BaseCoreFunctionalTestCase { ); cfg.setProperty( Environment.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR, - MultipleLinesSqlCommandExtractor.class.getName() + MultiLineSqlScriptExtractor.class.getName() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java index 2e5b9316bf..0c0445a3b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; -import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DialectContext; @@ -27,7 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class MultiLineImportWithSpacesAfterTheLastStatementTest { public static final String IMPORT_FILE = "org/hibernate/orm/test/tool/schema/scripts/multi-line-statements-with-spaces-after-last-delimiter.sql"; - private final MultipleLinesSqlCommandExtractor extractor = new MultipleLinesSqlCommandExtractor(); + private final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); @Test public void testExtraction() throws Exception { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java index 6af6f8e60a..1e548026ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; -import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DialectContext; @@ -27,7 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class MultiLineImportWithTabsAndSpacesTest { public static final String IMPORT_FILE = "org/hibernate/orm/test/tool/schema/scripts/multi-line-statements-starting-with-tabs-and-spaces.sql"; - private final MultipleLinesSqlCommandExtractor extractor = new MultipleLinesSqlCommandExtractor(); + private final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); @Test public void testExtraction() throws Exception {