Skip to content

Commit 18d6a99

Browse files
committed
HHH-18929 fix a test that looks wrong
1 parent 3f92cfb commit 18d6a99

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ void testDiscriminatorValue(ServiceRegistryScope registryScope) {
3939

4040
{
4141
final ClassDetails rootClassDetails = classDetailsRegistry.getClassDetails( Root.class.getName() );
42-
assertThat( rootClassDetails.hasDirectAnnotationUsage( DiscriminatorValue.class ) ).isFalse();
42+
assertThat( rootClassDetails.hasDirectAnnotationUsage( DiscriminatorValue.class ) ).isTrue();
4343
assertThat( rootClassDetails.hasDirectAnnotationUsage( DiscriminatorFormula.class ) ).isFalse();
4444

4545
final DiscriminatorColumn discriminatorColumn = rootClassDetails.getDirectAnnotationUsage(
4646
DiscriminatorColumn.class );
4747
assertThat( discriminatorColumn ).isNotNull();
4848
assertThat( discriminatorColumn.name() ).isEqualTo( "TYPE_COLUMN" );
49-
assertThat( discriminatorColumn.discriminatorType() ).isEqualTo( DiscriminatorType.INTEGER );
49+
assertThat( discriminatorColumn.discriminatorType() ).isEqualTo( DiscriminatorType.CHAR );
5050

5151
final ClassDetails subClassDetails = classDetailsRegistry.getClassDetails( Sub.class.getName() );
5252
assertThat( subClassDetails.hasDirectAnnotationUsage( DiscriminatorColumn.class ) ).isFalse();

hibernate-core/src/test/resources/mappings/models/complete/discriminator-value.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
<entity class="Root" metadata-complete="true" access="FIELD">
1313
<inheritance strategy="JOINED"/>
14-
<discriminator-column name="TYPE_COLUMN" discriminator-type="INTEGER"/>
14+
<discriminator-value>P</discriminator-value>
15+
<discriminator-column name="TYPE_COLUMN" discriminator-type="CHAR"/>
1516
<attributes>
1617
<id name="id">
1718
<column name="pk"/>

0 commit comments

Comments
 (0)