",cfg2java.getJavaTypeName(p, true, clazz)); - Assert.assertEquals("all types should be fully qualified when no importcontext","java.util.List",cfg2java.getJavaTypeName(p, true)); - Assert.assertEquals("new ArrayList

(0)", clazz.getFieldInitialization(p, true)); - Assert.assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); + assertEquals("List

",cfg2java.getJavaTypeName(p, true, clazz), "lists should not have the index visible in the declaration"); + assertEquals("java.util.List",cfg2java.getJavaTypeName(p, true), "all types should be fully qualified when no importcontext"); + assertEquals("new ArrayList

(0)", clazz.getFieldInitialization(p, true)); + assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("content"); - Assert.assertEquals("\"what can I say\"",clazz.getFieldInitialization(p, false)); + assertEquals("\"what can I say\"",clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("bagarticles"); - Assert.assertEquals("Should be a list via property-type", "java.util.List", cfg2java.getJavaTypeName( p, false )); - Assert.assertEquals("Should be a a generic'd list when generics=true", "java.util.List", cfg2java.getJavaTypeName( p, true )); - Assert.assertEquals("List

",cfg2java.getJavaTypeName(p, true, clazz)); - Assert.assertEquals("new ArrayList

(0)", clazz.getFieldInitialization(p, true)); - Assert.assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); + assertEquals("java.util.List", cfg2java.getJavaTypeName( p, false ), "Should be a list via property-type"); + assertEquals("java.util.List", cfg2java.getJavaTypeName( p, true ), "Should be a a generic'd list when generics=true"); + assertEquals("List

",cfg2java.getJavaTypeName(p, true, clazz)); + assertEquals("new ArrayList

(0)", clazz.getFieldInitialization(p, true)); + assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("bagstrings"); - Assert.assertEquals("Bag's are just a collection", "java.util.Collection", cfg2java.getJavaTypeName( p, false )); - Assert.assertEquals("Should be a a generic'd collection when generics=true", "java.util.Collection", cfg2java.getJavaTypeName( p, true )); - Assert.assertEquals("Collection",cfg2java.getJavaTypeName(p, true, clazz)); - Assert.assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, true)); - Assert.assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); + assertEquals("java.util.Collection", cfg2java.getJavaTypeName( p, false ), "Bag's are just a collection"); + assertEquals("java.util.Collection", cfg2java.getJavaTypeName( p, true ), "Should be a a generic'd collection when generics=true"); + assertEquals("Collection",cfg2java.getJavaTypeName(p, true, clazz)); + assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, true)); + assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("bagstrings"); - Assert.assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); + assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("naturalSortedArticlesMap"); - Assert.assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false)); - Assert.assertEquals("SortedMap", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); - Assert.assertEquals("new TreeMap()", clazz.getFieldInitialization(p, true)); - Assert.assertEquals("new TreeMap()", clazz.getFieldInitialization(p, false)); + assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false)); + assertEquals("SortedMap", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); + assertEquals("new TreeMap()", clazz.getFieldInitialization(p, true)); + assertEquals("new TreeMap()", clazz.getFieldInitialization(p, false)); p = classMapping.getProperty("sortedArticlesMap"); - Assert.assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false)); - Assert.assertEquals("SortedMap", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); - Assert.assertFalse(clazz.generateImports().contains("import comparator.NoopComparator;")); - Assert.assertEquals("new TreeMap(new NoopComparator())", clazz.getFieldInitialization(p, false)); - Assert.assertTrue(clazz.generateImports().contains("import comparator.NoopComparator;")); - Assert.assertEquals("new TreeMap(new NoopComparator())", clazz.getFieldInitialization(p, true)); + assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false)); + assertEquals("SortedMap", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); + assertFalse(clazz.generateImports().contains("import comparator.NoopComparator;")); + assertEquals("new TreeMap(new NoopComparator())", clazz.getFieldInitialization(p, false)); + assertTrue(clazz.generateImports().contains("import comparator.NoopComparator;")); + assertEquals("new TreeMap(new NoopComparator())", clazz.getFieldInitialization(p, true)); p = classMapping.getProperty("sortedArticlesSet"); - Assert.assertEquals("java.util.SortedSet", cfg2java.getJavaTypeName( p, false)); - Assert.assertEquals("SortedSet

", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); - Assert.assertEquals("new TreeSet

(new NoopComparator())", clazz.getFieldInitialization(p, true)); + assertEquals("java.util.SortedSet", cfg2java.getJavaTypeName( p, false)); + assertEquals("SortedSet

", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") )); + assertEquals("new TreeSet

(new NoopComparator())", clazz.getFieldInitialization(p, true)); } } From 7ea64c07d134b773942d1930cfceaadb3533b972 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 09:41:07 +0200 Subject: [PATCH 276/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.Hbm2JavaTest.TestCase' Signed-off-by: Koen Aers --- .../hbm2x/Hbm2JavaTest/DummyDateType.java | 20 ++ .../tool/hbm2x/Hbm2JavaTest/TestCase.java | 337 +++++++++--------- 2 files changed, 198 insertions(+), 159 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/DummyDateType.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/DummyDateType.java index 43fbf89ea5..3cbb1147b5 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/DummyDateType.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/DummyDateType.java @@ -1,3 +1,23 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.hibernate.tool.hbm2x.Hbm2JavaTest; import java.io.Serializable; diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/TestCase.java index c8678b4a29..d77264dcab 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2JavaTest/TestCase.java @@ -1,9 +1,30 @@ /* - * Created on 2004-12-01 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.hibernate.tool.hbm2x.Hbm2JavaTest; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.nio.file.Files; import java.util.HashMap; @@ -31,12 +52,10 @@ import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JUnitUtil; import org.hibernate.tools.test.util.JavaUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; /** * @author max @@ -54,26 +73,26 @@ public class TestCase { "Passenger.hbm.xml" }; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + @TempDir + public File outputFolder = new File("output"); + private Metadata metadata = null; private MetadataDescriptor metadataDescriptor = null; - private File outputDir = null; + private File scDir = null; private File resourcesDir = null; private ArtifactCollector artifactCollector = null; - @Before + @BeforeEach public void setUp() throws Exception { - outputDir = new File(temporaryFolder.getRoot(), "output"); - outputDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + scDir = new File(outputFolder, "output"); + scDir.mkdir(); + resourcesDir = new File(outputFolder, "resources"); metadataDescriptor = HibernateUtil .initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir); metadata = metadataDescriptor.createMetadata(); POJOExporter exporter = new POJOExporter(); exporter.setMetadataDescriptor(metadataDescriptor); - exporter.setOutputDirectory(outputDir); + exporter.setOutputDirectory(scDir); artifactCollector = new ArtifactCollector(); exporter.setArtifactCollector(artifactCollector); exporter.start(); @@ -82,60 +101,60 @@ public void setUp() throws Exception { @Test public void testFileExistence() { JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Passenger.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "generated/BaseHelloWorld.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "HelloUniverse.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/FatherComponent.java")); JUnitUtil.assertIsNonEmptyFile(new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/ChildComponent.java")); - Assert.assertEquals(15, artifactCollector.getFileCount("java")); + assertEquals(15, artifactCollector.getFileCount("java")); } // TODO Re-enable this test: HBX-1248 - @Ignore + @Disabled @Test public void testCompilable() throws Exception { String helloWorldResourcePath = "/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.java_"; File helloWorldOrigin = new File(getClass().getResource(helloWorldResourcePath).toURI()); - File helloWorldDestination = new File(outputDir, "HelloWorld.java"); - File targetDir = new File(temporaryFolder.getRoot(), "compilerOutput" ); + File helloWorldDestination = new File(scDir, "HelloWorld.java"); + File targetDir = new File(outputFolder, "compilerOutput" ); targetDir.mkdir(); Files.copy(helloWorldOrigin.toPath(), helloWorldDestination.toPath()); - JavaUtil.compile(outputDir, targetDir); - Assert.assertTrue(new File(targetDir, "HelloWorld.class").exists()); + JavaUtil.compile(scDir, targetDir); + assertTrue(new File(targetDir, "HelloWorld.class").exists()); } // TODO Implement HBX-606 so that the following test succeeds - @Ignore + @Disabled @Test public void testParentComponentFailureExpected() { File file = new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/FatherComponent.java"); - Assert.assertEquals( + assertEquals( "test", FileUtil.findFirstString( "testParent", @@ -144,30 +163,30 @@ public void testParentComponentFailureExpected() { @Test public void testNoFreeMarkerLeftOvers() { - Assert.assertNull(FileUtil.findFirstString( + assertNull(FileUtil.findFirstString( "$", new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.java"))); - Assert.assertNull(FileUtil.findFirstString( + assertNull(FileUtil.findFirstString( "$", new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.java"))); - Assert.assertNull(FileUtil.findFirstString( + assertNull(FileUtil.findFirstString( "$", new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.java"))); - Assert.assertNull(FileUtil.findFirstString( + assertNull(FileUtil.findFirstString( "$", new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.java"))); - Assert.assertNull(FileUtil.findFirstString( + assertNull(FileUtil.findFirstString( "$", new File( - outputDir, + scDir, "org/hibernate/tool/hbm2x/Hbm2JavaTest/Address.java"))); } @@ -176,36 +195,36 @@ public void testPackageName() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaTest.Order"); POJOClass pc = c2j.getPOJOClass(classMapping); - Assert.assertEquals( "org.hibernate.tool.hbm2x.Hbm2JavaTest", pc.getPackageName() ); - Assert.assertEquals( "package org.hibernate.tool.hbm2x.Hbm2JavaTest;", pc.getPackageDeclaration() ); - Assert.assertEquals( - "did not honor generated-class", + assertEquals( "org.hibernate.tool.hbm2x.Hbm2JavaTest", pc.getPackageName() ); + assertEquals( "package org.hibernate.tool.hbm2x.Hbm2JavaTest;", pc.getPackageDeclaration() ); + assertEquals( "package generated;", c2j.getPOJOClass(metadata.getEntityBinding("HelloWorld")) - .getPackageDeclaration()); + .getPackageDeclaration(), + "did not honor generated-class"); } // TODO Re-enable this test: HBX-1242 - @Ignore + @Disabled @Test public void testFieldNotThere() { - Assert.assertNull(FileUtil.findFirstString( - "notgenerated", + assertNull(FileUtil.findFirstString( + "notgenerated", new File( - outputDir, + scDir, "HelloUniverse.java"))); } @Test public void testJavaDoc() { Cfg2JavaTool c2j = new Cfg2JavaTool(); - Assert.assertEquals( " * test", c2j.toJavaDoc( "test", 0 ) ); - Assert.assertEquals( " * test", c2j.toJavaDoc( "test", 2 ) ); - Assert.assertEquals( " * test\n * me", c2j.toJavaDoc( "test\nme", 2 ) ); + assertEquals( " * test", c2j.toJavaDoc( "test", 0 ) ); + assertEquals( " * test", c2j.toJavaDoc( "test", 2 ) ); + assertEquals( " * test\n * me", c2j.toJavaDoc( "test\nme", 2 ) ); PersistentClass local = metadata.getEntityBinding( "HelloWorld" ); POJOClass pc = c2j.getPOJOClass(local); - Assert.assertEquals( " * Hey there", pc.getClassJavaDoc( "fallback", 0 ) ); - Assert.assertEquals( + assertEquals( " * Hey there", pc.getClassJavaDoc( "fallback", 0 ) ); + assertEquals( " * Test Field Description", pc.getFieldJavaDoc(local.getIdentifierProperty(), 0 ) ); } @@ -213,11 +232,11 @@ public void testJavaDoc() { @Test public void testExtraCode() { Cfg2JavaTool c2j = new Cfg2JavaTool(); - Assert.assertFalse(c2j.hasMetaAttribute( + assertFalse(c2j.hasMetaAttribute( metadata.getEntityBinding("HelloWorld" ), "class-code" ) ); PersistentClass classMapping = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); - Assert.assertEquals( + assertEquals( "// extra code line 1\n// extra code line 2\n{ Collator.getInstance(); }", c2j.getPOJOClass(classMapping).getExtraClassCode() ); } @@ -227,8 +246,8 @@ public void testScope() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); - Assert.assertEquals( "public strictfp", c2j.getClassModifiers( pc ) ); - Assert.assertEquals("public", c2j.getClassModifiers(metadata.getEntityBinding( "HelloWorld" ) ) ); + assertEquals( "public strictfp", c2j.getClassModifiers( pc ) ); + assertEquals("public", c2j.getClassModifiers(metadata.getEntityBinding( "HelloWorld" ) ) ); } @Test @@ -236,8 +255,8 @@ public void testDeclarationType() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); - Assert.assertEquals( "class", c2j.getPOJOClass(pc).getDeclarationType() ); - Assert.assertEquals( "interface", c2j.getPOJOClass(metadata.getEntityBinding( "HelloWorld" ) ).getDeclarationType() ); + assertEquals( "class", c2j.getPOJOClass(pc).getDeclarationType() ); + assertEquals( "interface", c2j.getPOJOClass(metadata.getEntityBinding( "HelloWorld" ) ).getDeclarationType() ); } @Test @@ -246,7 +265,7 @@ public void testTypeName() { PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); Property property = pc.getProperty( "lineItems" ); - Assert.assertEquals( "java.util.Collection", c2j.getJavaTypeName( property, false ) ); + assertEquals( "java.util.Collection", c2j.getJavaTypeName( property, false ) ); } @Test @@ -255,34 +274,34 @@ public void testUseRawTypeNullability() { PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Product" ); Property property = pc.getProperty( "numberAvailable" ); - Assert.assertFalse( property.getValue().isNullable() ); - Assert.assertEquals( - "typename should be used when rawtypemode", + assertFalse( property.getValue().isNullable() ); + assertEquals( "int", - c2j.getJavaTypeName( property, false ) ); + c2j.getJavaTypeName( property, false ), + "typename should be used when rawtypemode"); property = pc.getProperty( "minStock" ); - Assert.assertTrue( property.getValue().isNullable() ); - Assert.assertEquals( - "typename should be used when rawtypemode", + assertTrue( property.getValue().isNullable() ); + assertEquals( "long", - c2j.getJavaTypeName( property, false ) ); + c2j.getJavaTypeName( property, false ), + "typename should be used when rawtypemode"); property = pc.getProperty( "otherStock" ); - Assert.assertFalse( property.getValue().isNullable() ); - Assert.assertEquals( - "type should still be overriden by meta attribute", + assertFalse( property.getValue().isNullable() ); + assertEquals( "java.lang.Integer", - c2j.getJavaTypeName( property, false ) ); + c2j.getJavaTypeName( property, false ), + "type should still be overriden by meta attribute"); property = pc.getIdentifierProperty(); - Assert.assertFalse( property.getValue().isNullable() ); - Assert.assertEquals( - "wrappers should be used by default", + assertFalse( property.getValue().isNullable() ); + assertEquals( "long", - c2j.getJavaTypeName( property, false ) ); + c2j.getJavaTypeName( property, false ), + "wrappers should be used by default"); pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer" ); Component identifier = (Component) pc.getIdentifier(); - Assert.assertFalse(((Property) identifier.getPropertyIterator().next() ) + assertFalse(((Property) identifier.getPropertyIterator().next() ) .getValue().isNullable() ); - Assert.assertEquals( "long", c2j.getJavaTypeName( property, false ) ); + assertEquals( "long", c2j.getJavaTypeName( property, false ) ); } @Test @@ -290,22 +309,22 @@ public void testExtendsImplements() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); - Assert.assertEquals( null, c2j.getPOJOClass(pc).getExtends() ); + assertEquals( null, c2j.getPOJOClass(pc).getExtends() ); POJOClass entityPOJOClass = c2j.getPOJOClass(metadata.getEntityBinding("HelloWorld" )); - Assert.assertEquals( "Comparable", entityPOJOClass.getExtends() ); - Assert.assertNull( - "should be interface which cannot have implements", - entityPOJOClass.getImplements() ); - Assert.assertEquals( - "should be interface which cannot have implements", + assertEquals( "Comparable", entityPOJOClass.getExtends() ); + assertNull( + entityPOJOClass.getImplements(), + "should be interface which cannot have implements"); + assertEquals( "", - entityPOJOClass.getImplementsDeclaration() ); + entityPOJOClass.getImplementsDeclaration(), + "should be interface which cannot have implements"); PersistentClass base = new RootClass(null); base.setClassName( "Base" ); PersistentClass sub = new SingleTableSubclass( base, null ); sub.setClassName( "Sub" ); - Assert.assertEquals( null, c2j.getPOJOClass(base).getExtends() ); - Assert.assertEquals( "Base", c2j.getPOJOClass(sub).getExtends() ); + assertEquals( null, c2j.getPOJOClass(base).getExtends() ); + assertEquals( "Base", c2j.getPOJOClass(sub).getExtends() ); Map m = new HashMap(); MetaAttribute attribute = new MetaAttribute( "extends" ); attribute.addValue( "x" ); @@ -315,13 +334,13 @@ public void testExtendsImplements() { attribute.addValue( "true" ); m.put( attribute.getName(), attribute ); sub.setMetaAttributes( m ); - Assert.assertEquals( "Base,x,y", c2j.getPOJOClass(sub).getExtends() ); + assertEquals( "Base,x,y", c2j.getPOJOClass(sub).getExtends() ); m = new HashMap(); attribute = new MetaAttribute( "implements" ); attribute.addValue( "intf" ); m.put( attribute.getName(), attribute ); base.setMetaAttributes( m ); - Assert.assertEquals( "intf,java.io.Serializable", c2j.getPOJOClass(base).getImplements() ); + assertEquals( "intf,java.io.Serializable", c2j.getPOJOClass(base).getImplements() ); } @Test @@ -331,9 +350,9 @@ public void testDeclarationName() { "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); PersistentClass hw = metadata.getEntityBinding( "HelloWorld" ); POJOClass epc = c2j.getPOJOClass(pc); - Assert.assertEquals( "Order", epc.getDeclarationName() ); + assertEquals( "Order", epc.getDeclarationName() ); epc = c2j.getPOJOClass(hw); - Assert.assertEquals( "BaseHelloWorld", epc.getDeclarationName() ); + assertEquals( "BaseHelloWorld", epc.getDeclarationName() ); } @Test @@ -341,11 +360,11 @@ public void testAsArguments() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); - Assert.assertEquals( + assertEquals( "java.util.Calendar orderDate, java.math.BigDecimal total, org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer customer, java.util.Collection lineItems", c2j.asParameterList( pc.getPropertyIterator(), false, new NoopImportContext() )); - Assert.assertEquals( + assertEquals( "orderDate, total, customer, lineItems", c2j.asArgumentList( pc.getPropertyIterator() ) ); } @@ -356,13 +375,13 @@ public void testPropertiesForFullConstructor() { PersistentClass pc = metadata.getEntityBinding( "HelloWorld" ); POJOClass pjc = c2j.getPOJOClass(pc); List wl = pjc.getPropertiesForFullConstructor(); - Assert.assertEquals( 3, wl.size() ); + assertEquals( 3, wl.size() ); PersistentClass uni = metadata.getEntityBinding( "HelloUniverse" ); pjc = c2j.getPOJOClass(uni); List local = pjc.getPropertyClosureForFullConstructor(); - Assert.assertEquals( 6, local.size() ); + assertEquals( 6, local.size() ); for(int i=0;i iter = pjc.getToStringPropertiesIterator(); // in HelloWorld.hbm.xml there're 2 Properties for toString - Assert.assertEquals( "id", (iter.next() ).getName() ); - Assert.assertEquals( "hello", (iter.next() ).getName() ); - Assert.assertFalse( iter.hasNext() ); + assertEquals( "id", (iter.next() ).getName() ); + assertEquals( "hello", (iter.next() ).getName() ); + assertFalse( iter.hasNext() ); pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Order" ); pjc = c2j.getPOJOClass(pc); - Assert.assertFalse( pjc.needsToString() ); + assertFalse( pjc.needsToString() ); pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer" ); Component c = (Component) pc.getProperty( "addressComponent" ) .getValue(); POJOClass cc = c2j.getPOJOClass(c); - Assert.assertTrue( cc.needsToString() ); + assertTrue( cc.needsToString() ); iter = cc.getToStringPropertiesIterator(); // in Customer.hbm.xml there's 1 Property for toString - Assert.assertEquals( "city", (iter.next() ).getName() ); - Assert.assertFalse( iter.hasNext() ); + assertEquals( "city", (iter.next() ).getName() ); + assertFalse( iter.hasNext() ); } @Test public void testImportOfSameName() { ImportContext ic = new ImportContextImpl("foobar"); - Assert.assertEquals("CascadeType", ic.importType("javax.persistence.CascadeType")); - Assert.assertEquals("org.hibernate.annotations.CascadeType", ic.importType("org.hibernate.annotations.CascadeType")); - Assert.assertTrue("The hibernate annotation should not be imported to avoid name clashes", ic.generateImports().indexOf("hibernate")<0); + assertEquals("CascadeType", ic.importType("javax.persistence.CascadeType")); + assertEquals("org.hibernate.annotations.CascadeType", ic.importType("org.hibernate.annotations.CascadeType")); + assertTrue(ic.generateImports().indexOf("hibernate")<0, "The hibernate annotation should not be imported to avoid name clashes"); } @Test public void testImporter() { ImportContext context = new ImportContextImpl( "org.hibernate" ); - Assert.assertEquals("byte", context.importType("byte")); - Assert.assertEquals("Session", context.importType("org.hibernate.Session")); - Assert.assertEquals("Long", context.importType("java.lang.Long")); - Assert.assertEquals("org.test.Session", context.importType("org.test.Session")); - Assert.assertEquals("Entity", context.importType("org.test.Entity")); - Assert.assertEquals("org.other.test.Entity", context.importType("org.other.test.Entity")); - Assert.assertEquals("Collection", context.importType("java.util.Collection")); - Assert.assertEquals("Map", context.importType("java.util.Map")); - Assert.assertEquals("Collection[]", context.importType("java.util.Collection[]")); - Assert.assertEquals("Map", context.importType("java.util.Map")); + assertEquals("byte", context.importType("byte")); + assertEquals("Session", context.importType("org.hibernate.Session")); + assertEquals("Long", context.importType("java.lang.Long")); + assertEquals("org.test.Session", context.importType("org.test.Session")); + assertEquals("Entity", context.importType("org.test.Entity")); + assertEquals("org.other.test.Entity", context.importType("org.other.test.Entity")); + assertEquals("Collection", context.importType("java.util.Collection")); + assertEquals("Map", context.importType("java.util.Map")); + assertEquals("Collection[]", context.importType("java.util.Collection[]")); + assertEquals("Map", context.importType("java.util.Map")); String string = context.generateImports(); - Assert.assertTrue(string.indexOf("import org.hibernate.Session;")<0); - Assert.assertTrue(string.indexOf("import org.test.Entity;")>0); - Assert.assertTrue("Entity can only be imported once", string.indexOf("import org.other.test.Entity;")<0); - Assert.assertFalse(string.indexOf("<")>=0); - Assert.assertEquals("Outer.Entity", context.importType("org.test.Outer$Entity")); - Assert.assertEquals("org.other.test.Outer.Entity", context.importType("org.other.test.Outer$Entity")); - Assert.assertEquals("Collection", context.importType("java.util.Collection")); - Assert.assertEquals("Map", context.importType("java.util.Map")); - Assert.assertEquals("Collection[]", context.importType("java.util.Collection[]")); - Assert.assertEquals("Map", context.importType("java.util.Map")); + assertTrue(string.indexOf("import org.hibernate.Session;")<0); + assertTrue(string.indexOf("import org.test.Entity;")>0); + assertTrue(string.indexOf("import org.other.test.Entity;")<0, "Entity can only be imported once"); + assertFalse(string.indexOf("<")>=0); + assertEquals("Outer.Entity", context.importType("org.test.Outer$Entity")); + assertEquals("org.other.test.Outer.Entity", context.importType("org.other.test.Outer$Entity")); + assertEquals("Collection", context.importType("java.util.Collection")); + assertEquals("Map", context.importType("java.util.Map")); + assertEquals("Collection[]", context.importType("java.util.Collection[]")); + assertEquals("Map", context.importType("java.util.Map")); //assertEquals("Test.Entry", context.importType("org.hibernate.Test.Entry")); what should be the behavior for this ? - Assert.assertEquals("Test.Entry", context.importType("org.hibernate.Test$Entry")); - Assert.assertEquals("Map.Entry", context.importType("java.util.Map$Entry")); - Assert.assertEquals("Entry", context.importType("java.util.Map.Entry")); // we can't detect that it is the same class here unless we try an load all strings so we fall back to default class name. - Assert.assertEquals("List", context.importType( "java.util.List" )); - Assert.assertEquals("List", context.importType( "java.util.List" )); + assertEquals("Test.Entry", context.importType("org.hibernate.Test$Entry")); + assertEquals("Map.Entry", context.importType("java.util.Map$Entry")); + assertEquals("Entry", context.importType("java.util.Map.Entry")); // we can't detect that it is the same class here unless we try an load all strings so we fall back to default class name. + assertEquals("List", context.importType( "java.util.List" )); + assertEquals("List", context.importType( "java.util.List" )); string = context.generateImports(); - Assert.assertTrue(string.indexOf("import java.util.Map")>=0); - Assert.assertTrue(string.indexOf("import java.utilMap$")<0); - Assert.assertTrue(string.indexOf("$")<0); + assertTrue(string.indexOf("import java.util.Map")>=0); + assertTrue(string.indexOf("import java.utilMap$")<0); + assertTrue(string.indexOf("$")<0); } @Test @@ -440,20 +459,20 @@ public void testEqualsHashCode() { Cfg2JavaTool c2j = new Cfg2JavaTool(); PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer" ); POJOClass pjc = c2j.getPOJOClass((Component) pc.getProperty("addressComponent").getValue()); - Assert.assertTrue( pjc.needsEqualsHashCode() ); + assertTrue( pjc.needsEqualsHashCode() ); Iterator iter = pjc.getEqualsHashCodePropertiesIterator(); // in HelloWorld.hbm.xml there're 2 Properties for toString - Assert.assertEquals( "streetAddress1", iter.next().getName() ); - Assert.assertEquals( "city", iter.next().getName() ); - Assert.assertEquals( "verified", iter.next().getName() ); - Assert.assertFalse( iter.hasNext() ); + assertEquals( "streetAddress1", iter.next().getName() ); + assertEquals( "city", iter.next().getName() ); + assertEquals( "verified", iter.next().getName() ); + assertFalse( iter.hasNext() ); } // TODO Re-enable this test: HBX-1249 - @Ignore + @Disabled @Test public void testGenerics() throws Exception { - File genericsSource = new File(temporaryFolder.getRoot(), "genericssource"); + File genericsSource = new File(outputFolder, "genericssource"); POJOExporter exporter = new POJOExporter(); exporter.setMetadataDescriptor(metadataDescriptor); exporter.setOutputDirectory(genericsSource); @@ -461,23 +480,23 @@ public void testGenerics() throws Exception { exporter.setArtifactCollector(artifactCollector); exporter.getProperties().setProperty("jdk5", "true"); exporter.start(); - File genericsTarget = new File(temporaryFolder.getRoot(), "genericstarget" ); + File genericsTarget = new File(outputFolder, "genericstarget" ); genericsTarget.mkdir(); String helloWorldResourcePath = "/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.java_"; File helloWorldOrigin = new File(getClass().getResource(helloWorldResourcePath).toURI()); - File helloWorldDestination = new File(outputDir, "HelloWorld.java"); + File helloWorldDestination = new File(scDir, "HelloWorld.java"); Files.copy(helloWorldOrigin.toPath(), helloWorldDestination.toPath()); JavaUtil.compile(genericsSource, genericsTarget); - Assert.assertTrue(new File(genericsTarget, "HelloWorld.class").exists()); + assertTrue(new File(genericsTarget, "HelloWorld.class").exists()); } - @Ignore + @Disabled @Test public void testDynamicComponent() { PersistentClass classMapping = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer"); - Assert.assertEquals( + assertEquals( "java.util.Map", new Cfg2JavaTool().getJavaTypeName( classMapping.getProperty("dynaMap"), false)); @@ -485,17 +504,17 @@ public void testDynamicComponent() { @Test public void testCapitializaiton() { - Assert.assertEquals("Mail", BasicPOJOClass.beanCapitalize("Mail")); - Assert.assertEquals("Mail", BasicPOJOClass.beanCapitalize("mail")); - Assert.assertEquals("eMail", BasicPOJOClass.beanCapitalize("eMail")); - Assert.assertEquals("EMail", BasicPOJOClass.beanCapitalize("EMail")); + assertEquals("Mail", BasicPOJOClass.beanCapitalize("Mail")); + assertEquals("Mail", BasicPOJOClass.beanCapitalize("mail")); + assertEquals("eMail", BasicPOJOClass.beanCapitalize("eMail")); + assertEquals("EMail", BasicPOJOClass.beanCapitalize("EMail")); } @Test public void testUserTypes() { PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaTest.Customer"); Property property = classMapping.getProperty("customDate"); - Assert.assertEquals("java.sql.Date", new Cfg2JavaTool().getJavaTypeName(property, false)); + assertEquals("java.sql.Date", new Cfg2JavaTool().getJavaTypeName(property, false)); } } From f7cade4b53adba1c9c50535bee91d2815235c8b1 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 09:54:43 +0200 Subject: [PATCH 277/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.HibernateMappingExporterTest.TestCase' Signed-off-by: Koen Aers --- .../TestCase.java | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/HibernateMappingExporterTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/HibernateMappingExporterTest/TestCase.java index 2b52f3555e..89fdb1a1c0 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/HibernateMappingExporterTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/HibernateMappingExporterTest/TestCase.java @@ -1,5 +1,28 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.hibernate.tool.hbm2x.HibernateMappingExporterTest; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.FileWriter; import java.util.Properties; @@ -9,10 +32,8 @@ import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; import org.hibernate.tool.hbm2x.HibernateMappingExporter; import org.hibernate.tools.test.util.HibernateUtil; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { @@ -25,12 +46,12 @@ public class TestCase { " "+ " "; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + @TempDir + public File outputFolder = new File("output"); + @Test public void testStart() throws Exception { - File resources = new File(temporaryFolder.getRoot(), "resources"); + File resources = new File(outputFolder, "resources"); resources.mkdir(); File fooHbmXmlOrigin = new File(resources, "origin.hbm.xml"); FileWriter writer = new FileWriter(fooHbmXmlOrigin); @@ -41,16 +62,16 @@ public void testStart() throws Exception { properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName()); MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory .createNativeDescriptor(null, new File[] { fooHbmXmlOrigin }, properties); - final File outputDir = new File(temporaryFolder.getRoot(), "output"); + final File outputDir = new File(outputFolder, "output"); outputDir.mkdir(); HibernateMappingExporter exporter = new HibernateMappingExporter(); exporter.setMetadataDescriptor(metadataDescriptor); exporter.setOutputDirectory(outputDir); final File fooHbmXml = new File(outputDir, "Foo.hbm.xml"); - Assert.assertFalse(fooHbmXml.exists()); + assertFalse(fooHbmXml.exists()); exporter.start(); - Assert.assertTrue(fooHbmXml.exists()); - Assert.assertTrue(fooHbmXml.delete()); + assertTrue(fooHbmXml.exists()); + assertTrue(fooHbmXml.delete()); } } From 451a82efdf099793196c98ce32943a02d58272d8 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 10:10:12 +0200 Subject: [PATCH 278/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.OtherCfg2HbmTest.TestCase' Signed-off-by: Koen Aers --- .../tool/hbm2x/OtherCfg2HbmTest/TestCase.java | 81 +++++++++++-------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/TestCase.java index f7fcdbbc86..1abd0d18b1 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/TestCase.java @@ -1,9 +1,28 @@ /* - * Created on 2004-12-01 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.hibernate.tool.hbm2x.OtherCfg2HbmTest; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.io.File; import java.util.Properties; @@ -22,11 +41,9 @@ import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JUnitUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -44,34 +61,34 @@ public class TestCase { "HelloWorld.hbm.xml" }; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - - private File outputDir = null; + @TempDir + public File outputFolder = new File("output"); + + private File srcDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() throws Exception { - outputDir = new File(temporaryFolder.getRoot(), "output"); - outputDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + srcDir = new File(outputFolder, "output"); + srcDir.mkdir(); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); MetadataDescriptor metadataDescriptor = HibernateUtil .initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir); Exporter hbmexporter = new HibernateMappingExporter(); hbmexporter.setMetadataDescriptor(metadataDescriptor); - hbmexporter.setOutputDirectory(outputDir); + hbmexporter.setOutputDirectory(srcDir); hbmexporter.start(); } @Test public void testFileExistence() { - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml") ); - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml") ); - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/Order.hbm.xml") ); - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/Product.hbm.xml") ); - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "HelloWorld.hbm.xml") ); - JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "HelloUniverse.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "HelloWorld.hbm.xml") ); + JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "HelloUniverse.hbm.xml") ); } @Test @@ -80,34 +97,34 @@ public void testReadable() { properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName()); properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName()); File[] hbmFiles = new File[4]; - hbmFiles[0] = new File(outputDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml"); - hbmFiles[1] = new File(outputDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml"); - hbmFiles[2] = new File(outputDir, "org/hibernate/tool/hbm2x/Order.hbm.xml"); - hbmFiles[3] = new File(outputDir, "org/hibernate/tool/hbm2x/Product.hbm.xml"); + hbmFiles[0] = new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml"); + hbmFiles[1] = new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml"); + hbmFiles[2] = new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml"); + hbmFiles[3] = new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml"); Metadata metadata = MetadataDescriptorFactory .createNativeDescriptor(null, hbmFiles, properties) .createMetadata(); - Assert.assertNotNull(metadata); + assertNotNull(metadata); } @Test public void testNoVelocityLeftOvers() { - Assert.assertEquals(null, FileUtil.findFirstString("$",new File(outputDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml") ) ); - Assert.assertEquals(null, FileUtil.findFirstString("$",new File(outputDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml") ) ); - Assert.assertEquals(null, FileUtil.findFirstString("$",new File(outputDir, "org/hibernate/tool/hbm2x/Order.hbm.xml") ) ); - Assert.assertEquals(null, FileUtil.findFirstString("$",new File(outputDir, "org/hibernate/tool/hbm2x/Product.hbm.xml") ) ); + assertEquals(null, FileUtil.findFirstString("$",new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml") ) ); + assertEquals(null, FileUtil.findFirstString("$",new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml") ) ); + assertEquals(null, FileUtil.findFirstString("$",new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml") ) ); + assertEquals(null, FileUtil.findFirstString("$",new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml") ) ); } @Test public void testVersioning() throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); - Document document = db.parse(new File(outputDir, "org/hibernate/tool/hbm2x/Product.hbm.xml")); + Document document = db.parse(new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml")); XPath xpath = XPathFactory.newInstance().newXPath(); NodeList nodeList = (NodeList)xpath .compile("//hibernate-mapping/class/version") .evaluate(document, XPathConstants.NODESET); - Assert.assertEquals("Expected to get one version element", 1, nodeList.getLength()); + assertEquals(1, nodeList.getLength(), "Expected to get one version element"); } } From c5a9796e6cb8e1c76d58e9285047c4262376a1c2 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 10:24:46 +0200 Subject: [PATCH 279/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.PropertiesTest.TestCase' Signed-off-by: Koen Aers --- .../tool/hbm2x/PropertiesTest/TestCase.java | 83 ++++++++++++------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/PropertiesTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/PropertiesTest/TestCase.java index 84e1c836b4..f1a3ca2ed9 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/hbm2x/PropertiesTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/hbm2x/PropertiesTest/TestCase.java @@ -1,9 +1,30 @@ /* - * Created on 2004-12-01 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.hibernate.tool.hbm2x.PropertiesTest; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.nio.file.Files; @@ -22,11 +43,9 @@ import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JUnitUtil; import org.hibernate.tools.test.util.JavaUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -41,29 +60,29 @@ public class TestCase { "Properties.hbm.xml" }; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + @TempDir + public File outputFolder = new File("output"); + private ArtifactCollector artifactCollector; - private File outputDir = null; + private File srcDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() throws Exception { artifactCollector = new ArtifactCollector(); - outputDir = new File(temporaryFolder.getRoot(), "output"); - outputDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + srcDir = new File(outputFolder, "output"); + srcDir.mkdir(); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); MetadataDescriptor metadataDescriptor = HibernateUtil .initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir); Exporter exporter = new POJOExporter(); exporter.setMetadataDescriptor(metadataDescriptor); - exporter.setOutputDirectory(outputDir); + exporter.setOutputDirectory(srcDir); exporter.setArtifactCollector(artifactCollector); Exporter hbmexporter = new HibernateMappingExporter(); hbmexporter.setMetadataDescriptor(metadataDescriptor); - hbmexporter.setOutputDirectory(outputDir); + hbmexporter.setOutputDirectory(srcDir); hbmexporter.setArtifactCollector(artifactCollector); exporter.start(); hbmexporter.start(); @@ -71,13 +90,13 @@ public void setUp() throws Exception { @Test public void testNoGenerationOfEmbeddedPropertiesComponent() { - Assert.assertEquals(2, artifactCollector.getFileCount("java")); - Assert.assertEquals(2, artifactCollector.getFileCount("hbm.xml")); + assertEquals(2, artifactCollector.getFileCount("java")); + assertEquals(2, artifactCollector.getFileCount("hbm.xml")); } @Test public void testGenerationOfEmbeddedProperties() throws Exception { - File outputXml = new File(outputDir, "properties/PPerson.hbm.xml"); + File outputXml = new File(srcDir, "properties/PPerson.hbm.xml"); JUnitUtil.assertIsNonEmptyFile(outputXml); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); @@ -86,32 +105,32 @@ public void testGenerationOfEmbeddedProperties() throws Exception { NodeList nodeList = (NodeList)xpath .compile("//hibernate-mapping/class/properties") .evaluate(document, XPathConstants.NODESET); - Assert.assertEquals("Expected to get one properties element", 1, nodeList.getLength()); + assertEquals(1, nodeList.getLength(), "Expected to get one properties element"); Element element = (Element) nodeList.item(0); - Assert.assertEquals(element.getAttribute( "name" ),"emergencyContact"); - Assert.assertNotNull( + assertEquals(element.getAttribute( "name" ),"emergencyContact"); + assertNotNull( FileUtil.findFirstString( "name", - new File(outputDir, "properties/PPerson.java" ))); - Assert.assertNull( - "Embedded component/properties should not show up in .java", + new File(srcDir, "properties/PPerson.java" ))); + assertNull( FileUtil.findFirstString( "emergencyContact", - new File(outputDir, "properties/PPerson.java" ))); + new File(srcDir, "properties/PPerson.java" )), + "Embedded component/properties should not show up in .java"); } @Test public void testCompilable() throws Exception { String propertiesUsageResourcePath = "/org/hibernate/tool/hbm2x/PropertiesTest/PropertiesUsage.java_"; File propertiesUsageOrigin = new File(getClass().getResource(propertiesUsageResourcePath).toURI()); - File propertiesUsageDestination = new File(outputDir, "properties/PropertiesUsage.java"); - File targetDir = new File(temporaryFolder.getRoot(), "compilerOutput" ); + File propertiesUsageDestination = new File(srcDir, "properties/PropertiesUsage.java"); + File targetDir = new File(outputFolder, "compilerOutput" ); targetDir.mkdir(); Files.copy(propertiesUsageOrigin.toPath(), propertiesUsageDestination.toPath()); - JavaUtil.compile(outputDir, targetDir); - Assert.assertTrue(new File(targetDir, "properties/PCompany.class").exists()); - Assert.assertTrue(new File(targetDir, "properties/PPerson.class").exists()); - Assert.assertTrue(new File(targetDir, "properties/PropertiesUsage.class").exists()); + JavaUtil.compile(srcDir, targetDir); + assertTrue(new File(targetDir, "properties/PCompany.class").exists()); + assertTrue(new File(targetDir, "properties/PPerson.class").exists()); + assertTrue(new File(targetDir, "properties/PropertiesUsage.class").exists()); } } From 80116411f53ac37be7dea72e9e8520adea742802 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 10:41:42 +0200 Subject: [PATCH 280/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ide.completion.CompletionHelperTest.TestCase' Signed-off-by: Koen Aers --- .../CompletionHelperTest/TestCase.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/CompletionHelperTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/CompletionHelperTest/TestCase.java index bd3426938c..265e5f85fe 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/CompletionHelperTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/CompletionHelperTest/TestCase.java @@ -1,29 +1,33 @@ /* - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.hibernate.tool.ide.completion.CompletionHelperTest; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; import org.hibernate.tool.ide.completion.CompletionHelper; import org.hibernate.tool.ide.completion.EntityNameReference; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author leon @@ -36,17 +40,17 @@ public void testGetCanonicalPath() { qts.add(new EntityNameReference("Article", "art")); qts.add(new EntityNameReference("art.descriptions", "descr")); qts.add(new EntityNameReference("descr.name", "n")); - Assert.assertEquals("Invalid path", "Article/descriptions/name/locale", CompletionHelper.getCanonicalPath(qts, "n.locale")); - Assert.assertEquals("Invalid path", "Article/descriptions", CompletionHelper.getCanonicalPath(qts, "descr")); + assertEquals("Article/descriptions/name/locale", CompletionHelper.getCanonicalPath(qts, "n.locale"), "Invalid path"); + assertEquals("Article/descriptions", CompletionHelper.getCanonicalPath(qts, "descr"), "Invalid path"); // qts.clear(); qts.add(new EntityNameReference("com.company.Clazz", "clz")); qts.add(new EntityNameReference("clz.attr", "a")); - Assert.assertEquals("Invalid path", "com.company.Clazz/attr", CompletionHelper.getCanonicalPath(qts, "a")); + assertEquals("com.company.Clazz/attr", CompletionHelper.getCanonicalPath(qts, "a"), "Invalid path"); // qts.clear(); qts.add(new EntityNameReference("Agga", "a")); - Assert.assertEquals("Invalid path", "Agga", CompletionHelper.getCanonicalPath(qts, "a")); + assertEquals("Agga", CompletionHelper.getCanonicalPath(qts, "a"), "Invalid path"); } @Test From ac0a7a8894b9fbf15e7104ac933e108f82b0cc31 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 10:57:12 +0200 Subject: [PATCH 281/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ide.completion.HqlAnalyzer.TestCase' Signed-off-by: Koen Aers --- .../ide/completion/HqlAnalyzer/TestCase.java | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/HqlAnalyzer/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/HqlAnalyzer/TestCase.java index 115106a566..053f2c1923 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/HqlAnalyzer/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/HqlAnalyzer/TestCase.java @@ -1,30 +1,36 @@ /* - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.hibernate.tool.ide.completion.HqlAnalyzer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Iterator; import java.util.List; import org.hibernate.tool.ide.completion.EntityNameReference; import org.hibernate.tool.ide.completion.HQLAnalyzer; import org.hibernate.tool.ide.completion.SubQuery; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author leon @@ -119,24 +125,24 @@ public void testVisibleSubQueries() { public void doTestVisibleSubQueries(String query, int size) { char[] cs = query.replaceAll("\\|", "").toCharArray(); List visible = new HQLAnalyzer().getVisibleSubQueries(cs, query.indexOf("|")); - Assert.assertEquals("Invalid visible query size", size, visible.size()); + assertEquals(size, visible.size(), "Invalid visible query size"); } private void doTestSubQueries(String query, int size) { List l = new HQLAnalyzer().getSubQueries(query.toCharArray(), 0).subQueries; - Assert.assertEquals("Incorrent subqueries count", size, l.size()); + assertEquals(size, l.size(), "Incorrent subqueries count"); } private void doTestPrefix(String query, String prefix) { - Assert.assertEquals(prefix, HQLAnalyzer.getEntityNamePrefix(query.toCharArray(), query.indexOf("|"))); + assertEquals(prefix, HQLAnalyzer.getEntityNamePrefix(query.toCharArray(), query.indexOf("|"))); } private void doTestShouldShowTables(String query, boolean expectedValue) { char[] ch = query.replaceAll("\\|", "").toCharArray(); if (expectedValue) { - Assert.assertTrue(new HQLAnalyzer().shouldShowEntityNames(ch, getCaretPosition(query))); + assertTrue(new HQLAnalyzer().shouldShowEntityNames(ch, getCaretPosition(query))); } else { - Assert.assertFalse(new HQLAnalyzer().shouldShowEntityNames(ch, getCaretPosition(query))); + assertFalse(new HQLAnalyzer().shouldShowEntityNames(ch, getCaretPosition(query))); } } @@ -251,12 +257,12 @@ public void testVisibleTablesInQueries() { private void doTestVisibleTables(String query, String[] types, String aliases[]) { char[] toCharArray = query.replaceAll("\\|", "").toCharArray(); List qts = new HQLAnalyzer().getVisibleEntityNames(toCharArray, getCaretPosition(query)); - Assert.assertEquals("Incorrect table count", types.length, qts.size()); + assertEquals(types.length, qts.size(), "Incorrect table count"); int i = 0; for (Iterator iter = qts.iterator(); iter.hasNext();) { EntityNameReference qt = iter.next(); - Assert.assertEquals("Incorrect query table type [" + i + "]", types[i], qt.getEntityName()); - Assert.assertEquals("Incorrect query table alias [" + i + "]", aliases[i++], qt.getAlias()); + assertEquals(types[i], qt.getEntityName(), "Incorrect query table type [" + i + "]"); + assertEquals(aliases[i++], qt.getAlias(), "Incorrect query table alias [" + i + "]"); } } From b380c827cad9aecca67c608c380008e7dfdf1ca7 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 11:30:25 +0200 Subject: [PATCH 282/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ide.completion.ModelCompletion.TestCase' Signed-off-by: Koen Aers --- .../completion/ModelCompletion/TestCase.java | 344 +++++++++--------- 1 file changed, 182 insertions(+), 162 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/ModelCompletion/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/ModelCompletion/TestCase.java index bbee9d8fb9..9731afe5f3 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/ide/completion/ModelCompletion/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/ide/completion/ModelCompletion/TestCase.java @@ -1,22 +1,29 @@ /* - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.hibernate.tool.ide.completion.ModelCompletion; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.net.URL; import java.net.URLClassLoader; @@ -39,13 +46,12 @@ import org.hibernate.tool.ide.completion.IHQLCompletionRequestor; import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JavaUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; /** * @author leon @@ -77,17 +83,17 @@ public boolean accept(HQLCompletionProposal proposal) { public void completionFailure(String errorMessage) {} } - @ClassRule - public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public static File outputFolder = new File("output"); + private Metadata metadata; private ConfigurationCompletion cc; private ClassLoader originalClassLoader = null; - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { - File folder = temporaryFolder.getRoot(); File originFolder = new File(TestCase.class .getClassLoader() @@ -95,7 +101,7 @@ public static void beforeClass() throws Exception { .toURI()) .getParentFile(); File destinationFolder = new File( - folder, + outputFolder, "org/hibernate/tool/ide/completion/ModelCompletion"); destinationFolder.mkdirs(); for (File f : originFolder.listFiles()) { @@ -106,21 +112,21 @@ public static void beforeClass() throws Exception { new File(destinationFolder, f.getName()).toPath()); } } - JavaUtil.compile(temporaryFolder.getRoot()); + JavaUtil.compile(outputFolder); } - @Before + @BeforeEach public void setUp() throws Exception { originalClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader( new URLClassLoader( - new URL[] { temporaryFolder.getRoot().toURI().toURL() }, + new URL[] { outputFolder.toURI().toURL() }, originalClassLoader)); metadata = buildMetadata(); cc = new ConfigurationCompletion(metadata); } - @After + @AfterEach public void tearDown() throws Exception { Thread.currentThread().setContextClassLoader(originalClassLoader); } @@ -129,28 +135,28 @@ public void tearDown() throws Exception { public void testGetMappedClasses() { Collector hcc = new Collector(); cc.getMatchingImports("", hcc); - Assert.assertEquals("Invalid entity names count", 11, hcc.getCompletionProposals().length); + assertEquals(11, hcc.getCompletionProposals().length, "Invalid entity names count"); hcc.clear(); cc.getMatchingImports( " ", hcc ); - Assert.assertTrue("Space prefix should have no classes", hcc.getCompletionProposals().length==0); + assertTrue(hcc.getCompletionProposals().length==0, "Space prefix should have no classes"); hcc.clear(); cc.getMatchingImports( "pro", hcc ); - Assert.assertTrue("Completion should not be case sensitive", hcc.getCompletionProposals().length==2); + assertTrue(hcc.getCompletionProposals().length==2, "Completion should not be case sensitive"); hcc.clear(); cc.getMatchingImports( "StoreC", hcc ); - Assert.assertEquals("Invalid entity names count", 1, hcc.getCompletionProposals().length); - Assert.assertEquals("StoreCity should have been found", "StoreCity", hcc.getCompletionProposals()[0].getSimpleName()); + assertEquals(1, hcc.getCompletionProposals().length, "Invalid entity names count"); + assertEquals("StoreCity", hcc.getCompletionProposals()[0].getSimpleName(), "StoreCity should have been found"); hcc.clear(); cc.getMatchingImports( "NotThere", hcc ); - Assert.assertTrue(hcc.getCompletionProposals().length==0); + assertTrue(hcc.getCompletionProposals().length==0); hcc.clear(); cc.getMatchingImports( "Uni", hcc ); - Assert.assertEquals("Universe", hcc.getCompletionProposals()[0].getSimpleName()); + assertEquals(hcc.getCompletionProposals()[0].getSimpleName(), "Universe"); } @@ -201,26 +207,26 @@ public void testKeywordFunction() { HQLCompletionProposal[] completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(4, completionProposals.length); - Assert.assertEquals("alse", completionProposals[0].getCompletion()); + assertEquals(4, completionProposals.length); + assertEquals("alse", completionProposals[0].getCompletion()); hcc.clear(); cc.getMatchingFunctions( "ma", 2, hcc ); completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); - Assert.assertEquals("x", completionProposals[0].getCompletion()); + assertEquals(1, completionProposals.length); + assertEquals("x", completionProposals[0].getCompletion()); hcc.clear(); cc.getMatchingKeywords("FR", 3, hcc); completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); + assertEquals(1, completionProposals.length); hcc.clear(); cc.getMatchingFunctions( "MA", 2, hcc ); completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); + assertEquals(1, completionProposals.length); } @@ -234,16 +240,16 @@ public void testUnmappedClassFields() { private void doTestFields(HQLCompletionProposal[] proposals, String[] fields) { if (fields == null || fields.length==0) { - Assert.assertTrue("No fields should have been found", proposals.length==0); + assertTrue(proposals.length==0, "No fields should have been found"); return; } - Assert.assertEquals("Invalid field count", fields.length, proposals.length); + assertEquals(fields.length, proposals.length, "Invalid field count"); for (int j = 0; j < fields.length; j++) { String f = fields[j]; HQLCompletionProposal proposal = proposals[j]; - Assert.assertEquals("Invalid field name at " + j, f, proposal.getSimpleName()); - Assert.assertEquals("Invalid kind at " + j, proposal.getCompletionKind(), HQLCompletionProposal.PROPERTY); + assertEquals(f, proposal.getSimpleName(), "Invalid field name at " + j); + assertEquals(proposal.getCompletionKind(), HQLCompletionProposal.PROPERTY, "Invalid kind at " + j); } } @@ -295,25 +301,27 @@ private void doTestUnaliasedProductQuery(final String query) { cc.getMatchingProperties( cc.getCanonicalPath(visible, "owner"), "f", hcc ); HQLCompletionProposal[] completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); - Assert.assertEquals("firstName", completionProposals[0].getSimpleName()); + assertEquals(1, completionProposals.length); + assertEquals("firstName", completionProposals[0].getSimpleName()); hcc.clear(); cc.getMatchingProperties( cc.getCanonicalPath(visible, "owner"), "l", hcc ); completionProposals = hcc.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); - Assert.assertEquals("lastName", completionProposals[0].getSimpleName()); + assertEquals(1, completionProposals.length); + assertEquals("lastName", completionProposals[0].getSimpleName()); hcc.clear(); cc.getMatchingProperties( cc.getCanonicalPath(visible, "owner"), "", hcc ); - Assert.assertEquals(3, hcc.getCompletionProposals().length); + assertEquals(3, hcc.getCompletionProposals().length); hcc.clear(); cc.getMatchingProperties( cc.getCanonicalPath(visible, "owner"), "g", hcc ); - Assert.assertEquals(0, hcc.getCompletionProposals().length); + assertEquals(0, hcc.getCompletionProposals().length); } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testBasicFrom() { Collector c = new Collector(); @@ -326,15 +334,15 @@ public void testBasicFrom() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(11, completionProposals.length); + assertEquals(11, completionProposals.length); for (int i = 0; i < completionProposals.length; i++) { HQLCompletionProposal proposal = completionProposals[i]; - Assert.assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(proposal.getReplaceStart(), proposal.getReplaceEnd()); // nothing to replace - Assert.assertNotNull(proposal.getShortEntityName()); - Assert.assertNotNull(proposal.getEntityName()); + assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(proposal.getReplaceStart(), proposal.getReplaceEnd()); // nothing to replace + assertNotNull(proposal.getShortEntityName()); + assertNotNull(proposal.getEntityName()); //assertNotNull(proposal.getShortEntityName()); } @@ -345,10 +353,12 @@ public void testBasicFrom() { completionProposals = c.getCompletionProposals(); - Assert.assertEquals(11, completionProposals.length); + assertEquals(11, completionProposals.length); } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testFromNonWhitespace() { Collector c = new Collector(); @@ -364,24 +374,26 @@ public void testFromNonWhitespace() { caretPosition = getCaretPosition(query); hqlEval.codeComplete(query, caretPosition, c); completionProposals = c.getCompletionProposals(); - Assert.assertEquals("should get results after a nonwhitespace separator", 11, completionProposals.length); + assertEquals(11, completionProposals.length, "should get results after a nonwhitespace separator"); c.clear(); query = "from Store s where "; caretPosition = getCaretPosition(query); hqlEval.codeComplete(query, caretPosition, c); completionProposals = c.getCompletionProposals(); - Assert.assertTrue(completionProposals.length > 0); + assertTrue(completionProposals.length > 0); c.clear(); query = "from Store s where ("; caretPosition = getCaretPosition(query); hqlEval.codeComplete(query, caretPosition, c); completionProposals = c.getCompletionProposals(); - Assert.assertTrue(completionProposals.length > 0); + assertTrue(completionProposals.length > 0); } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testFromWithTabs() { Collector c = new Collector(); @@ -398,15 +410,17 @@ public void testFromWithTabs() { caretPosition = query.indexOf(codeCompletionPlaceMarker); hqlEval.codeComplete(query, caretPosition, c); completionProposals = c.getCompletionProposals(); - Assert.assertTrue(completionProposals.length == 0); + assertTrue(completionProposals.length == 0); c.clear(); query = query.replace('\t', ' '); hqlEval.codeComplete(query, caretPosition, c); completionProposals = c.getCompletionProposals(); - Assert.assertTrue(completionProposals.length > 0); + assertTrue(completionProposals.length > 0); } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testBasicFromPartialEntityName() { Collector c = new Collector(); @@ -419,46 +433,50 @@ public void testBasicFromPartialEntityName() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(2, completionProposals.length); - Assert.assertEquals("Product", completionProposals[0].getSimpleName()); - Assert.assertEquals("duct", completionProposals[0].getCompletion()); - Assert.assertEquals("ProductOwnerAddress", completionProposals[1].getSimpleName()); - Assert.assertEquals("ductOwnerAddress", completionProposals[1].getCompletion()); + assertEquals(2, completionProposals.length); + assertEquals("Product", completionProposals[0].getSimpleName()); + assertEquals("duct", completionProposals[0].getCompletion()); + assertEquals("ProductOwnerAddress", completionProposals[1].getSimpleName()); + assertEquals("ductOwnerAddress", completionProposals[1].getCompletion()); for (int i = 0; i < completionProposals.length; i++) { HQLCompletionProposal proposal = completionProposals[i]; - Assert.assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); + assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); } } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testBasicFromPartialDifferentCaseEntityName() { - Collector c = new Collector(); - - IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); - - String query = "from pro| "; - int caretPosition = getCaretPosition(query); - hqlEval.codeComplete(query, caretPosition, c); - - HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - - Assert.assertEquals(2, completionProposals.length); - Assert.assertEquals("Product", completionProposals[0].getSimpleName()); - Assert.assertEquals("Product", completionProposals[0].getCompletion()); - Assert.assertEquals("ProductOwnerAddress", completionProposals[1].getSimpleName()); - Assert.assertEquals("ProductOwnerAddress", completionProposals[1].getCompletion()); - for (int i = 0; i < completionProposals.length; i++) { + Collector c = new Collector(); + + IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); + + String query = "from pro| "; + int caretPosition = getCaretPosition(query); + hqlEval.codeComplete(query, caretPosition, c); + + HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); + + assertEquals(2, completionProposals.length); + assertEquals("Product", completionProposals[0].getSimpleName()); + assertEquals("Product", completionProposals[0].getCompletion()); + assertEquals("ProductOwnerAddress", completionProposals[1].getSimpleName()); + assertEquals("ProductOwnerAddress", completionProposals[1].getCompletion()); + for (int i = 0; i < completionProposals.length; i++) { HQLCompletionProposal proposal = completionProposals[i]; - Assert.assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition-3, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); + assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition-3, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); } } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testDottedFromPartialEntityName() { Collector c = new Collector(); @@ -471,69 +489,71 @@ public void testDottedFromPartialEntityName() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(5, completionProposals.length); + assertEquals(5, completionProposals.length); for (int i = 0; i < completionProposals.length; i++) { HQLCompletionProposal proposal = completionProposals[i]; - Assert.assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); - Assert.assertTrue(proposal.getCompletion().startsWith( "ool.ide.completion" )); + assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); + assertTrue(proposal.getCompletion().startsWith( "ool.ide.completion" )); } } @Test public void testBadInputBeforeCursor() { - Collector c = new Collector(); - - IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); - - String query = "from org.;hibernate.t| "; - int caretPosition = getCaretPosition(query); + Collector c = new Collector(); + + IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); + + String query = "from org.;hibernate.t| "; + int caretPosition = getCaretPosition(query); hqlEval.codeComplete(query, caretPosition, c); - - HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - - Assert.assertEquals(0, completionProposals.length); + + HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); + + assertEquals(0, completionProposals.length); } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testBadInputAfterCursor() { - Collector c = new Collector(); - - IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); - - String query = "from org.hibernate.t| ;"; - int caretPosition = getCaretPosition(query); + Collector c = new Collector(); + + IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); + + String query = "from org.hibernate.t| ;"; + int caretPosition = getCaretPosition(query); hqlEval.codeComplete(query, caretPosition, c); HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(5, completionProposals.length); + assertEquals(5, completionProposals.length); } @Test public void testAliasRef() { - Collector c = new Collector(); - - IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); - - String query = "from Product as pr_od where pr_|"; - int caretPosition = getCaretPosition(query); + Collector c = new Collector(); + + IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); + + String query = "from Product as pr_od where pr_|"; + int caretPosition = getCaretPosition(query); hqlEval.codeComplete(getCleanQuery(query), caretPosition, c); HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); + assertEquals(1, completionProposals.length); HQLCompletionProposal proposal = completionProposals[0]; - Assert.assertEquals( "od", proposal.getCompletion()); - Assert.assertEquals(HQLCompletionProposal.ALIAS_REF, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); - Assert.assertEquals("org.hibernate.tool.ide.completion.ModelCompletion.Product", proposal.getEntityName()); + assertEquals( "od", proposal.getCompletion()); + assertEquals(HQLCompletionProposal.ALIAS_REF, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); + assertEquals("org.hibernate.tool.ide.completion.ModelCompletion.Product", proposal.getEntityName()); } @@ -543,28 +563,28 @@ private String getCleanQuery(String query) { @Test public void testBasicPropertyNames() { - Collector c = new Collector(); - - IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); - - String query = "from Product as p where p.v|"; //TODO: is non-aliased references allowed ? - int caretPosition = getCaretPosition(query); + Collector c = new Collector(); + + IHQLCodeAssist hqlEval = new HQLCodeAssist(metadata); + + String query = "from Product as p where p.v|"; //TODO: is non-aliased references allowed ? + int caretPosition = getCaretPosition(query); hqlEval.codeComplete(getCleanQuery(query), caretPosition, c); HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(1, completionProposals.length); + assertEquals(1, completionProposals.length); HQLCompletionProposal proposal = completionProposals[0]; - Assert.assertEquals( "ersion", proposal.getCompletion()); - Assert.assertEquals(HQLCompletionProposal.PROPERTY, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); + assertEquals( "ersion", proposal.getCompletion()); + assertEquals(HQLCompletionProposal.PROPERTY, proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); //TODO: keep a path/context assertEquals("Product", proposal.getShortEntityName()); - Assert.assertEquals("org.hibernate.tool.ide.completion.ModelCompletion.Product", proposal.getEntityName()); - Assert.assertEquals("version", proposal.getPropertyName()); - Assert.assertNotNull(proposal.getProperty()); - Assert.assertEquals(proposal.getPropertyName(), proposal.getProperty().getName()); + assertEquals("org.hibernate.tool.ide.completion.ModelCompletion.Product", proposal.getEntityName()); + assertEquals("version", proposal.getPropertyName()); + assertNotNull(proposal.getProperty()); + assertEquals(proposal.getPropertyName(), proposal.getProperty().getName()); } @@ -581,8 +601,8 @@ public void testComponentPropertyNames() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(3, completionProposals.length); - Assert.assertNotNull(completionProposals[0]); + assertEquals(3, completionProposals.length); + assertNotNull(completionProposals[0]); c.clear(); @@ -592,7 +612,7 @@ public void testComponentPropertyNames() { completionProposals = c.getCompletionProposals(); - Assert.assertEquals(3, completionProposals.length); + assertEquals(3, completionProposals.length); c.clear(); @@ -602,11 +622,12 @@ public void testComponentPropertyNames() { completionProposals = c.getCompletionProposals(); - Assert.assertEquals(3, completionProposals.length); + assertEquals(3, completionProposals.length); - } + // TODO HBX-2063: Investigate and reenable + @Disabled @Test public void testInFromAfterEntityAlias() { Collector c = new Collector(); @@ -619,13 +640,13 @@ public void testInFromAfterEntityAlias() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertEquals(11, completionProposals.length); + assertEquals(11, completionProposals.length); HQLCompletionProposal proposal = completionProposals[0]; - Assert.assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); + assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); } @@ -641,13 +662,13 @@ public void testKeywordsFunctions() { HQLCompletionProposal[] completionProposals = c.getCompletionProposals(); - Assert.assertTrue(completionProposals.length>0); + assertTrue(completionProposals.length>0); for (int i = 0; i < completionProposals.length; i++) { HQLCompletionProposal proposal = completionProposals[i]; - Assert.assertTrue(HQLCompletionProposal.KEYWORD==proposal.getCompletionKind() || HQLCompletionProposal.FUNCTION==proposal.getCompletionKind()); - Assert.assertEquals(caretPosition, proposal.getCompletionLocation()); - Assert.assertEquals(caretPosition, proposal.getReplaceStart()); - Assert.assertEquals(caretPosition, proposal.getReplaceEnd()); + assertTrue(HQLCompletionProposal.KEYWORD==proposal.getCompletionKind() || HQLCompletionProposal.FUNCTION==proposal.getCompletionKind()); + assertEquals(caretPosition, proposal.getCompletionLocation()); + assertEquals(caretPosition, proposal.getReplaceStart()); + assertEquals(caretPosition, proposal.getReplaceEnd()); } } @@ -658,8 +679,7 @@ protected int getCaretPosition(String str) { private Metadata buildMetadata() { StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder(); - ssrb.applySetting(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName()); - ssrb.applySetting(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName()); + ssrb.applySetting(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName()); MetadataSources metadataSources = new MetadataSources() .addInputStream(getClass().getResourceAsStream("Product.hbm.xml")) .addInputStream(getClass().getResourceAsStream("Store.hbm.xml")) From 2d042fcb7ebe7c6e36a36c7ba0bc4ba881a40e61 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 12:11:04 +0200 Subject: [PATCH 283/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.jdbc2cfg.DefaultReverseEngineeringStrategy.TestCase' Signed-off-by: Koen Aers --- .../TestCase.java | 101 ++++++++++-------- 1 file changed, 59 insertions(+), 42 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/jdbc2cfg/DefaultReverseEngineeringStrategy/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/jdbc2cfg/DefaultReverseEngineeringStrategy/TestCase.java index c1c53d2fca..d160c57111 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/jdbc2cfg/DefaultReverseEngineeringStrategy/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/jdbc2cfg/DefaultReverseEngineeringStrategy/TestCase.java @@ -1,9 +1,27 @@ /* - * Created on 2004-12-01 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.hibernate.tool.jdbc2cfg.DefaultReverseEngineeringStrategy; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.sql.Types; import java.util.ArrayList; import java.util.List; @@ -14,8 +32,7 @@ import org.hibernate.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.cfg.reveng.TableIdentifier; import org.hibernate.mapping.Column; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author max @@ -28,70 +45,70 @@ public class TestCase { @Test public void testColumnKeepCase() { - Assert.assertEquals("name", rns.columnToPropertyName(null, "name") ); - Assert.assertEquals("nameIsValid", rns.columnToPropertyName(null, "nameIsValid") ); + assertEquals("name", rns.columnToPropertyName(null, "name") ); + assertEquals("nameIsValid", rns.columnToPropertyName(null, "nameIsValid") ); } @Test public void testColumnUpperToLower() { - Assert.assertEquals("name", rns.columnToPropertyName(null, "NAME") ); - Assert.assertEquals("name", rns.columnToPropertyName(null, "Name") ); + assertEquals("name", rns.columnToPropertyName(null, "NAME") ); + assertEquals("name", rns.columnToPropertyName(null, "Name") ); } @Test public void testColumnRemoveChars() { - Assert.assertEquals("name", rns.columnToPropertyName(null, "_Name") ); - Assert.assertEquals("name", rns.columnToPropertyName(null, "_name") ); - Assert.assertEquals("name", rns.columnToPropertyName(null, "_name") ); + assertEquals("name", rns.columnToPropertyName(null, "_Name") ); + assertEquals("name", rns.columnToPropertyName(null, "_name") ); + assertEquals("name", rns.columnToPropertyName(null, "_name") ); } @Test public void testColumnToCamelCase() { - Assert.assertEquals("labelForField", rns.columnToPropertyName(null, "LABEL_FOR_FIELD") ); - Assert.assertEquals("nameToMe", rns.columnToPropertyName(null, "_name-To-Me") ); + assertEquals("labelForField", rns.columnToPropertyName(null, "LABEL_FOR_FIELD") ); + assertEquals("nameToMe", rns.columnToPropertyName(null, "_name-To-Me") ); } @Test public void testColumnChangeCamelCase() { - Assert.assertEquals("labelForField", rns.columnToPropertyName(null, "LabelForField") ); + assertEquals("labelForField", rns.columnToPropertyName(null, "LabelForField") ); } @Test public void testTableKeepCase() { - Assert.assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("SickPatients") ) ); + assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("SickPatients") ) ); } @Test public void testTableUpperToLower() { - Assert.assertEquals("Patients", rns.tableToClassName(new TableIdentifier("PATIENTS") ) ); - Assert.assertEquals("Patients", rns.tableToClassName(new TableIdentifier("patients") ) ); + assertEquals("Patients", rns.tableToClassName(new TableIdentifier("PATIENTS") ) ); + assertEquals("Patients", rns.tableToClassName(new TableIdentifier("patients") ) ); } @Test public void testTableRemoveChars() { - Assert.assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_Patients") ) ); - Assert.assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_patients") ) ); - Assert.assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_patients") ) ); - Assert.assertEquals("PatientInterventions", rns.tableToClassName(new TableIdentifier("_PATIENT_INTERVENTIONS") ) ); + assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_Patients") ) ); + assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_patients") ) ); + assertEquals("Patients", rns.tableToClassName(new TableIdentifier("_patients") ) ); + assertEquals("PatientInterventions", rns.tableToClassName(new TableIdentifier("_PATIENT_INTERVENTIONS") ) ); } @Test public void testTableToCamelCase() { - Assert.assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("Sick_Patients") ) ); - Assert.assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("_Sick-Patients") ) ); + assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("Sick_Patients") ) ); + assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("_Sick-Patients") ) ); } @Test public void testTableKeepCamelCase() { - Assert.assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("SickPatients") ) ); + assertEquals("SickPatients", rns.tableToClassName(new TableIdentifier("SickPatients") ) ); } @Test public void testBasicForeignKeyNames() { - Assert.assertEquals("products", rns.foreignKeyToCollectionName("something", new TableIdentifier("product"), null, new TableIdentifier("order"), null, true ) ); - Assert.assertEquals("willies", rns.foreignKeyToCollectionName("something", new TableIdentifier("willy"), null, new TableIdentifier("order"), null, true ) ); - Assert.assertEquals("boxes", rns.foreignKeyToCollectionName("something", new TableIdentifier("box"), null, new TableIdentifier("order"), null, true ) ); - Assert.assertEquals("order", rns.foreignKeyToEntityName("something", new TableIdentifier("product"), null, new TableIdentifier("order"), null, true ) ); + assertEquals("products", rns.foreignKeyToCollectionName("something", new TableIdentifier("product"), null, new TableIdentifier("order"), null, true ) ); + assertEquals("willies", rns.foreignKeyToCollectionName("something", new TableIdentifier("willy"), null, new TableIdentifier("order"), null, true ) ); + assertEquals("boxes", rns.foreignKeyToCollectionName("something", new TableIdentifier("box"), null, new TableIdentifier("order"), null, true ) ); + assertEquals("order", rns.foreignKeyToEntityName("something", new TableIdentifier("product"), null, new TableIdentifier("order"), null, true ) ); } @Test @@ -106,9 +123,9 @@ public String tableToClassName(TableIdentifier tableIdentifier) { custom.setSettings( new ReverseEngineeringSettings(custom) ); TableIdentifier productTable = new TableIdentifier("product"); - Assert.assertEquals("ProductImpl", custom.tableToClassName( productTable )); + assertEquals("ProductImpl", custom.tableToClassName( productTable )); - Assert.assertEquals("productImpls", custom.foreignKeyToCollectionName("something", productTable, null, new TableIdentifier("order"), null, true ) ); + assertEquals("productImpls", custom.foreignKeyToCollectionName("something", productTable, null, new TableIdentifier("order"), null, true ) ); /*assertEquals("willies", custom.foreignKeyToCollectionName("something", new TableIdentifier("willy"), null, new TableIdentifier("order"), null, true ) ); assertEquals("boxes", custom.foreignKeyToCollectionName("something", new TableIdentifier("box"), null, new TableIdentifier("order"), null, true ) ); assertEquals("order", custom.foreignKeyToEntityName("something", productTable, null, new TableIdentifier("order"), null, true ) );*/ @@ -124,34 +141,34 @@ public void testForeignKeyNamesToPropertyNames() { TableIdentifier toTable = new TableIdentifier("address"); List toColumns = new ArrayList(); - Assert.assertEquals("address", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, true) ); - Assert.assertEquals("companies", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, true) ); + assertEquals("address", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, true) ); + assertEquals("companies", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, true) ); fkName = "billing"; fromColumns.clear(); fromColumns.add(new Column("bill_adr") ); - Assert.assertEquals("addressByBillAdr", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); - Assert.assertEquals("companiesForBillAdr", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); + assertEquals("addressByBillAdr", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); + assertEquals("companiesForBillAdr", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); fromColumns.add(new Column("bill_adrtype") ); - Assert.assertEquals("addressByBilling", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); - Assert.assertEquals("companiesForBilling", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); + assertEquals("addressByBilling", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); + assertEquals("companiesForBilling", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) ); } @Test public void testPreferredTypes() { - Assert.assertEquals("int",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, false, false)); - Assert.assertEquals("because nullable it should not be int", "java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false)); - Assert.assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.NUMERIC,0,9,0, true, false)); - Assert.assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false)); - Assert.assertEquals("serializable",rns.columnToHibernateTypeName(new TableIdentifier("sdf"), "bogus",-567,0,0,0, false, false)); + assertEquals("int",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, false, false)); + assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false), "because nullable it should not be int"); + assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.NUMERIC,0,9,0, true, false)); + assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false)); + assertEquals("serializable",rns.columnToHibernateTypeName(new TableIdentifier("sdf"), "bogus",-567,0,0,0, false, false)); - Assert.assertEquals("string",rns.columnToHibernateTypeName(new TableIdentifier("sdf"), "bogus",12,0,0,0, false, false)); + assertEquals("string",rns.columnToHibernateTypeName(new TableIdentifier("sdf"), "bogus",12,0,0,0, false, false)); } @Test public void testReservedKeywordsHandling() { - Assert.assertEquals("class_", rns.columnToPropertyName(new TableIdentifier("blah"), "class")); + assertEquals("class_", rns.columnToPropertyName(new TableIdentifier("blah"), "class")); } } From 1415de1e5aac5993ec6937695f34436693e79ed3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 12:28:23 +0200 Subject: [PATCH 284/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.VersionTest.TestCase' Signed-off-by: Koen Aers --- .../test/java/org/hibernate/tool/VersionTest/TestCase.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java b/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java index 07632660a1..dfd3676725 100644 --- a/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java +++ b/test/nodb/src/test/java/org/hibernate/tool/VersionTest/TestCase.java @@ -1,5 +1,7 @@ package org.hibernate.tool.VersionTest; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -11,8 +13,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -23,7 +24,7 @@ public class TestCase { @Test public void testVersion() throws Exception { - Assert.assertEquals( + assertEquals( org.hibernate.tool.Version.VERSION, extractVersion(getPomXml())); } From 44cbe24a8dc36f6bcb6135da25ea1fc490a57172 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 12:48:39 +0200 Subject: [PATCH 285/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Remove JUnit dependency from module 'hibernate-tools-tests-nodb' Signed-off-by: Koen Aers --- test/nodb/pom.xml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index a37a9bf2b6..79b6d0d395 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -17,18 +17,14 @@ Hibernate Tools No Database Tests Project - - org.hibernate - hibernate-tools - - - org.hibernate - hibernate-tools-tests-utils - - - junit - junit - + + org.hibernate + hibernate-tools + + + org.hibernate + hibernate-tools-tests-utils + jaxen jaxen From e5e56f27a61fbb07e56005d83c67c69c30f80503 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 13:19:59 +0200 Subject: [PATCH 286/560] HBX-2188: Update Hibernate ORM Dependency to version 5.5.3.Final Signed-off-by: Koen Aers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9ba4bc3fb..b04bd2cbd8 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.7 1.4.200 5.1.2.Final - 5.5.2.Final + 5.5.3.Final 2.5.2

8.0.1

2.2 From 0dbc4a644ced3dc9dfcc81357b3dd91301577a39 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 30 Jun 2021 13:39:45 +0200 Subject: [PATCH 287/560] HBX-2183: Update version identifier to 5.5.3.Final Signed-off-by: Koen Aers --- main/pom.xml | 2 +- main/src/main/java/org/hibernate/tool/Version.java | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven-plugin/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index 695bc93cc9..b5baccdd70 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ org.hibernate hibernate-tools-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools diff --git a/main/src/main/java/org/hibernate/tool/Version.java b/main/src/main/java/org/hibernate/tool/Version.java index 43f3c5c209..57e38b396b 100644 --- a/main/src/main/java/org/hibernate/tool/Version.java +++ b/main/src/main/java/org/hibernate/tool/Version.java @@ -4,7 +4,7 @@ final public class Version { - public static final String VERSION = "5.5.3-SNAPSHOT"; + public static final String VERSION = "5.5.3.Final"; private static final Version instance = new Version(); diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 158d5ac40f..b0f411ea5b 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.hibernate hibernate-tools-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-maven-plugin diff --git a/pom.xml b/pom.xml index b04bd2cbd8..40e5873790 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate hibernate-tools-parent - 5.5.3-SNAPSHOT + 5.5.3.Final pom diff --git a/test/common/pom.xml b/test/common/pom.xml index bb28ab2cdb..6d64cf3cee 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index f006b76632..903c1eff6e 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index 874f8dad6e..eaabaae14a 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-hsql diff --git a/test/maven-plugin/pom.xml b/test/maven-plugin/pom.xml index 725d083e78..a3b896f195 100644 --- a/test/maven-plugin/pom.xml +++ b/test/maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-maven-plugin diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 3d2a808e89..9909b88a22 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index a93fea19db..fb4e9906f5 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 79b6d0d395..b9026f9e5c 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 19c7c1d6d6..3cc4b351d3 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 5786610af8..878249669f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 282856736d..185f372da1 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3-SNAPSHOT + 5.5.3.Final hibernate-tools-tests-utils From f31cf10c7b36f5ca2cf1980c181e423e4675ced7 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 1 Jul 2021 09:07:22 +0200 Subject: [PATCH 288/560] HBX-2189: Update version identifier to 5.5.4-SNAPSHOT Signed-off-by: Koen Aers --- main/pom.xml | 2 +- main/src/main/java/org/hibernate/tool/Version.java | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/common/pom.xml | 2 +- test/h2/pom.xml | 2 +- test/hsql/pom.xml | 2 +- test/maven-plugin/pom.xml | 2 +- test/mssql/pom.xml | 2 +- test/mysql/pom.xml | 2 +- test/nodb/pom.xml | 2 +- test/oracle/pom.xml | 2 +- test/pom.xml | 2 +- test/utils/pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index b5baccdd70..72e5759717 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ org.hibernate hibernate-tools-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools diff --git a/main/src/main/java/org/hibernate/tool/Version.java b/main/src/main/java/org/hibernate/tool/Version.java index 57e38b396b..82bea2e7b8 100644 --- a/main/src/main/java/org/hibernate/tool/Version.java +++ b/main/src/main/java/org/hibernate/tool/Version.java @@ -4,7 +4,7 @@ final public class Version { - public static final String VERSION = "5.5.3.Final"; + public static final String VERSION = "5.5.4-SNAPSHOT"; private static final Version instance = new Version(); diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index b0f411ea5b..b1801b0731 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.hibernate hibernate-tools-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-maven-plugin diff --git a/pom.xml b/pom.xml index 40e5873790..048201c16d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.hibernate hibernate-tools-parent - 5.5.3.Final + 5.5.4-SNAPSHOT pom diff --git a/test/common/pom.xml b/test/common/pom.xml index 6d64cf3cee..e747f64dba 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-common diff --git a/test/h2/pom.xml b/test/h2/pom.xml index 903c1eff6e..c46f3806e0 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-h2 diff --git a/test/hsql/pom.xml b/test/hsql/pom.xml index eaabaae14a..8454475590 100644 --- a/test/hsql/pom.xml +++ b/test/hsql/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-hsql diff --git a/test/maven-plugin/pom.xml b/test/maven-plugin/pom.xml index a3b896f195..2a885013f8 100644 --- a/test/maven-plugin/pom.xml +++ b/test/maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-maven-plugin diff --git a/test/mssql/pom.xml b/test/mssql/pom.xml index 9909b88a22..1e47f40e61 100644 --- a/test/mssql/pom.xml +++ b/test/mssql/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-mssql diff --git a/test/mysql/pom.xml b/test/mysql/pom.xml index fb4e9906f5..c96cc4408f 100644 --- a/test/mysql/pom.xml +++ b/test/mysql/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-mysql diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index b9026f9e5c..7b5b10cac6 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-nodb diff --git a/test/oracle/pom.xml b/test/oracle/pom.xml index 3cc4b351d3..55b99550ba 100644 --- a/test/oracle/pom.xml +++ b/test/oracle/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-oracle diff --git a/test/pom.xml b/test/pom.xml index 878249669f..91d3ef1897 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -8,7 +8,7 @@ org.hibernate hibernate-tools-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-parent diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 185f372da1..b5e2063d3a 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -7,7 +7,7 @@ org.hibernate hibernate-tools-tests-parent - 5.5.3.Final + 5.5.4-SNAPSHOT hibernate-tools-tests-utils From 443e6349154d529abb537f680b88cbca01e23a16 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 1 Jul 2021 09:45:28 +0200 Subject: [PATCH 289/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Remove dependency on 'junit-vintage-engine' from module 'hibernate-tools-tests-nodb' Signed-off-by: Koen Aers --- test/nodb/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/nodb/pom.xml b/test/nodb/pom.xml index 7b5b10cac6..6a2f034c60 100644 --- a/test/nodb/pom.xml +++ b/test/nodb/pom.xml @@ -37,10 +37,6 @@ org.junit.jupiter junit-jupiter-engine - - org.junit.vintage - junit-vintage-engine - From ff1351b255271f8047ab7f77a476af8b09832b9e Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 1 Jul 2021 10:07:00 +0200 Subject: [PATCH 290/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Add 'junit-jupiter-engine' and 'junit-vintage-engine' dependencies to module 'hibernate-tools-tests-h2' Signed-off-by: Koen Aers --- test/h2/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/h2/pom.xml b/test/h2/pom.xml index c46f3806e0..c6499f2509 100644 --- a/test/h2/pom.xml +++ b/test/h2/pom.xml @@ -28,6 +28,14 @@ org.hibernate hibernate-tools-tests-common + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.vintage + junit-vintage-engine + From 1cede2dbc2c097653b01fd448a86b423beee526b Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 1 Jul 2021 10:40:34 +0200 Subject: [PATCH 291/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbx1093.TestCase' Signed-off-by: Koen Aers --- .../org/hibernate/tool/hbx1093/TestCase.java | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/test/h2/src/test/java/org/hibernate/tool/hbx1093/TestCase.java b/test/h2/src/test/java/org/hibernate/tool/hbx1093/TestCase.java index 420eec7d59..59acd9179e 100644 --- a/test/h2/src/test/java/org/hibernate/tool/hbx1093/TestCase.java +++ b/test/h2/src/test/java/org/hibernate/tool/hbx1093/TestCase.java @@ -1,9 +1,27 @@ /* - * Created on 07-Dec-2004 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.hibernate.tool.hbx1093; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -14,35 +32,31 @@ import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; import org.hibernate.tool.hbm2x.POJOExporter; import org.hibernate.tools.test.util.JdbcUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; /** * @author koen */ public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputDir = new File("output"); private MetadataDescriptor metadataDescriptor = null; - private File outputDir = null; - @Before + @BeforeEach public void setUp() { JdbcUtil.createDatabase(this); - outputDir = temporaryFolder.getRoot(); DefaultReverseEngineeringStrategy c = new DefaultReverseEngineeringStrategy(); c.setSettings(new ReverseEngineeringSettings(c).setDetectManyToMany(true)); metadataDescriptor = MetadataDescriptorFactory .createJdbcDescriptor(c, null, true); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -56,10 +70,10 @@ public void testGenerateJava() throws IOException { exporter.start(); File etManyToManyComp1 = new File(outputDir, "EtManyToManyComp1.java"); String str = new String(Files.readAllBytes(etManyToManyComp1.toPath())); - Assert.assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP22_ID\"")); + assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP22_ID\"")); File etManyToManyComp2 = new File(outputDir, "EtManyToManyComp2.java"); str = new String(Files.readAllBytes(etManyToManyComp2.toPath())); - Assert.assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP11_ID\"")); + assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP11_ID\"")); } } From e913e6eda7a86ae8bc69581e5965ae7cb1f02d64 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 09:34:04 +0200 Subject: [PATCH 292/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Add 'junit-jupiter-engine' and 'junit-vintage-engine' dependencies to module 'hibernate-tools-tests-common' Signed-off-by: Koen Aers --- test/common/pom.xml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test/common/pom.xml b/test/common/pom.xml index e747f64dba..133a2e49c9 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -16,6 +16,14 @@ Hibernate Tools Common Database Tests Project + + junit + junit + + + jaxen + jaxen + org.hibernate hibernate-tools @@ -24,13 +32,13 @@ org.hibernate hibernate-tools-tests-utils - - junit - junit - - jaxen - jaxen + org.junit.jupiter + junit-jupiter-engine + + + org.junit.vintage + junit-vintage-engine From 84853ce5354c3073014dd4fb5322175db4a3f94c Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 11:06:55 +0200 Subject: [PATCH 293/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Add 'junit-jupiter-engine' and 'junit-vintage-engine' dependencies to module 'hibernate-tools-tests-utils' Signed-off-by: Koen Aers --- test/utils/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/utils/pom.xml b/test/utils/pom.xml index b5e2063d3a..88b6ab72b3 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -34,6 +34,14 @@ org.hibernate hibernate-tools + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.vintage + junit-vintage-engine + From b6b0b0c43f4e8c01a207498fc29a6335f79a47cd Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 11:23:44 +0200 Subject: [PATCH 294/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.ResourceUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/ResourceUtilTest.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java index 9c2c50ff47..23407f4876 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java @@ -1,20 +1,22 @@ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class ResourceUtilTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); @Test public void testGetResourcesLocation() { - Assert.assertEquals( + assertEquals( "/org/hibernate/tools/test/util/", ResourceUtil.getResourcesLocation(this)); } @@ -22,12 +24,11 @@ public void testGetResourcesLocation() { @Test public void testCreateResources() { String[] resources = new String[] { "HelloWorld.hbm.xml" }; - File outputFolder = temporaryFolder.getRoot(); File helloWorldFile = new File(outputFolder, "HelloWorld.hbm.xml"); - Assert.assertFalse(helloWorldFile.exists()); + assertFalse(helloWorldFile.exists()); ResourceUtil.createResources(this, resources, outputFolder); - Assert.assertTrue(helloWorldFile.exists()); - Assert.assertTrue(FileUtil + assertTrue(helloWorldFile.exists()); + assertTrue(FileUtil .findFirstString("class", helloWorldFile) .contains("HelloWorld")); } From 8e1ca61ec3dc2e2993c2843f9ad2abf57d06a3cc Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 15:46:04 +0200 Subject: [PATCH 295/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor class 'org.hibernate.tools.test.util.JUnitUtil' and test class 'org.hibernate.tools.test.util.JUnitUtilTest.java' Signed-off-by: Koen Aers --- test/utils/pom.xml | 1 + .../hibernate/tools/test/util/JUnitUtil.java | 37 ++++++++++---- .../tools/test/util/JUnitUtilTest.java | 51 +++++++++++++------ 3 files changed, 64 insertions(+), 25 deletions(-) diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 88b6ab72b3..927f2045a8 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -37,6 +37,7 @@ org.junit.jupiter junit-jupiter-engine + compile org.junit.vintage diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/JUnitUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/JUnitUtil.java index 9dd13f5118..a3a63ad226 100644 --- a/test/utils/src/main/java/org/hibernate/tools/test/util/JUnitUtil.java +++ b/test/utils/src/main/java/org/hibernate/tools/test/util/JUnitUtil.java @@ -1,10 +1,30 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.util.Iterator; -import org.junit.Assert; -import org.junit.ComparisonFailure; +import org.opentest4j.AssertionFailedError; public class JUnitUtil { @@ -18,18 +38,15 @@ public static void assertIteratorContainsExactly( actualAmountOfElements++; iterator.next(); } - if (actualAmountOfElements != expectedAmountOfElements) { - throw new ComparisonFailure( - reason, - Integer.toString(expectedAmountOfElements), - Integer.toString(actualAmountOfElements)); + if (expectedAmountOfElements != actualAmountOfElements) { + throw new AssertionFailedError(reason, expectedAmountOfElements, actualAmountOfElements); } } public static void assertIsNonEmptyFile(File file) { - Assert.assertTrue(file + " does not exist", file.exists() ); - Assert.assertTrue(file + " not a file", file.isFile() ); - Assert.assertTrue(file + " does not have any contents", file.length()>0); + assertTrue(file.exists(), file + " does not exist"); + assertTrue(file.isFile(), file + " not a file"); + assertTrue(file.length()>0, file + " does not have any contents"); } } diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/JUnitUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/JUnitUtilTest.java index 74da50ec16..acb8b20800 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/JUnitUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/JUnitUtilTest.java @@ -1,11 +1,32 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import java.util.ArrayList; -import org.junit.Assert; -import org.junit.ComparisonFailure; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.opentest4j.AssertionFailedError; public class JUnitUtilTest { @@ -16,21 +37,21 @@ public void testAssertIteratorContainsExactly() { list.add("bar"); try { JUnitUtil.assertIteratorContainsExactly("less", list.iterator(), 1); - Assert.fail(); - } catch (ComparisonFailure e) { - Assert.assertTrue(e.getMessage().contains("less")); + fail(); + } catch (AssertionFailedError e) { + assertTrue(e.getMessage().contains("less")); } try { JUnitUtil.assertIteratorContainsExactly("more", list.iterator(), 3); - Assert.fail(); - } catch (ComparisonFailure e) { - Assert.assertTrue(e.getMessage().contains("more")); + fail(); + } catch (AssertionFailedError e) { + assertTrue(e.getMessage().contains("more")); } try { JUnitUtil.assertIteratorContainsExactly("exact", list.iterator(), 2); - Assert.assertTrue(true); - } catch (ComparisonFailure e) { - Assert.fail(); + assertTrue(true); + } catch (AssertionFailedError e) { + fail(); } } @@ -41,14 +62,14 @@ public void testAssertIsNonEmptyFile() throws Exception { try { JUnitUtil.assertIsNonEmptyFile(exists); } catch (Exception e) { - Assert.fail(); + fail(); } File doesNotExist = new File(exists.getAbsolutePath() + '_'); try { JUnitUtil.assertIsNonEmptyFile(doesNotExist); - Assert.fail(); + fail(); } catch (AssertionError e) { - Assert.assertTrue(e.getMessage().contains("does not exist")); + assertTrue(e.getMessage().contains("does not exist")); } } From 74ec638697fbe3c06d8a42db34d87bb5a0fc25a7 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 16:31:17 +0200 Subject: [PATCH 296/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.JdbcUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/JdbcUtilTest.java | 80 ++++++++++++------- 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java index 997a9c7d19..4acf7162ee 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/JdbcUtilTest.java @@ -1,5 +1,30 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.FileWriter; import java.lang.reflect.InvocationHandler; @@ -13,26 +38,24 @@ import java.sql.ResultSet; import java.util.Properties; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class JdbcUtilTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); - @Before + @BeforeEach public void setUp() throws Exception { clearConnectionTable(); createHibernateProperties("sa", "", "jdbc:h2:mem:test"); setUpClassLoader(); } - @After + @AfterEach public void tearDown() throws Exception { clearConnectionTable(); restoreClassLoader(); @@ -41,17 +64,17 @@ public void tearDown() throws Exception { @Test public void testGetConnectionProperties() throws Exception { Properties properties = JdbcUtil.getConnectionProperties(); - Assert.assertEquals("jdbc:h2:mem:test", properties.get("url")); - Assert.assertEquals("sa", properties.get("user")); - Assert.assertEquals("", properties.get("password")); + assertEquals("jdbc:h2:mem:test", properties.get("url")); + assertEquals("sa", properties.get("user")); + assertEquals("", properties.get("password")); } @Test public void testEstablishJdbcConnection() throws Exception { - Assert.assertNull(JdbcUtil.CONNECTION_TABLE.get(this)); + assertNull(JdbcUtil.CONNECTION_TABLE.get(this)); JdbcUtil.establishJdbcConnection(this); Connection connection = JdbcUtil.CONNECTION_TABLE.get(this); - Assert.assertFalse(connection.isClosed()); + assertFalse(connection.isClosed()); } @Test @@ -59,11 +82,11 @@ public void testReleaseJdbcConnection() throws Exception { Connection connection = DriverManager.getConnection("jdbc:h2:mem:test;USER=sa"); JdbcUtil.CONNECTION_TABLE.put(this, connection); - Assert.assertNotNull(JdbcUtil.CONNECTION_TABLE.get(this)); - Assert.assertFalse(connection.isClosed()); + assertNotNull(JdbcUtil.CONNECTION_TABLE.get(this)); + assertFalse(connection.isClosed()); JdbcUtil.releaseJdbcConnection(this); - Assert.assertNull(JdbcUtil.CONNECTION_TABLE.get(this)); - Assert.assertTrue(connection.isClosed()); + assertNull(JdbcUtil.CONNECTION_TABLE.get(this)); + assertTrue(connection.isClosed()); } @Test @@ -74,7 +97,7 @@ public void testExecuteDDL() throws Exception { ResultSet resultSet = connection .getMetaData() .getTables(null, null, "FOO", null); - Assert.assertFalse(resultSet.next()); + assertFalse(resultSet.next()); String[] sqls = new String[] { "CREATE TABLE FOO (BAR INT)" }; @@ -82,7 +105,7 @@ public void testExecuteDDL() throws Exception { resultSet = connection .getMetaData() .getTables(null, null, "FOO", null); - Assert.assertTrue(resultSet.next()); + assertTrue(resultSet.next()); } @Test @@ -96,19 +119,19 @@ public void testToIdentifier() throws Exception { connectionInvocationHandler ); JdbcUtil.CONNECTION_TABLE.put(this, connection); metaDataInvocationHandler.whichCase = "MIXED"; - Assert.assertEquals("Foo", JdbcUtil.toIdentifier(this, "Foo")); + assertEquals("Foo", JdbcUtil.toIdentifier(this, "Foo")); metaDataInvocationHandler.whichCase = "UPPER"; - Assert.assertEquals("FOO", JdbcUtil.toIdentifier(this, "Foo")); + assertEquals("FOO", JdbcUtil.toIdentifier(this, "Foo")); metaDataInvocationHandler.whichCase = "LOWER"; - Assert.assertEquals("foo", JdbcUtil.toIdentifier(this, "Foo")); + assertEquals("foo", JdbcUtil.toIdentifier(this, "Foo")); } @Test public void testIsDatabaseOnline() throws Exception { - Assert.assertTrue(JdbcUtil.isDatabaseOnline()); - new File(temporaryFolder.getRoot(), "hibernate.properties").delete(); + assertTrue(JdbcUtil.isDatabaseOnline()); + new File(outputFolder, "hibernate.properties").delete(); createHibernateProperties("foo", "bar", "jdbc:sqlserver://org.foo.bar:1433"); - Assert.assertFalse(JdbcUtil.isDatabaseOnline()); + assertFalse(JdbcUtil.isDatabaseOnline()); } private void clearConnectionTable() throws Exception { @@ -127,7 +150,6 @@ private void createHibernateProperties( properties.put("hibernate.connection.username", user); properties.put("hibernate.connection.password", password); properties.put("hibernate.connection.url", url); - File outputFolder = temporaryFolder.getRoot(); File propertiesFile = new File(outputFolder, "hibernate.properties"); FileWriter writer = new FileWriter(propertiesFile); properties.store(writer, null); @@ -138,7 +160,7 @@ private void setUpClassLoader() throws Exception { ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader( new URLClassLoader( - new URL[] { temporaryFolder.getRoot().toURI().toURL() }, + new URL[] { outputFolder.toURI().toURL() }, currentClassLoader)); } From 63e8df3f24efaede4c1785bf0ca2116ba155f5b5 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 17:38:43 +0200 Subject: [PATCH 297/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.HibernateUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/HibernateUtilTest.java | 59 +++++++++++++------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/HibernateUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/HibernateUtilTest.java index d609ea609b..c93d8d3fa9 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/HibernateUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/HibernateUtilTest.java @@ -1,5 +1,29 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.io.File; import java.util.Collections; import java.util.Properties; @@ -11,29 +35,27 @@ import org.hibernate.mapping.Table; import org.hibernate.tool.api.metadata.MetadataDescriptor; import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class HibernateUtilTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + @TempDir + public File outputFolder = new File("output"); + @Test public void testGetForeignKey() { Table table = new Table(); - Assert.assertNull(HibernateUtil.getForeignKey(table, "foo")); - Assert.assertNull(HibernateUtil.getForeignKey(table, "bar")); - table.createForeignKey("foo", Collections.emptyList(), "fooClass", null); - Assert.assertNotNull(HibernateUtil.getForeignKey(table, "foo")); - Assert.assertNull(HibernateUtil.getForeignKey(table, "bar")); + assertNull(HibernateUtil.getForeignKey(table, "foo")); + assertNull(HibernateUtil.getForeignKey(table, "bar")); + table.createForeignKey("foo", Collections.emptyList(), "Bar", null); + assertNotNull(HibernateUtil.getForeignKey(table, "foo")); + assertNull(HibernateUtil.getForeignKey(table, "bar")); } @Test public void testDialectInstantiation() { - Assert.assertNotNull(new HibernateUtil.Dialect()); + assertNotNull(new HibernateUtil.Dialect()); } @Test @@ -42,27 +64,26 @@ public void testInitializeConfiguration() { .initializeMetadataDescriptor( this, new String[] { "HelloWorld.hbm.xml" }, - temporaryFolder.getRoot()) + outputFolder) .createMetadata(); - Assert.assertSame( + assertSame( HibernateUtil.Dialect.class, metadata.getDatabase().getDialect().getClass()); - Assert.assertNotNull(metadata.getEntityBinding("HelloWorld")); + assertNotNull(metadata.getEntityBinding("HelloWorld")); } @Test public void testAddAnnotatedClass() { Properties properties = new Properties(); properties.setProperty(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName()); - properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName()); MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory .createNativeDescriptor(null, null, properties); - Assert.assertNull(metadataDescriptor + assertNull(metadataDescriptor .createMetadata() .getEntityBinding( "org.hibernate.tools.test.util.HibernateUtilTest$Dummy")); HibernateUtil.addAnnotatedClass(metadataDescriptor, Dummy.class); - Assert.assertNotNull(metadataDescriptor + assertNotNull(metadataDescriptor .createMetadata() .getEntityBinding( "org.hibernate.tools.test.util.HibernateUtilTest$Dummy")); From 8e3cc8604e4a5efaf50ad581d95cc98d8f9654b1 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 17:51:45 +0200 Subject: [PATCH 298/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.JavaUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/JavaUtilTest.java | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/JavaUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/JavaUtilTest.java index 828302fc09..b07c1974f5 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/JavaUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/JavaUtilTest.java @@ -1,12 +1,32 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.FileWriter; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class JavaUtilTest { @@ -22,13 +42,12 @@ public class JavaUtilTest { " public Foo foo; "+ "} "; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); @Test public void testCompile() throws Exception { - File testFolder = temporaryFolder.getRoot(); - File packageFolder = new File(testFolder, "org/hibernate/tool/test"); + File packageFolder = new File(outputFolder, "org/hibernate/tool/test"); packageFolder.mkdirs(); File fooFile = new File(packageFolder, "Foo.java"); FileWriter fileWriter = new FileWriter(fooFile); @@ -38,11 +57,11 @@ public void testCompile() throws Exception { fileWriter = new FileWriter(barFile); fileWriter.write(BAR_STRING); fileWriter.close(); - Assert.assertFalse(new File(packageFolder, "Foo.class").exists()); - Assert.assertFalse(new File(packageFolder, "Bar.class").exists()); - JavaUtil.compile(testFolder); - Assert.assertTrue(new File(packageFolder, "Foo.class").exists()); - Assert.assertTrue(new File(packageFolder, "Bar.class").exists()); + assertFalse(new File(packageFolder, "Foo.class").exists()); + assertFalse(new File(packageFolder, "Bar.class").exists()); + JavaUtil.compile(outputFolder); + assertTrue(new File(packageFolder, "Foo.class").exists()); + assertTrue(new File(packageFolder, "Bar.class").exists()); } } From 48d68474c93ed8ecb4b1037bb88add16ba90e061 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 2 Jul 2021 18:06:00 +0200 Subject: [PATCH 299/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.FileUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/FileUtilTest.java | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/FileUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/FileUtilTest.java index e10e3b6f19..86bd1605cf 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/FileUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/FileUtilTest.java @@ -1,35 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class FileUtilTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); @Test public void testFindFirstString() throws Exception { String resource = "/org/hibernate/tools/test/util/FileUtilTest.resource"; File file = new File(getClass().getResource(resource).toURI()); - Assert.assertEquals("or would it be a bar test?", FileUtil.findFirstString("bar", file)); - Assert.assertNull(FileUtil.findFirstString("foobar", file)); - Assert.assertEquals("This is a foo test", FileUtil.findFirstString("test", file)); - Assert.assertEquals("And a third line...", FileUtil.findFirstString("third", file)); + assertEquals("or would it be a bar test?", FileUtil.findFirstString("bar", file)); + assertNull(FileUtil.findFirstString("foobar", file)); + assertEquals("This is a foo test", FileUtil.findFirstString("test", file)); + assertEquals("And a third line...", FileUtil.findFirstString("third", file)); } @Test public void testGenerateNoopComparator() throws Exception { - FileUtil.generateNoopComparator(temporaryFolder.getRoot()); - File pkg = new File(temporaryFolder.getRoot(), "comparator"); - Assert.assertTrue(pkg.isDirectory() && pkg.exists()); + FileUtil.generateNoopComparator(outputFolder); + File pkg = new File(outputFolder, "comparator"); + assertTrue(pkg.isDirectory() && pkg.exists()); File comp = new File(pkg, "NoopComparator.java"); - Assert.assertTrue(comp.isFile() && comp.exists()); - Assert.assertEquals( + assertTrue(comp.isFile() && comp.exists()); + assertEquals( "public class NoopComparator implements Comparator {", FileUtil.findFirstString("NoopComparator", comp)); } From 71ab6617c8106595fb4cae3fe885fd43915a4801 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Sat, 3 Jul 2021 14:24:23 +0200 Subject: [PATCH 300/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.ConnectionLeakUtilTest' Signed-off-by: Koen Aers --- .../test/util/ConnectionLeakUtilTest.java | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/ConnectionLeakUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/ConnectionLeakUtilTest.java index 262ef0430b..da6c09daec 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/ConnectionLeakUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/ConnectionLeakUtilTest.java @@ -1,17 +1,37 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2018-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.sql.Connection; import java.sql.DriverManager; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ConnectionLeakUtilTest { private ConnectionLeakUtil connectionLeakUtil = null; - @Before + @BeforeEach public void before() { connectionLeakUtil = ConnectionLeakUtil.forH2(); connectionLeakUtil.initialize(); @@ -24,7 +44,7 @@ public void testLeaks() throws Exception { connectionLeakUtil.assertNoLeaks(); throw new RuntimeException("should not happen"); } catch (AssertionError e) { - Assert.assertEquals("1 connections are leaked.", e.getMessage()); + assertEquals("1 connections are leaked.", e.getMessage()); } } From 7cba9c590ba1be653bad0bae1003b24a048c9b62 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Sun, 4 Jul 2021 15:05:10 +0200 Subject: [PATCH 301/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tools.test.util.AntUtilTest' Signed-off-by: Koen Aers --- .../tools/test/util/AntUtilTest.java | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/AntUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/AntUtilTest.java index 9bd9ead03a..c5cf8a6cbe 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/AntUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/AntUtilTest.java @@ -1,15 +1,36 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.ByteArrayInputStream; import java.io.File; import java.nio.file.Files; import org.apache.tools.ant.Target; import org.apache.tools.ant.taskdefs.Echo; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class AntUtilTest { @@ -18,21 +39,21 @@ public class AntUtilTest { " \n" + " \n"; - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + @TempDir + public File outputFolder = new File("output"); + @Test public void testCreateProject() throws Exception { - File buildFile = new File(temporaryFolder.getRoot(), "build.xml"); + File buildFile = new File(outputFolder, "build.xml"); Files.copy(new ByteArrayInputStream(BUILD_XML.getBytes()), buildFile.toPath()); AntUtil.Project project = AntUtil.createProject(buildFile); - Assert.assertEquals("AntUtilTest", project.getName()); + assertEquals("AntUtilTest", project.getName()); } @Test public void testGetLog() { AntUtil.Project project = new AntUtil.Project(); - Assert.assertNull(project.logBuffer); + assertNull(project.logBuffer); Target target = new Target(); target.setName("foobar"); Echo echo = new Echo(); @@ -41,7 +62,7 @@ public void testGetLog() { target.addTask(echo); project.addTarget(target); project.executeTarget("foobar"); - Assert.assertTrue(AntUtil.getLog(project).contains("Executing foobar")); + assertTrue(AntUtil.getLog(project).contains("Executing foobar")); } } From 5ad592e7668e1558739474d6fe9f1b7f648c4938 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 09:29:27 +0200 Subject: [PATCH 302/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Rename class 'org.hibernate.tool.test.db.h2.TestSuite' to 'org.hibernate.tool.test.db.h2.JUnit4TestSuite' Signed-off-by: Koen Aers --- .../tool/test/db/h2/{TestSuite.java => JUnit4TestSuite.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/h2/src/test/java/org/hibernate/tool/test/db/h2/{TestSuite.java => JUnit4TestSuite.java} (89%) diff --git a/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuite.java b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java similarity index 89% rename from test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuite.java rename to test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java index 32cd7ea86b..9127facc0d 100644 --- a/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuite.java +++ b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java @@ -8,4 +8,4 @@ @SuiteClasses({ org.hibernate.tool.test.db.CommonTestSuite.class }) -public class TestSuite {} +public class JUnit4TestSuite {} From bc1a7fc27d880f086e9c4cf2d6af012f95e6a3a5 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 10:41:05 +0200 Subject: [PATCH 303/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Rename class 'org.hibernate.tool.test.db.h2.JUnit4TestSuite' to 'org.hibernate.tool.test.db.h2.TestSuiteJUnit4' Signed-off-by: Koen Aers --- .../test/db/h2/{JUnit4TestSuite.java => TestSuiteJUnit4.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/h2/src/test/java/org/hibernate/tool/test/db/h2/{JUnit4TestSuite.java => TestSuiteJUnit4.java} (89%) diff --git a/test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJUnit4.java similarity index 89% rename from test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java rename to test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJUnit4.java index 9127facc0d..b9b86c3598 100644 --- a/test/h2/src/test/java/org/hibernate/tool/test/db/h2/JUnit4TestSuite.java +++ b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJUnit4.java @@ -8,4 +8,4 @@ @SuiteClasses({ org.hibernate.tool.test.db.CommonTestSuite.class }) -public class JUnit4TestSuite {} +public class TestSuiteJUnit4 {} From b0bc3b605c7694fe80353102eae2f4a6e3e008d4 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 11:37:35 +0200 Subject: [PATCH 304/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor class 'org.hibernate.tools.test.util.ResourceUtil' and test class 'org.hibernate.tools.test.util.ResourceUtilTest' Signed-off-by: Koen Aers --- .../hibernate/tools/test/util/JdbcUtil.java | 3 +- .../tools/test/util/ResourceUtil.java | 53 +++++++++++++++---- .../tools/test/util/ResourceUtilTest.java | 35 ++++++++++-- .../test/resources/ResourceUtilTest.resource | 0 .../tools/test/util/JUnitUtilTest.resource | 1 - .../tools/test/util/hibernate.properties | 1 - 6 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 test/utils/src/test/resources/ResourceUtilTest.resource delete mode 100644 test/utils/src/test/resources/org/hibernate/tools/test/util/JUnitUtilTest.resource delete mode 100644 test/utils/src/test/resources/org/hibernate/tools/test/util/hibernate.properties diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java index 68a920f462..283b280da9 100644 --- a/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java +++ b/test/utils/src/main/java/org/hibernate/tools/test/util/JdbcUtil.java @@ -112,8 +112,7 @@ public static void dropDatabase(Object test) { private static String[] getSqls(Object test, String scriptName) { String[] result = new String[] {}; - String location = ResourceUtil.getResourcesLocation(test) + scriptName; - InputStream inputStream = test.getClass().getResourceAsStream(location); + InputStream inputStream = ResourceUtil.resolveResourceLocation(test.getClass(), scriptName); if (inputStream != null) { BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream)); diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java index 8feb6d8768..6e5ff068e8 100644 --- a/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java +++ b/test/utils/src/main/java/org/hibernate/tools/test/util/ResourceUtil.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; import java.io.File; @@ -7,20 +26,10 @@ public class ResourceUtil { - public static String getResourcesLocation(Object test) { - return '/' + test.getClass().getPackage().getName().replace('.', '/') + '/'; - } - public static void createResources(Object test, String[] resources, File resourcesDir) { try { - String defaultResourceLocation = getResourcesLocation(test); for (String resource : resources) { - String resourceLocation = - (resource.startsWith("/")) - ? resource : defaultResourceLocation + resource; - InputStream inputStream = test - .getClass() - .getResourceAsStream(resourceLocation); + InputStream inputStream = resolveResourceLocation(test.getClass(), resource); File resourceFile = new File(resourcesDir, resource); File parent = resourceFile.getParentFile(); if (!parent.exists()) { @@ -33,4 +42,26 @@ public static void createResources(Object test, String[] resources, File resourc } } + public static InputStream resolveResourceLocation(Class testClass, String resourceName) { + InputStream result = null; + if (resourceName.startsWith("/")) { + result = testClass.getResourceAsStream(resourceName); + } else { + result = resolveRelativeResourceLocation(testClass, resourceName); + } + return result; + } + + private static String getRelativeResourcesRoot(Class testClass) { + return '/' + testClass.getPackage().getName().replace('.', '/') + '/'; + } + + private static InputStream resolveRelativeResourceLocation(Class testClass, String resourceName) { + InputStream result = testClass.getResourceAsStream(getRelativeResourcesRoot(testClass) + resourceName); + if (result == null && testClass.getSuperclass() != Object.class) { + result = resolveRelativeResourceLocation(testClass.getSuperclass(), resourceName); + } + return result; + } + } diff --git a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java index 23407f4876..5a72c059f3 100644 --- a/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java +++ b/test/utils/src/test/java/org/hibernate/tools/test/util/ResourceUtilTest.java @@ -1,10 +1,31 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2017-2020 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tools.test.util; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; +import java.io.InputStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -15,10 +36,14 @@ public class ResourceUtilTest { public File outputFolder = new File("output"); @Test - public void testGetResourcesLocation() { - assertEquals( - "/org/hibernate/tools/test/util/", - ResourceUtil.getResourcesLocation(this)); + public void testResolveResourceLocation() { + InputStream is = ResourceUtil.resolveResourceLocation(getClass(), "/foo"); + assertNull(is); + is = ResourceUtil.resolveResourceLocation(getClass(), "/ResourceUtilTest.resource"); + assertNotNull(is); + is = ResourceUtil.resolveResourceLocation(getClass(), "HelloWorld.foo.bar"); + assertNull(is); + is = ResourceUtil.resolveResourceLocation(getClass(), "HelloWorld.hbm.xml"); } @Test diff --git a/test/utils/src/test/resources/ResourceUtilTest.resource b/test/utils/src/test/resources/ResourceUtilTest.resource new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/JUnitUtilTest.resource b/test/utils/src/test/resources/org/hibernate/tools/test/util/JUnitUtilTest.resource deleted file mode 100644 index 52f9fc2b35..0000000000 --- a/test/utils/src/test/resources/org/hibernate/tools/test/util/JUnitUtilTest.resource +++ /dev/null @@ -1 +0,0 @@ -the file is not empty \ No newline at end of file diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/hibernate.properties b/test/utils/src/test/resources/org/hibernate/tools/test/util/hibernate.properties deleted file mode 100644 index da21574937..0000000000 --- a/test/utils/src/test/resources/org/hibernate/tools/test/util/hibernate.properties +++ /dev/null @@ -1 +0,0 @@ -hibernate.dialect org.hibernate.tools.test.util.HibernateUtil$Dialect \ No newline at end of file From b17487a6b19a5aabd7b1eceb88fac28c094cf9dc Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 11:59:08 +0200 Subject: [PATCH 305/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Add test suite 'org.hibernate.tool.test.db.DbTestSuite' assembling the JUnit Jupiter database tests Signed-off-by: Koen Aers --- test/common/pom.xml | 1 + .../hibernate/tool/test/db/DbTestSuite.java | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java diff --git a/test/common/pom.xml b/test/common/pom.xml index 133a2e49c9..5845044191 100644 --- a/test/common/pom.xml +++ b/test/common/pom.xml @@ -35,6 +35,7 @@ org.junit.jupiter junit-jupiter-engine + compile org.junit.vintage diff --git a/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java b/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java new file mode 100644 index 0000000000..cd3dd17c13 --- /dev/null +++ b/test/common/src/main/java/org/hibernate/tool/test/db/DbTestSuite.java @@ -0,0 +1,79 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.tool.test.db; + +import org.junit.jupiter.api.Nested; + +public class DbTestSuite { + + @Nested public class AntHibernateToolTests extends org.hibernate.tool.ant.AntHibernateTool.TestCase {} + @Nested public class Cfg2HbmNoError extends org.hibernate.tool.ant.Cfg2HbmNoError.TestCase {} + @Nested public class Cfg2HbmWithCustomReverseNamingStrategy extends org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy.TestCase {} + @Nested public class Cfg2HbmWithInvalidReverseNamingStrategy extends org.hibernate.tool.ant.Cfg2HbmWithInvalidReverseNamingStrategy.TestCase {} + @Nested public class Cfg2HbmWithPackageName extends org.hibernate.tool.ant.Cfg2HbmWithPackageName.TestCase {} + @Nested public class Cfg2HbmWithPackageNameAndReverseNamingStrategy extends org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy.TestCase {} + @Nested public class EJB3Configuration extends org.hibernate.tool.ant.EJB3Configuration.TestCase {} + @Nested public class GenericExport extends org.hibernate.tool.ant.GenericExport.TestCase {} + @Nested public class Hbm2JavaConfiguration extends org.hibernate.tool.ant.Hbm2JavaConfiguration.TestCase {} + @Nested public class Hbm2JavaEJB3Configuration extends org.hibernate.tool.ant.Hbm2JavaEJB3Configuration.TestCase {} + @Nested public class HbmLint extends org.hibernate.tool.ant.HbmLint.TestCase {} + @Nested public class JDBCConfiguration extends org.hibernate.tool.ant.JDBCConfiguration.TestCase {} + @Nested public class JDBCConfigWithRevEngXml extends org.hibernate.tool.ant.JDBCConfigWithRevEngXml.TestCase {} + @Nested public class JPABogusPUnit extends org.hibernate.tool.ant.JPABogusPUnit.TestCase {} + @Nested public class JPAPropertyOverridesPUnit extends org.hibernate.tool.ant.JPAPropertyOverridesPUnit.TestCase {} + @Nested public class JPAPUnit extends org.hibernate.tool.ant.JPAPUnit.TestCase {} + @Nested public class Properties extends org.hibernate.tool.ant.Properties.TestCase {} + @Nested public class Query extends org.hibernate.tool.ant.Query.TestCase {} + @Nested public class SchemaExportWarning extends org.hibernate.tool.ant.SchemaExportWarning.TestCase {} + @Nested public class SchemaUpdateWarning extends org.hibernate.tool.ant.SchemaUpdateWarning.TestCase {} + @Nested public class DriverMetaData extends org.hibernate.tool.cfg.DriverMetaData.TestCase {} + @Nested public class JDBCMetaDataConfiguration extends org.hibernate.tool.cfg.JDBCMetaDataConfiguration.TestCase {} + @Nested public class CachedMetaData extends org.hibernate.tool.hbm2x.CachedMetaData.TestCase {} + @Nested public class DefaultDatabaseCollector extends org.hibernate.tool.hbm2x.DefaultDatabaseCollector.TestCase {} + @Nested public class DefaultSchemaCatalog extends org.hibernate.tool.hbm2x.DefaultSchemaCatalog.TestCase {} + @Nested public class GenerateFromJDBC extends org.hibernate.tool.hbm2x.GenerateFromJDBC.TestCase {} + @Nested public class GenerateFromJDBCWithJavaKeyword extends org.hibernate.tool.hbm2x.GenerateFromJDBCWithJavaKeyword.TestCase {} + @Nested public class IncrementalSchemaReading extends org.hibernate.tool.hbm2x.IncrementalSchemaReading.TestCase {} + @Nested public class JdbcHbm2JavaEjb3 extends org.hibernate.tool.hbm2x.JdbcHbm2JavaEjb3.TestCase {} + @Nested public class QueryExporterTest extends org.hibernate.tool.hbm2x.query.QueryExporterTest.TestCase {} + @Nested public class HbmLintTest extends org.hibernate.tool.hbmlint.HbmLintTest.TestCase {} + @Nested public class SchemaAnalyzer extends org.hibernate.tool.hbmlint.SchemaAnalyzer.TestCase {} + @Nested public class AutoQuote extends org.hibernate.tool.jdbc2cfg.AutoQuote.TestCase {} + @Nested public class Basic extends org.hibernate.tool.jdbc2cfg.Basic.TestCase {} + @Nested public class BasicMultiSchema extends org.hibernate.tool.jdbc2cfg.BasicMultiSchema.TestCase {} + @Nested public class CompositeId extends org.hibernate.tool.jdbc2cfg.CompositeId.TestCase {} + @Nested public class ForeignKeys extends org.hibernate.tool.jdbc2cfg.ForeignKeys.TestCase {} + @Nested public class Identity extends org.hibernate.tool.jdbc2cfg.Identity.TestCase {} + @Nested public class Index extends org.hibernate.tool.jdbc2cfg.Index.TestCase {} + @Nested public class KeyPropertyCompositeId extends org.hibernate.tool.jdbc2cfg.KeyPropertyCompositeId.TestCase {} + @Nested public class ManyToMany extends org.hibernate.tool.jdbc2cfg.ManyToMany.TestCase {} + @Nested public class MetaData extends org.hibernate.tool.jdbc2cfg.MetaData.TestCase {} + @Nested public class NoPrimaryKey extends org.hibernate.tool.jdbc2cfg.NoPrimaryKey.TestCase {} + @Nested public class OneToOne extends org.hibernate.tool.jdbc2cfg.OneToOne.TestCase {} + @Nested public class OverrideBinder extends org.hibernate.tool.jdbc2cfg.OverrideBinder.TestCase {} + @Nested public class Performance extends org.hibernate.tool.jdbc2cfg.Performance.TestCase {} + @Nested public class PersistentClasses extends org.hibernate.tool.jdbc2cfg.PersistentClasses.TestCase {} + @Nested public class RevEngForeignKey extends org.hibernate.tool.jdbc2cfg.RevEngForeignKey.TestCase {} + @Nested public class SearchEscapeString extends org.hibernate.tool.jdbc2cfg.SearchEscapeString.TestCase {} + @Nested public class TernarySchema extends org.hibernate.tool.jdbc2cfg.TernarySchema.TestCase {} + @Nested public class Versioning extends org.hibernate.tool.jdbc2cfg.Versioning.TestCase {} + @Nested public class Statistics extends org.hibernate.tool.stat.Statistics.TestCase {} + +} From 4f9191603901d145ea04b3622a9e1aa14cfa285f Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 13:28:38 +0200 Subject: [PATCH 306/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Add 'org.hibernate.tool.test.db.h2.TestSuiteJupiter' assembling the JUnit Jupiter tests for H2 Signed-off-by: Koen Aers --- .../tool/test/db/h2/TestSuiteJupiter.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJupiter.java diff --git a/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJupiter.java b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJupiter.java new file mode 100644 index 0000000000..21b632d197 --- /dev/null +++ b/test/h2/src/test/java/org/hibernate/tool/test/db/h2/TestSuiteJupiter.java @@ -0,0 +1,30 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.tool.test.db.h2; + +import org.hibernate.tool.test.db.DbTestSuite; +import org.junit.jupiter.api.Nested; + +public class TestSuiteJupiter { + + @Nested + public class H2TestSuite extends DbTestSuite {} + +} From 85e2ed5895c330c2192095a685e9c2de1763bc16 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 13:50:53 +0200 Subject: [PATCH 307/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.AntHibernateTool.TestCase' Signed-off-by: Koen Aers --- .../AntHibernateTool/AnyKindOfUserType.java | 19 +++ .../tool/ant/AntHibernateTool/TestCase.java | 127 +++++++++++------- 2 files changed, 94 insertions(+), 52 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/AnyKindOfUserType.java b/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/AnyKindOfUserType.java index 13095b4851..7c6e906642 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/AnyKindOfUserType.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/AnyKindOfUserType.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.AntHibernateTool; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java index d850663cf7..48ab99e46b 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java @@ -1,36 +1,59 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.AntHibernateTool; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -51,36 +74,36 @@ public void testHbm2DDLLogic() throws Exception { File dropAndCreate = new File(destinationDir, "dropandcreate.sql"); File update = new File(destinationDir, "update.sql"); - Assert.assertFalse(topDown.exists()); - Assert.assertFalse(onlyDrop.exists()); - Assert.assertFalse(onlyCreate.exists()); - Assert.assertFalse(dropAndCreate.exists()); - Assert.assertFalse(update.exists()); + assertFalse(topDown.exists()); + assertFalse(onlyDrop.exists()); + assertFalse(onlyCreate.exists()); + assertFalse(dropAndCreate.exists()); + assertFalse(update.exists()); project.executeTarget("testHbm2DDLLogic"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(topDown.exists()); + assertTrue(topDown.exists()); - Assert.assertTrue(onlyDrop.exists()); - Assert.assertNull(FileUtil.findFirstString("create", onlyDrop)); - Assert.assertNotNull(FileUtil.findFirstString("drop", onlyDrop)); + assertTrue(onlyDrop.exists()); + assertNull(FileUtil.findFirstString("create", onlyDrop)); + assertNotNull(FileUtil.findFirstString("drop", onlyDrop)); - Assert.assertTrue(onlyCreate.exists()); - Assert.assertNull(FileUtil.findFirstString("drop", onlyCreate)); - Assert.assertNotNull(FileUtil.findFirstString("create", onlyCreate)); - Assert.assertNotNull(FileUtil.findFirstString("---", onlyCreate)); + assertTrue(onlyCreate.exists()); + assertNull(FileUtil.findFirstString("drop", onlyCreate)); + assertNotNull(FileUtil.findFirstString("create", onlyCreate)); + assertNotNull(FileUtil.findFirstString("---", onlyCreate)); - Assert.assertTrue(dropAndCreate.exists()); - Assert.assertNotNull(FileUtil.findFirstString("drop", dropAndCreate)); - Assert.assertNotNull(FileUtil.findFirstString("create", dropAndCreate)); - Assert.assertNotNull(FileUtil.findFirstString("---", dropAndCreate)); + assertTrue(dropAndCreate.exists()); + assertNotNull(FileUtil.findFirstString("drop", dropAndCreate)); + assertNotNull(FileUtil.findFirstString("create", dropAndCreate)); + assertNotNull(FileUtil.findFirstString("---", dropAndCreate)); - Assert.assertTrue(update.exists()); - Assert.assertNotNull(FileUtil.findFirstString("create", update)); - Assert.assertNotNull(FileUtil.findFirstString("---", update)); + assertTrue(update.exists()); + assertNotNull(FileUtil.findFirstString("create", update)); + assertNotNull(FileUtil.findFirstString("---", update)); } @@ -99,22 +122,22 @@ public void testHbm2DDLUpdateExecution() { File update1 = new File(destinationDir, "update1.sql"); File update2 = new File(destinationDir, "update2.sql"); - Assert.assertFalse(topDown.exists()); - Assert.assertFalse(onlyDrop.exists()); - Assert.assertFalse(update1.exists()); - Assert.assertFalse(update2.exists()); + assertFalse(topDown.exists()); + assertFalse(onlyDrop.exists()); + assertFalse(update1.exists()); + assertFalse(update2.exists()); project.executeTarget("testantcfgUpdateExecuted"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(topDown.exists()); - Assert.assertTrue(onlyDrop.exists()); - Assert.assertTrue(update1.exists()); - Assert.assertNotNull(FileUtil.findFirstString("create", update1)); - Assert.assertTrue(update2.exists()); - Assert.assertEquals(0, update2.length()); + assertTrue(topDown.exists()); + assertTrue(onlyDrop.exists()); + assertTrue(update1.exists()); + assertNotNull(FileUtil.findFirstString("create", update1)); + assertTrue(update2.exists()); + assertEquals(0, update2.length()); } @@ -132,20 +155,20 @@ public void testHbm2DDLExportExecution() throws Exception { File update = new File(destinationDir, "update.sql"); File onlydrop = new File(destinationDir, "onlydrop.sql"); - Assert.assertFalse(export.exists()); - Assert.assertFalse(update.exists()); - Assert.assertFalse(onlydrop.exists()); + assertFalse(export.exists()); + assertFalse(update.exists()); + assertFalse(onlydrop.exists()); project.executeTarget("testantcfgExportExecuted"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(export.exists()); - Assert.assertTrue(update.exists()); - Assert.assertNotNull(FileUtil.findFirstString("create", export)); + assertTrue(export.exists()); + assertTrue(update.exists()); + assertNotNull(FileUtil.findFirstString("create", export)); // if export is executed, update should be empty - Assert.assertEquals(0, update.length()); + assertEquals(0, update.length()); } From b8f6a3023be3d1f5f43a64b00dbcfec50d7f7126 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 14:12:56 +0200 Subject: [PATCH 308/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Cfg2HbmNoError.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/Cfg2HbmNoError/TestCase.java | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java index 538874672f..58e0b2bbd9 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmNoError; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,12 +68,12 @@ public void testCfg2HbmNoError() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hbmxml = new File(destinationDir, "VerySimpleTable.hbm.xml"); - Assert.assertFalse(hbmxml.exists()); + assertFalse(hbmxml.exists()); project.executeTarget("testCfg2HbmNoError"); - Assert.assertTrue(hbmxml.exists()); - Assert.assertTrue(FileUtil + assertTrue(hbmxml.exists()); + assertTrue(FileUtil .findFirstString("class", hbmxml) .contains("VerySimpleTable")); From 2dfe1744a6b984670c33f320fca688aa2469c7b4 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 14:27:33 +0200 Subject: [PATCH 309/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy.TestCase' Signed-off-by: Koen Aers --- .../Strategy.java | 19 +++++++ .../TestCase.java | 50 +++++++++++++------ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java index 65210dc5dd..3e60a7c301 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy; import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java index 64bb5901ae..a3996ed461 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,12 +68,12 @@ public void testCfg2HbmWithCustomReverseNamingStrategy() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hbmxml = new File(destinationDir, "foo/Bar.hbm.xml"); - Assert.assertFalse(hbmxml.exists()); + assertFalse(hbmxml.exists()); project.executeTarget("testCfg2HbmWithCustomReverseNamingStrategy"); - Assert.assertTrue(hbmxml.exists()); - Assert.assertTrue(FileUtil + assertTrue(hbmxml.exists()); + assertTrue(FileUtil .findFirstString("class", hbmxml) .contains("foo.Bar")); From e340bf9b7f2aee197645bc59585b3c3d732d5702 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 14:42:33 +0200 Subject: [PATCH 310/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Cfg2HbmWithInvalidReverseNamingStrategy.TestCase' Signed-off-by: Koen Aers --- .../TestCase.java | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java index 40e84739a2..94ae1e8749 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithInvalidReverseNamingStrategy; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import org.apache.tools.ant.BuildException; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -50,11 +70,11 @@ public void testCfg2HbmWithInvalidReverseNamingStrategy() { try { project.executeTarget("testCfg2HbmWithInvalidReverseNamingStrategy"); - Assert.fail("A BuildException should happen!"); + fail("A BuildException should happen!"); } catch (BuildException e) { - Assert.assertTrue(e + assertTrue(e .getMessage() .contains("Could not create or find invalid.Strategy")); From f85998c471e30d9180da6cb5071f9598c6ac18e1 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 15:15:32 +0200 Subject: [PATCH 311/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Cfg2HbmWithPackageName.TestCase' Signed-off-by: Koen Aers --- .../ant/Cfg2HbmWithPackageName/TestCase.java | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java index f70f6fa191..eaab0018dd 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithPackageName; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,12 +68,12 @@ public void testCfg2HbmWithPackageName() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hbmxml = new File(destinationDir, "foo/bar/VerySimpleTable.hbm.xml"); - Assert.assertFalse(hbmxml.exists()); + assertFalse(hbmxml.exists()); project.executeTarget("testCfg2HbmWithPackageName"); - Assert.assertTrue(hbmxml.exists()); - Assert.assertTrue(FileUtil + assertTrue(hbmxml.exists()); + assertTrue(FileUtil .findFirstString("class", hbmxml) .contains("foo.bar.VerySimpleTable")); From a65fc1d9491542876fe6b09ce8c87e75eacee0c3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 15:36:20 +0200 Subject: [PATCH 312/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy.TestCase' Signed-off-by: Koen Aers --- .../Strategy.java | 19 ++++++++ .../TestCase.java | 45 +++++++++++++------ 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java index 8b0ec9f45e..fef4ea8386 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy; import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java index 49ae729b08..4a561f39cf 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java @@ -1,35 +1,54 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -47,7 +66,7 @@ public void testCfg2HbmWithPackageNameAndReverseNamingStrategy() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hbmxml = new File(destinationDir, "foo/Bar.hbm.xml"); - Assert.assertFalse(hbmxml.exists()); + assertFalse(hbmxml.exists()); project.executeTarget("testCfg2HbmWithPackageNameAndReverseNamingStrategy"); From defddc048108362d82f7611693ef9a59c41f76c9 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 15:53:32 +0200 Subject: [PATCH 313/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.EJB3Configuration.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/EJB3Configuration/TestCase.java | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java index 2944b7b434..c315f68ee7 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.EJB3Configuration; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,12 +69,12 @@ public void testEJB3ConfigurationFailureExpected() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File ejb3 = new File(destinationDir, "ejb3.sql"); - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); project.executeTarget("testEJB3Configuration"); - Assert.assertTrue(ejb3.exists()); - Assert.assertNotNull(FileUtil.findFirstString("create", ejb3)); + assertTrue(ejb3.exists()); + assertNotNull(FileUtil.findFirstString("create", ejb3)); } From 934f6f5fa9253cf9dcc5475733bb2af02c1fe032 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 16:38:41 +0200 Subject: [PATCH 314/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.GenericExport.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/GenericExport/TestCase.java | 68 ++++++++++++------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/GenericExport/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/GenericExport/TestCase.java index 83b37c2f2a..b860a3685d 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/GenericExport/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/GenericExport/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.GenericExport; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,36 +68,36 @@ public void testGenericExport() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File xTopDownJava = new File(destinationDir, "Xorg/hibernate/tool/hbm2x/ant/TopDown.java"); - Assert.assertFalse(xTopDownJava.exists()); + assertFalse(xTopDownJava.exists()); File topDownJava = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.java"); - Assert.assertFalse(topDownJava.exists()); + assertFalse(topDownJava.exists()); File topDownQuote = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.quote"); - Assert.assertFalse(topDownQuote.exists()); + assertFalse(topDownQuote.exists()); File topDownPojo = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.pojo"); - Assert.assertFalse(topDownPojo.exists()); + assertFalse(topDownPojo.exists()); project.executeTarget("testGenericExport"); - Assert.assertTrue(xTopDownJava.exists()); - Assert.assertTrue(FileUtil + assertTrue(xTopDownJava.exists()); + assertTrue(FileUtil .findFirstString("TopDown", xTopDownJava) .contains("TopDown generated by hbm2java")); - Assert.assertTrue(topDownJava.exists()); - Assert.assertTrue(FileUtil + assertTrue(topDownJava.exists()); + assertTrue(FileUtil .findFirstString("TopDown", topDownJava) .contains("TopDown generated by hbm2java")); - Assert.assertTrue(topDownQuote.exists()); - Assert.assertTrue(FileUtil + assertTrue(topDownQuote.exists()); + assertTrue(FileUtil .findFirstString("TopDown", topDownQuote) .contains("pojo=TopDown")); - Assert.assertTrue(topDownPojo.exists()); - Assert.assertTrue(FileUtil + assertTrue(topDownPojo.exists()); + assertTrue(FileUtil .findFirstString("TopDown", topDownPojo) .contains("TopDown generated by hbm2java")); From 9b47d20e5c290916bdf9be71f725e545f3fe486d Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 17:11:31 +0200 Subject: [PATCH 315/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Hbm2JavaConfiguration.TestCase' Signed-off-by: Koen Aers --- .../ant/Hbm2JavaConfiguration/TestCase.java | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java index 5782a6f696..f1875d6276 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Hbm2JavaConfiguration; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,15 +69,15 @@ public void testHbm2JavaConfiguration() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File someClass = new File(destinationDir, "SomeClass.java"); - Assert.assertFalse(someClass.exists()); + assertFalse(someClass.exists()); project.executeTarget("testHbm2JavaConfiguration"); - Assert.assertTrue(someClass.exists()); - Assert.assertTrue(FileUtil + assertTrue(someClass.exists()); + assertTrue(FileUtil .findFirstString("SomeClass", someClass) .contains("SomeClass generated by hbm2java")); - Assert.assertNull(FileUtil.findFirstString("@Entity", someClass)); + assertNull(FileUtil.findFirstString("@Entity", someClass)); } From 1221e2d709b384897582db57d54309c7c7c221ec Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 20:37:49 +0200 Subject: [PATCH 316/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Hbm2JavaEJB3Configuration.TestCase' Signed-off-by: Koen Aers --- .../Hbm2JavaEJB3Configuration/TestCase.java | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java index 26aab4c1b5..f82798fa86 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Hbm2JavaEJB3Configuration; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,15 +69,15 @@ public void testHbm2JavaConfiguration() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File someClass = new File(destinationDir, "SomeClass.java"); - Assert.assertFalse(someClass.exists()); + assertFalse(someClass.exists()); project.executeTarget("testHbm2JavaEJB3Configuration"); - Assert.assertTrue(someClass.exists()); - Assert.assertTrue(FileUtil + assertTrue(someClass.exists()); + assertTrue(FileUtil .findFirstString("SomeClass", someClass) .contains("SomeClass generated by hbm2java")); - Assert.assertNotNull(FileUtil.findFirstString("@Entity", someClass)); + assertNotNull(FileUtil.findFirstString("@Entity", someClass)); } From 5d3e08a8fcd21b65741667832eeb772abcf65655 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 20:52:17 +0200 Subject: [PATCH 317/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.HbmLint.TestCase' Signed-off-by: Koen Aers --- .../hibernate/tool/ant/HbmLint/TestCase.java | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/HbmLint/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/HbmLint/TestCase.java index d9479d51a6..68548877e8 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/HbmLint/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/HbmLint/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.HbmLint; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,37 +68,37 @@ public void testHbmLint() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hbmLintResult = new File(destinationDir, "hbmlint-result.txt"); - Assert.assertFalse(hbmLintResult.exists()); + assertFalse(hbmLintResult.exists()); project.executeTarget("testHbmLint"); - Assert.assertTrue(hbmLintResult.exists()); + assertTrue(hbmLintResult.exists()); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("BadType", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("Category", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("Column", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("does_not_exist", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("hilo_table", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("MissingTable", hbmLintResult) .contains("SCHEMA_TABLE_MISSING")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("MISSING_ID_GENERATOR", hbmLintResult) .contains("does_not_exist")); From 29d92793b7901fe166428a3b58bb112efa0f3940 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 22:09:34 +0200 Subject: [PATCH 318/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.JDBCConfiguration.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/JDBCConfiguration/TestCase.java | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java index 339aeba7e4..237cc35e73 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.JDBCConfiguration; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -56,27 +76,27 @@ public void testJDBCConfiguration() { File withTemplate = new File(destinationDir, "with-template/BottomUp.java"); File cfgxml = new File(destinationDir, "cfgxml/hibernate.cfg.xml"); - Assert.assertFalse(noTemplate.exists()); - Assert.assertFalse(withTemplate.exists()); - Assert.assertFalse(cfgxml.exists()); + assertFalse(noTemplate.exists()); + assertFalse(withTemplate.exists()); + assertFalse(cfgxml.exists()); project.executeTarget("testJDBCConfiguration"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(noTemplate.exists()); - Assert.assertTrue(FileUtil + assertTrue(noTemplate.exists()); + assertTrue(FileUtil .findFirstString("public", noTemplate) .contains("BottomUp")); - Assert.assertTrue(withTemplate.exists()); - Assert.assertTrue(FileUtil + assertTrue(withTemplate.exists()); + assertTrue(FileUtil .findFirstString("template", withTemplate) .contains("/** Made by a template in your neighborhood */")); - Assert.assertTrue(cfgxml.exists()); - Assert.assertTrue(FileUtil + assertTrue(cfgxml.exists()); + assertTrue(FileUtil .findFirstString("mapping", cfgxml) .contains("BottomUp.hbm.xml")); From 59a8d10c7eef6e533300507522284c6875c68c6d Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 22:28:31 +0200 Subject: [PATCH 319/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.JDBCConfigWithRevEngXml.TestCase' Signed-off-by: Koen Aers --- .../ant/JDBCConfigWithRevEngXml/TestCase.java | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java index 8cdba6814d..3eb3f71ed0 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.JDBCConfigWithRevEngXml; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,18 +68,18 @@ public void testJDBCConfigWithRevEngXml() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File bottomUp = new File(destinationDir, "foo/BottomUp.java"); - Assert.assertFalse(bottomUp.exists()); + assertFalse(bottomUp.exists()); project.executeTarget("testJDBCConfigWithRevEngXml"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(bottomUp.exists()); - Assert.assertTrue(FileUtil + assertTrue(bottomUp.exists()); + assertTrue(FileUtil .findFirstString("good", bottomUp) .contains("Boolean")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("something", bottomUp) .contains("SomeUserType")); From 9e8ec803a9511d22482b4921efcf09020986fb5d Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 22:45:39 +0200 Subject: [PATCH 320/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.JPABogusPUnit.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/JPABogusPUnit/TestCase.java | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java index 88308fdcce..325f68e068 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.JPABogusPUnit; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import org.apache.tools.ant.BuildException; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,17 +69,17 @@ public void testJPABogusPUnit() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File ejb3 = new File(destinationDir, "ejb3.sql"); - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); try { project.executeTarget("testJPABogusPUnit"); - Assert.fail("The Bogus unit was accepted"); + fail("The Bogus unit was accepted"); } catch (BuildException e) { String log = AntUtil.getLog(project); - Assert.assertTrue(log, log.contains("Persistence unit not found: 'shouldnotbethere'")); + assertTrue(log.contains("Persistence unit not found: 'shouldnotbethere'"), log); } - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); } From a160ed112eac5eed7aced5caa9b21fea79a13300 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 23:02:43 +0200 Subject: [PATCH 321/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.JPAPropertyOverridesPUnit.TestCase' Signed-off-by: Koen Aers --- .../JPAPropertyOverridesPUnit/TestCase.java | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java index 6053a3466b..c12d81b2ae 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.JPAPropertyOverridesPUnit; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import org.apache.tools.ant.BuildException; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,17 +69,17 @@ public void testJPAPUnit() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File ejb3 = new File(destinationDir, "ejb3.sql"); - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); try { project.executeTarget("testJPAPropertyOverridesPUnit"); - Assert.fail("property overrides not accepted"); + fail("property overrides not accepted"); } catch (BuildException e) { // should happen - Assert.assertTrue(e.getMessage().contains("FAKEDialect")); + assertTrue(e.getMessage().contains("FAKEDialect")); } - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); } From 48e9ba071d9cbbc3e76146557bf91a9f0b903e1b Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 5 Jul 2021 23:25:43 +0200 Subject: [PATCH 322/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.JPAPUnit.TestCase' Signed-off-by: Koen Aers --- .../hibernate/tool/ant/JPAPUnit/TestCase.java | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java index eab81f2871..0efbf88c22 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java @@ -1,36 +1,57 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.JPAPUnit; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,12 +69,12 @@ public void testJPAPUnit() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File ejb3 = new File(destinationDir, "ejb3.sql"); - Assert.assertFalse(ejb3.exists()); + assertFalse(ejb3.exists()); project.executeTarget("testJPAPUnit"); - Assert.assertTrue(ejb3.exists()); - Assert.assertNotNull(FileUtil.findFirstString("create", ejb3)); + assertTrue(ejb3.exists()); + assertNotNull(FileUtil.findFirstString("create", ejb3)); } From c1e3b1e3b456791bdf3f33c191a565c1a5953d81 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 02:15:32 +0200 Subject: [PATCH 323/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Properties.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/Properties/TestCase.java | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Properties/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Properties/TestCase.java index 90a0aa38aa..d737b0557c 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Properties/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Properties/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Properties; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -53,31 +73,31 @@ public void testProperties() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File file = new File(destinationDir, "SomeClass.java"); - Assert.assertFalse(file.exists()); + assertFalse(file.exists()); project.executeTarget("testProperties"); String log = AntUtil.getLog(project); - Assert.assertTrue(log, !log.contains("Exception")); + assertTrue(!log.contains("Exception"), log); - Assert.assertTrue(file.exists()); + assertTrue(file.exists()); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("hbm2java.weirdAl", file) .contains("foo3")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("ant.project.name", file) .contains("PropertiesTest")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("foo.weirdAl", file) .contains("does not exist")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("bar", file) .contains("foo2")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("file", file) .contains("some.file")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("value", file) .contains("some value")); From 4a0ad9b513b44fb5ccf162b388ba26e16c417003 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 02:30:40 +0200 Subject: [PATCH 324/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.Query.TestCase' Signed-off-by: Koen Aers --- .../tool/ant/Query/ObjectResult.java | 19 ++++++ .../tool/ant/Query/SerializableResult.java | 19 ++++++ .../hibernate/tool/ant/Query/TestCase.java | 62 +++++++++++++------ 3 files changed, 80 insertions(+), 20 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Query/ObjectResult.java b/test/common/src/main/java/org/hibernate/tool/ant/Query/ObjectResult.java index b0e04ed065..08bdf143fd 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Query/ObjectResult.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Query/ObjectResult.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Query; public class ObjectResult { diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Query/SerializableResult.java b/test/common/src/main/java/org/hibernate/tool/ant/Query/SerializableResult.java index 171e7b2fab..e5c1b2a15f 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Query/SerializableResult.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Query/SerializableResult.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Query; import java.io.Serializable; diff --git a/test/common/src/main/java/org/hibernate/tool/ant/Query/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/Query/TestCase.java index bf09e3e9d1..527d0548da 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/Query/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/Query/TestCase.java @@ -1,36 +1,58 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.Query; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -48,25 +70,25 @@ public void testQuery() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File hqlQuery = new File(destinationDir, "hqlQuery.txt"); - Assert.assertFalse(hqlQuery.exists()); + assertFalse(hqlQuery.exists()); File textQuery = new File(destinationDir, "textQuery.txt"); - Assert.assertFalse(textQuery.exists()); + assertFalse(textQuery.exists()); project.executeTarget("testQuery"); - Assert.assertTrue(hqlQuery.exists()); - Assert.assertTrue(FileUtil + assertTrue(hqlQuery.exists()); + assertTrue(FileUtil .findFirstString("First", hqlQuery) .contains("SerializableResult(id:First,length:1023)")); - Assert.assertTrue(FileUtil + assertTrue(FileUtil .findFirstString("Third", hqlQuery) .contains("ObjectResult(id:Third,length:4095)")); - Assert.assertTrue(textQuery.exists()); - Assert.assertTrue(FileUtil + assertTrue(textQuery.exists()); + assertTrue(FileUtil .findFirstString("First", textQuery) .contains("SerializableResult(id:First,length:1023)")); - Assert.assertNull(FileUtil.findFirstString("Third", textQuery)); + assertNull(FileUtil.findFirstString("Third", textQuery)); } From d12e1c7af38b544460443206b671a489effe6ce2 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 16:03:51 +0200 Subject: [PATCH 325/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.SchemaExportWarning.TestCase' Signed-off-by: Koen Aers --- .../ant/SchemaExportWarning/TestCase.java | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java index a3abfd42e8..caa54354f0 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.SchemaExportWarning; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -47,17 +67,17 @@ public void testSchemaExport() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File schemaExport = new File(destinationDir, "schemaexport.sql"); - Assert.assertFalse(schemaExport.exists()); + assertFalse(schemaExport.exists()); project.executeTarget("testSchemaExportWarning"); - Assert.assertTrue(schemaExport.exists()); - Assert.assertTrue(FileUtil + assertTrue(schemaExport.exists()); + assertTrue(FileUtil .findFirstString("drop", schemaExport) .contains("TopDown")); String log = AntUtil.getLog(project); - Assert.assertFalse(log.contains("Exception")); + assertFalse(log.contains("Exception")); } From f55caee765f4bc01641764f351b72eb488c8ec46 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 16:30:39 +0200 Subject: [PATCH 326/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.ant.SchemaUpdateWarning.TestCase' Signed-off-by: Koen Aers --- .../ant/SchemaUpdateWarning/TestCase.java | 56 +++++++++++++------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java index f2e1c021ac..e88bac6cbe 100644 --- a/test/common/src/main/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java @@ -1,36 +1,56 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.ant.SchemaUpdateWarning; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.hibernate.tools.test.util.AntUtil; import org.hibernate.tools.test.util.FileUtil; import org.hibernate.tools.test.util.JdbcUtil; import org.hibernate.tools.test.util.ResourceUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestCase { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public File outputFolder = new File("output"); private File destinationDir = null; private File resourcesDir = null; - @Before + @BeforeEach public void setUp() { - destinationDir = new File(temporaryFolder.getRoot(), "destination"); + destinationDir = new File(outputFolder, "destination"); destinationDir.mkdir(); - resourcesDir = new File(temporaryFolder.getRoot(), "resources"); + resourcesDir = new File(outputFolder, "resources"); resourcesDir.mkdir(); JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -47,19 +67,19 @@ public void testSchemaUpdateWarning() { project.setProperty("resourcesDir", resourcesDir.getAbsolutePath()); File schemaUpdate = new File(destinationDir, "schemaupdate.sql"); - Assert.assertFalse(schemaUpdate.exists()); + assertFalse(schemaUpdate.exists()); project.executeTarget("testSchemaUpdateWarning"); - Assert.assertTrue(schemaUpdate.exists()); - Assert.assertTrue(FileUtil + assertTrue(schemaUpdate.exists()); + assertTrue(FileUtil .findFirstString("create", schemaUpdate) .contains("TopDown")); String log = AntUtil.getLog(project); - Assert.assertFalse(log.contains("Exception")); - Assert.assertTrue(log.contains("Hibernate Core SchemaUpdate")); - Assert.assertTrue(log.contains("tools.hibernate.org")); + assertFalse(log.contains("Exception")); + assertTrue(log.contains("Hibernate Core SchemaUpdate")); + assertTrue(log.contains("tools.hibernate.org")); } From 55db7051da9be71a8c3df19f5baa65867079d5f5 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 17:04:24 +0200 Subject: [PATCH 327/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.cfg.DriverMetaData.TestCase' Signed-off-by: Koen Aers --- .../tool/cfg/DriverMetaData/TestCase.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/cfg/DriverMetaData/TestCase.java b/test/common/src/main/java/org/hibernate/tool/cfg/DriverMetaData/TestCase.java index 648c276d26..32715ccc47 100644 --- a/test/common/src/main/java/org/hibernate/tool/cfg/DriverMetaData/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/cfg/DriverMetaData/TestCase.java @@ -4,6 +4,9 @@ */ package org.hibernate.tool.cfg.DriverMetaData; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -21,10 +24,9 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tools.test.util.JUnitUtil; import org.hibernate.tools.test.util.JdbcUtil; -import org.junit.After; -import org.junit.Assert; -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; /** * @author max @@ -35,7 +37,7 @@ public class TestCase { private Properties properties = null; private ServiceRegistry serviceRegistry; - @Before + @BeforeEach public void setUp() { JdbcUtil.createDatabase(this); properties = Environment.getProperties(); @@ -43,7 +45,7 @@ public void setUp() { serviceRegistry = ssrb.build(); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -86,10 +88,10 @@ public void testExportedKeys() { exportedKeys.next(); cnt++; } - Assert.assertEquals(1,cnt); + assertEquals(1,cnt); } } - Assert.assertTrue(foundMaster); + assertTrue(foundMaster); } @Test From cd33e4a7a6e03b786c2d9a234e013a1b189b18a8 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 17:20:34 +0200 Subject: [PATCH 328/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.cfg.JDBCMetaDataConfiguration.TestCase' Signed-off-by: Koen Aers --- .../JDBCMetaDataConfiguration/TestCase.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java index 403d490328..623b182a7d 100644 --- a/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java @@ -1,13 +1,14 @@ package org.hibernate.tool.cfg.JDBCMetaDataConfiguration; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.hibernate.boot.Metadata; import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; import org.hibernate.tools.test.util.HibernateUtil; import org.hibernate.tools.test.util.JdbcUtil; -import org.junit.After; -import org.junit.Assert; -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; /** * @author max @@ -15,12 +16,12 @@ */ public class TestCase { - @Before + @BeforeEach public void setUp() { JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -30,15 +31,15 @@ public void testReadFromJDBC() throws Exception { Metadata metadata = MetadataDescriptorFactory .createJdbcDescriptor(null, null, true) .createMetadata(); - Assert.assertNotNull("WithRealTimestamp", metadata.getEntityBinding("WithRealTimestamp")); - Assert.assertNotNull("NoVersion", metadata.getEntityBinding("NoVersion")); - Assert.assertNotNull("WithFakeTimestamp", metadata.getEntityBinding("WithFakeTimestamp")); - Assert.assertNotNull("WithVersion", metadata.getEntityBinding("WithVersion")); + assertNotNull(metadata.getEntityBinding("WithRealTimestamp"), "WithRealTimestamp"); + assertNotNull(metadata.getEntityBinding("NoVersion"), "NoVersion"); + assertNotNull(metadata.getEntityBinding("WithFakeTimestamp"), "WithFakeTimestamp"); + assertNotNull(metadata.getEntityBinding("WithVersion"), "WithVersion"); } @Test public void testGetTable() throws Exception { - Assert.assertNotNull( + assertNotNull( HibernateUtil.getTable( MetadataDescriptorFactory .createJdbcDescriptor(null, null, true) From 2899cd8a2a3094735075efff0e071012e71000e3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 17:38:07 +0200 Subject: [PATCH 329/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.CachedMetaData.TestCase' Signed-off-by: Koen Aers --- .../JDBCMetaDataConfiguration/TestCase.java | 19 ++++++++ .../tool/hbm2x/CachedMetaData/TestCase.java | 46 +++++++++++++------ 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java index 623b182a7d..cd6bd1d892 100644 --- a/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/cfg/JDBCMetaDataConfiguration/TestCase.java @@ -1,3 +1,22 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. + * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.cfg.JDBCMetaDataConfiguration; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/test/common/src/main/java/org/hibernate/tool/hbm2x/CachedMetaData/TestCase.java b/test/common/src/main/java/org/hibernate/tool/hbm2x/CachedMetaData/TestCase.java index 1e67ca4f62..effef1004f 100644 --- a/test/common/src/main/java/org/hibernate/tool/hbm2x/CachedMetaData/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/hbm2x/CachedMetaData/TestCase.java @@ -1,9 +1,28 @@ /* - * Created on 2004-12-01 + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.hibernate.tool.hbm2x.CachedMetaData; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -25,12 +44,9 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tools.test.util.JUnitUtil; import org.hibernate.tools.test.util.JdbcUtil; -import org.junit.After; -import org.junit.Assert; -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; /** * @author max @@ -121,12 +137,12 @@ public Iterator> getSuggestedPrimaryKeyStrategyName(String c } - @Before + @BeforeEach public void setUp() { JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -178,15 +194,15 @@ private void validate(DatabaseCollector dc) { child = table; master = iterator.next(); } else { - Assert.fail("Only tables named 'MASTER' and 'CHILD' should exist"); + fail("Only tables named 'MASTER' and 'CHILD' should exist"); } - Assert.assertNotNull(child); - Assert.assertNotNull(master); + assertNotNull(child); + assertNotNull(master); iterator = dc.iterateTables(); - Assert.assertNotNull(iterator.next()); - Assert.assertNotNull(iterator.next()); - Assert.assertFalse(iterator.hasNext()); + assertNotNull(iterator.next()); + assertNotNull(iterator.next()); + assertFalse(iterator.hasNext()); JUnitUtil.assertIteratorContainsExactly( "should have recorded one foreignkey to child table", From 5d4313472e097e21528cc44bb2bbbdee92dd6b5c Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Tue, 6 Jul 2021 17:56:51 +0200 Subject: [PATCH 330/560] HBX-2184: Replace JUnit4 tests with JUnit Jupiter tests - Refactor test class 'org.hibernate.tool.hbm2x.DefaultDatabaseCollector.TestCase' Signed-off-by: Koen Aers --- .../DefaultDatabaseCollector/TestCase.java | 65 +++++++++++-------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/test/common/src/main/java/org/hibernate/tool/hbm2x/DefaultDatabaseCollector/TestCase.java b/test/common/src/main/java/org/hibernate/tool/hbm2x/DefaultDatabaseCollector/TestCase.java index 64bbf918f0..b227e1858b 100644 --- a/test/common/src/main/java/org/hibernate/tool/hbm2x/DefaultDatabaseCollector/TestCase.java +++ b/test/common/src/main/java/org/hibernate/tool/hbm2x/DefaultDatabaseCollector/TestCase.java @@ -1,15 +1,29 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2004-2021 Red Hat, Inc. * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + * Licensed under the GNU Lesser General Public License (LGPL), + * version 2.1 or later (the "License"). + * You may not use this file except in compliance with the License. + * You may read the licence in the 'lgpl.txt' file in the root folder of + * project or obtain a copy at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.hibernate.tool.hbm2x.DefaultDatabaseCollector; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -35,10 +49,9 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.api.metadata.MetadataDescriptorFactory; import org.hibernate.tools.test.util.JdbcUtil; -import org.junit.After; -import org.junit.Assert; -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; /** * @author Dmitry Geraskov @@ -46,12 +59,12 @@ */ public class TestCase { - @Before + @BeforeEach public void setUp() { JdbcUtil.createDatabase(this); } - @After + @AfterEach public void tearDown() { JdbcUtil.dropDatabase(this); } @@ -64,7 +77,7 @@ public void testReadOnlySpecificSchema() { List