Skip to content

Commit f09d5c3

Browse files
koentsjekoentsje
committed
HBX-2880: Create and use subclasses for BasicValue and Component to accommodate for changes in identity generation - Adapt the tests
Signed-off-by: Koen Aers <[email protected]>
1 parent 2895ada commit f09d5c3

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

‎test/common/src/main/java/org/hibernate/tool/jdbc2cfg/Identity/TestCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
import org.hibernate.boot.Metadata;
2828
import org.hibernate.mapping.PersistentClass;
29-
import org.hibernate.mapping.SimpleValue;
3029
import org.hibernate.tool.api.metadata.MetadataDescriptorFactory;
30+
import org.hibernate.tool.internal.reveng.util.EnhancedValue;
3131
import org.hibernate.tools.test.util.JdbcUtil;
3232
import org.junit.jupiter.api.AfterEach;
3333
import org.junit.jupiter.api.BeforeEach;
@@ -61,15 +61,15 @@ public void testIdentity() throws SQLException {
6161
assertNotNull(classMapping);
6262
assertEquals(
6363
"identity",
64-
((SimpleValue)classMapping
64+
((EnhancedValue)classMapping
6565
.getIdentifierProperty()
6666
.getValue())
6767
.getIdentifierGeneratorStrategy());
6868

6969
classMapping = metadata.getEntityBinding("Noautoinc");
7070
assertEquals(
7171
"assigned",
72-
((SimpleValue)classMapping
72+
((EnhancedValue)classMapping
7373
.getIdentifierProperty()
7474
.getValue())
7575
.getIdentifierGeneratorStrategy());

‎test/common/src/main/java/org/hibernate/tool/jdbc2cfg/OneToOne/TestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.hibernate.mapping.OneToOne;
3939
import org.hibernate.mapping.PersistentClass;
4040
import org.hibernate.mapping.Property;
41-
import org.hibernate.mapping.SimpleValue;
4241
import org.hibernate.service.ServiceRegistry;
4342
import org.hibernate.tool.api.export.Exporter;
4443
import org.hibernate.tool.api.export.ExporterConstants;
@@ -49,6 +48,7 @@
4948
import org.hibernate.tool.hbm2ddl.SchemaValidator;
5049
import org.hibernate.tool.internal.export.hbm.HbmExporter;
5150
import org.hibernate.tool.internal.metadata.NativeMetadataDescriptor;
51+
import org.hibernate.tool.internal.reveng.util.EnhancedValue;
5252
import org.hibernate.tools.test.util.HibernateUtil;
5353
import org.hibernate.tools.test.util.JavaUtil;
5454
import org.hibernate.tools.test.util.JdbcUtil;
@@ -112,7 +112,7 @@ public void testOneToOneSingleColumnBiDirectional() {
112112
@Test
113113
public void testAddressWithForeignKeyGeneration() {
114114
PersistentClass address = metadata.getEntityBinding("AddressPerson");
115-
assertEquals("foreign", ((SimpleValue)address.getIdentifier()).getIdentifierGeneratorStrategy());
115+
assertEquals("foreign", ((EnhancedValue)address.getIdentifier()).getIdentifierGeneratorStrategy());
116116
}
117117

118118
@Test

‎test/common/src/main/java/org/hibernate/tool/jdbc2cfg/OverrideBinder/TestCase.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.hibernate.tool.internal.reveng.strategy.OverrideRepository;
5050
import org.hibernate.tool.internal.reveng.strategy.SQLTypeMapping;
5151
import org.hibernate.tool.internal.reveng.strategy.TableFilter;
52+
import org.hibernate.tool.internal.reveng.util.EnhancedValue;
5253
import org.hibernate.tools.test.util.HibernateUtil;
5354
import org.hibernate.tools.test.util.JdbcUtil;
5455
import org.junit.jupiter.api.AfterEach;
@@ -259,20 +260,20 @@ public void testIdGenerator() {
259260

260261
// applied
261262
PersistentClass classMapping = metadata.getEntityBinding("Orders");
262-
SimpleValue sv = (SimpleValue) classMapping.getIdentifier();
263-
assertEquals("CustomOID", ((Component)sv).getComponentClassName());
263+
EnhancedValue ev = (EnhancedValue) classMapping.getIdentifier();
264+
assertEquals("CustomOID", ((Component)ev).getComponentClassName());
264265

265266
assertEquals(2,classMapping.getIdentifierProperty().getColumnSpan());
266267

267268
Property identifierProperty = classMapping.getIdentifierProperty();
268269
assertEquals("customOrderId", identifierProperty.getName());
269270

270271
classMapping = metadata.getEntityBinding("MiscTypes");
271-
sv = (SimpleValue) classMapping.getIdentifier();
272-
assertEquals("sequence", sv.getIdentifierGeneratorStrategy()); // will fail if default schema is not set since then there is no match in the override binder
272+
ev = (EnhancedValue) classMapping.getIdentifier();
273+
assertEquals("sequence", ev.getIdentifierGeneratorStrategy()); // will fail if default schema is not set since then there is no match in the override binder
273274

274-
assertNotNull(sv.getIdentifierGeneratorProperties());
275-
assertEquals("seq_table", sv.getIdentifierGeneratorProperties().getProperty("table"));
275+
assertNotNull(ev.getIdentifierGeneratorProperties());
276+
assertEquals("seq_table", ev.getIdentifierGeneratorProperties().getProperty("table"));
276277

277278
}
278279

‎test/mssql/src/test/java/org/hibernate/tool/jdbc2cfg/Identity/TestCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
import org.hibernate.boot.Metadata;
2828
import org.hibernate.mapping.PersistentClass;
29-
import org.hibernate.mapping.SimpleValue;
3029
import org.hibernate.tool.api.metadata.MetadataDescriptorFactory;
30+
import org.hibernate.tool.internal.reveng.util.EnhancedValue;
3131
import org.hibernate.tools.test.util.JdbcUtil;
3232
import org.junit.jupiter.api.AfterEach;
3333
import org.junit.jupiter.api.BeforeEach;
@@ -63,7 +63,7 @@ public void testIdentity() throws SQLException {
6363
assertNotNull(classMapping);
6464
assertEquals(
6565
"identity",
66-
((SimpleValue)classMapping
66+
((EnhancedValue)classMapping
6767
.getIdentifierProperty()
6868
.getValue())
6969
.getIdentifierGeneratorStrategy());
@@ -77,7 +77,7 @@ public void testGuid() throws SQLException {
7777
assertNotNull(classMapping);
7878
assertEquals(
7979
"guid",
80-
((SimpleValue)classMapping
80+
((EnhancedValue)classMapping
8181
.getIdentifierProperty()
8282
.getValue())
8383
.getIdentifierGeneratorStrategy());

‎test/oracle/src/test/java/org/hibernate/tool/jdbc2cfg/Identity/TestCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
import org.hibernate.boot.Metadata;
2828
import org.hibernate.mapping.PersistentClass;
29-
import org.hibernate.mapping.SimpleValue;
3029
import org.hibernate.tool.api.metadata.MetadataDescriptorFactory;
30+
import org.hibernate.tool.internal.reveng.util.EnhancedValue;
3131
import org.hibernate.tools.test.util.JdbcUtil;
3232
import org.junit.jupiter.api.AfterEach;
3333
import org.junit.jupiter.api.BeforeEach;
@@ -64,15 +64,15 @@ public void testIdentity() throws SQLException {
6464
assertNotNull(classMapping);
6565
assertEquals(
6666
"identity",
67-
((SimpleValue)classMapping
67+
((EnhancedValue)classMapping
6868
.getIdentifierProperty()
6969
.getValue())
7070
.getIdentifierGeneratorStrategy());
7171

7272
classMapping = metadata.getEntityBinding("Noautoinc");
7373
assertEquals(
7474
"assigned",
75-
((SimpleValue)classMapping
75+
((EnhancedValue)classMapping
7676
.getIdentifierProperty()
7777
.getValue())
7878
.getIdentifierGeneratorStrategy());

0 commit comments

Comments
 (0)