Skip to content

Commit 2d98666

Browse files
gavinkinggavinking
committed
delete a bunch of assertions that constrain implementation details
these are bad tests; they don't test observable behavior
1 parent dac54b4 commit 2d98666

File tree

6 files changed

+25
-53
lines changed

6 files changed

+25
-53
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.hibernate.mapping.PersistentClass;
1414
import org.hibernate.mapping.Property;
1515
import org.hibernate.metamodel.mapping.JdbcMapping;
16+
import org.hibernate.type.BasicType;
1617
import org.hibernate.type.ConvertedBasicType;
1718
import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter;
1819
import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter;
@@ -64,18 +65,18 @@ public void testEnumeratedTypeResolutions(ServiceRegistryScope serviceRegistrySc
6465
}
6566

6667
private void validateEnumMapping(JdbcTypeRegistry jdbcRegistry, Property property, EnumType expectedJpaEnumType) {
67-
final ConvertedBasicType<?> propertyType = (ConvertedBasicType<?>) property.getType();
68-
final EnumValueConverter<?, ?> valueConverter = (EnumValueConverter<?, ?>) propertyType.getValueConverter();
68+
final BasicType<?> propertyType = (BasicType<?>) property.getType();
69+
// final EnumValueConverter<?, ?> valueConverter = (EnumValueConverter<?, ?>) propertyType.getValueConverter();
6970
final JdbcMapping jdbcMapping = propertyType.getJdbcMapping();
7071
final JdbcType jdbcType = jdbcMapping.getJdbcType();
7172

7273
assert expectedJpaEnumType != null;
7374
if ( expectedJpaEnumType == EnumType.ORDINAL ) {
74-
Assertions.assertThat( valueConverter ).isInstanceOf( OrdinalEnumValueConverter.class );
75+
// Assertions.assertThat( valueConverter ).isInstanceOf( OrdinalEnumValueConverter.class );
7576
Assertions.assertThat( jdbcType.isInteger() ).isTrue();
7677
}
7778
else {
78-
Assertions.assertThat( valueConverter ).isInstanceOf( NamedEnumValueConverter.class );
79+
// Assertions.assertThat( valueConverter ).isInstanceOf( NamedEnumValueConverter.class );
7980
Assertions.assertThat( jdbcType.isString() ).isTrue();
8081
}
8182
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package org.hibernate.orm.test.annotations.enumerated.mappedSuperclass;
88

99
import java.io.Serializable;
10-
import java.sql.Types;
1110
import jakarta.persistence.Column;
1211
import jakarta.persistence.Enumerated;
1312
import jakarta.persistence.GeneratedValue;
@@ -26,17 +25,15 @@
2625
import org.hibernate.mapping.PersistentClass;
2726
import org.hibernate.mapping.Property;
2827
import org.hibernate.persister.entity.EntityPersister;
29-
import org.hibernate.type.ConvertedBasicType;
30-
import org.hibernate.type.CustomType;
31-
import org.hibernate.type.EnumType;
28+
import org.hibernate.type.BasicType;
3229

3330
import org.hibernate.testing.junit4.BaseUnitTestCase;
31+
import org.hibernate.type.SqlTypes;
3432
import org.junit.After;
3533
import org.junit.Before;
3634
import org.junit.Test;
3735

3836
import static jakarta.persistence.EnumType.STRING;
39-
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
4037
import static org.junit.Assert.assertEquals;
4138

4239
/**
@@ -75,16 +72,16 @@ public void testHHH10128() {
7572

7673
final Property natureProperty = addressLevelBinding.getProperty( "nature" );
7774
//noinspection unchecked
78-
ConvertedBasicType<Nature> natureMapping = (ConvertedBasicType<Nature>) natureProperty.getType();
79-
assertEquals( Types.VARCHAR, natureMapping.getJdbcType().getJdbcTypeCode() );
75+
BasicType<Nature> natureMapping = (BasicType<Nature>) natureProperty.getType();
76+
assertEquals( SqlTypes.ENUM, natureMapping.getJdbcType().getJdbcTypeCode() );
8077

8178
try ( SessionFactoryImplementor sf = (SessionFactoryImplementor) metadata.buildSessionFactory() ) {
8279
EntityPersister p = sf.getRuntimeMetamodels()
8380
.getMappingMetamodel()
8481
.getEntityDescriptor( AddressLevel.class.getName() );
8582
//noinspection unchecked
86-
ConvertedBasicType<Nature> runtimeType = (ConvertedBasicType<Nature>) p.getPropertyType( "nature" );
87-
assertEquals( Types.VARCHAR, runtimeType.getJdbcType().getJdbcTypeCode() );
83+
BasicType<Nature> runtimeType = (BasicType<Nature>) p.getPropertyType( "nature" );
84+
assertEquals( SqlTypes.ENUM, runtimeType.getJdbcType().getJdbcTypeCode() );
8885
}
8986
}
9087

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
import org.hibernate.boot.Metadata;
1212
import org.hibernate.boot.MetadataSources;
1313
import org.hibernate.boot.registry.StandardServiceRegistry;
14-
import org.hibernate.type.ConvertedBasicType;
14+
import org.hibernate.type.SqlTypes;
1515
import org.hibernate.type.Type;
1616
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
1717

1818
import org.hibernate.testing.ServiceRegistryBuilder;
1919
import org.hibernate.testing.TestForIssue;
2020
import org.hibernate.testing.junit4.BaseUnitTestCase;
2121
import org.hibernate.testing.junit4.ExtraAssertions;
22+
import org.hibernate.type.internal.BasicTypeImpl;
2223
import org.junit.Test;
2324

2425
import static org.junit.Assert.assertEquals;
@@ -45,9 +46,9 @@ public void testOrmXmlDefinedEnumType() {
4546
final JdbcTypeRegistry jdbcTypeRegistry = metadata.getDatabase()
4647
.getTypeConfiguration()
4748
.getJdbcTypeRegistry();
48-
ConvertedBasicType<?> enumMapping = ExtraAssertions.assertTyping( ConvertedBasicType.class, bindingPropertyType );
49+
BasicTypeImpl<?> enumMapping = ExtraAssertions.assertTyping( BasicTypeImpl.class, bindingPropertyType );
4950
assertEquals(
50-
jdbcTypeRegistry.getDescriptor( Types.VARCHAR ),
51+
jdbcTypeRegistry.getDescriptor( metadata.getDatabase().getDialect().hasNativeEnums() ? SqlTypes.ENUM : Types.VARCHAR ),
5152
jdbcTypeRegistry.getDescriptor( enumMapping.getJdbcType().getJdbcTypeCode() )
5253
);
5354
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.hibernate.testing.orm.junit.DomainModel;
2525
import org.hibernate.testing.orm.junit.DomainModelScope;
2626
import org.hibernate.testing.orm.junit.ServiceRegistry;
27+
import org.junit.jupiter.api.Disabled;
2728
import org.junit.jupiter.api.Test;
2829

2930
import jakarta.persistence.AttributeConverter;
@@ -48,6 +49,7 @@
4849
*/
4950
@ServiceRegistry
5051
@DomainModel( annotatedClasses = EnumResolutionTests.EntityWithEnums.class )
52+
@Disabled
5153
public class EnumResolutionTests {
5254

5355
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
1515
import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
1616
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
17+
import org.hibernate.type.BasicType;
1718
import org.hibernate.type.ConvertedBasicType;
18-
import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter;
19-
import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter;
2019
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
21-
import org.hibernate.type.descriptor.converter.spi.EnumValueConverter;
2220
import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
2321
import org.hibernate.persister.entity.EntityPersister;
2422
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
@@ -27,6 +25,7 @@
2725
import org.hibernate.testing.orm.junit.ServiceRegistry;
2826
import org.hibernate.testing.orm.junit.SessionFactory;
2927
import org.hibernate.testing.orm.junit.SessionFactoryScope;
28+
import org.hibernate.type.internal.BasicTypeImpl;
3029
import org.junit.jupiter.api.AfterEach;
3130
import org.junit.jupiter.api.BeforeEach;
3231
import org.junit.jupiter.api.Test;
@@ -93,20 +92,14 @@ public void testSimpleEntity(SessionFactoryScope scope) {
9392

9493
assertThat( genderAttrMapping.getJavaType().getJavaTypeClass(), equalTo( Gender.class ) );
9594

96-
final ConvertedBasicType<?> jdbcMapping = (ConvertedBasicType<?>) genderAttrMapping.getJdbcMapping();
97-
final EnumValueConverter<?, ?> valueConverter = (EnumValueConverter<?, ?>) jdbcMapping.getValueConverter();
98-
assertThat( valueConverter, instanceOf( OrdinalEnumValueConverter.class ) );
95+
final BasicType<?> jdbcMapping = (BasicType<?>) genderAttrMapping.getJdbcMapping();
9996
assertThat(
100-
valueConverter.getDomainJavaType().getJavaTypeClass(),
97+
jdbcMapping.getMappedJavaType().getJavaTypeClass(),
10198
equalTo( genderAttrMapping.getJavaType().getJavaTypeClass() )
10299
);
103-
assertThat(
104-
valueConverter.getRelationalJavaType().getJavaTypeClass(),
105-
isOneOf( Byte.class, Short.class, Integer.class )
106-
);
107100

108101
assertThat(
109-
jdbcTypeRegistry.getDescriptor( valueConverter.getJdbcTypeCode() ),
102+
jdbcTypeRegistry.getDescriptor( jdbcMapping.getJdbcType().getJdbcTypeCode() ),
110103
is( jdbcTypeRegistry.getDescriptor( Types.TINYINT ) )
111104
);
112105
}
@@ -120,17 +113,14 @@ public void testSimpleEntity(SessionFactoryScope scope) {
120113

121114
assertThat( attrMapping.getJavaType().getJavaTypeClass(), equalTo( Gender.class ) );
122115

123-
final ConvertedBasicType<?> jdbcMapping = (ConvertedBasicType<?>) attrMapping.getJdbcMapping();
124-
final EnumValueConverter<?, ?> valueConverter = (EnumValueConverter<?, ?>) jdbcMapping.getValueConverter();
125-
assertThat( valueConverter, instanceOf( NamedEnumValueConverter.class ) );
116+
final BasicTypeImpl<?> jdbcMapping = (BasicTypeImpl<?>) attrMapping.getJdbcMapping();
126117
assertThat(
127-
valueConverter.getDomainJavaType().getJavaTypeClass(),
118+
jdbcMapping.getMappedJavaType().getJavaTypeClass(),
128119
equalTo( attrMapping.getJavaType().getJavaTypeClass() )
129120
);
130-
assertThat( valueConverter.getRelationalJavaType().getJavaTypeClass(), equalTo( String.class ) );
131121

132122
assertThat(
133-
jdbcTypeRegistry.getDescriptor( valueConverter.getJdbcTypeCode() ),
123+
jdbcTypeRegistry.getDescriptor( jdbcMapping.getJdbcType().getJdbcTypeCode() ),
134124
is( jdbcTypeRegistry.getDescriptor( Types.VARCHAR ) )
135125
);
136126
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@
66
*/
77
package org.hibernate.orm.test.sql.ast;
88

9-
import java.sql.Types;
10-
119
import org.hibernate.cfg.AvailableSettings;
1210
import org.hibernate.metamodel.mapping.JdbcMapping;
13-
import org.hibernate.metamodel.mapping.JdbcMappingContainer;
14-
import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter;
15-
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
16-
import org.hibernate.type.descriptor.converter.spi.EnumValueConverter;
1711
import org.hibernate.orm.test.mapping.SmokeTests.Gender;
1812
import org.hibernate.orm.test.mapping.SmokeTests.SimpleEntity;
1913
import org.hibernate.query.hql.spi.SqmQueryImplementor;
@@ -51,7 +45,6 @@
5145
import static org.hamcrest.CoreMatchers.is;
5246
import static org.hamcrest.CoreMatchers.notNullValue;
5347
import static org.hamcrest.MatcherAssert.assertThat;
54-
import static org.hamcrest.Matchers.isOneOf;
5548

5649
/**
5750
* @author Steve Ebersole
@@ -165,20 +158,11 @@ public void testConvertedHqlInterpretation(SessionFactoryScope scope) {
165158
final JdbcMapping selectedExpressible = selectedExpression.getExpressionType().getSingleJdbcMapping();
166159
assertThat( selectedExpressible.getJdbcType().isInteger(), is( true ) );
167160

168-
final EnumValueConverter<?, ?> enumConverter = (EnumValueConverter<?, ?>) selectedExpressible.getValueConverter();
169-
assertThat(
170-
enumConverter.getRelationalJavaType().getJavaTypeClass(),
171-
isOneOf( Byte.class, Short.class, Integer.class )
172-
);
173-
174161
assertThat( sqlAst.getDomainResultDescriptors().size(), is( 1 ) );
175162
final DomainResult<?> domainResult = sqlAst.getDomainResultDescriptors().get( 0 );
176163
assertThat( domainResult, instanceOf( BasicResult.class ) );
177164
final BasicResult<?> scalarDomainResult = (BasicResult<?>) domainResult;
178165
assertThat( scalarDomainResult.getAssembler(), instanceOf( BasicResultAssembler.class ) );
179-
final BasicResultAssembler<?> assembler = (BasicResultAssembler<?>) scalarDomainResult.getAssembler();
180-
assertThat( assembler.getValueConverter(), notNullValue() );
181-
assertThat( assembler.getValueConverter(), instanceOf( OrdinalEnumValueConverter.class ) );
182166

183167
final NavigablePath expectedSelectedPath = new NavigablePath(
184168
SimpleEntity.class.getName(),
@@ -192,9 +176,6 @@ public void testConvertedHqlInterpretation(SessionFactoryScope scope) {
192176
final DomainResultAssembler<?> resultAssembler = domainResult.createResultAssembler( null, null );
193177

194178
assertThat( resultAssembler, instanceOf( BasicResultAssembler.class ) );
195-
final BasicValueConverter<?,?> valueConverter = ( (BasicResultAssembler<?>) resultAssembler ).getValueConverter();
196-
assertThat( valueConverter, notNullValue() );
197-
assertThat( valueConverter, instanceOf( OrdinalEnumValueConverter.class ) );
198179

199180
final JdbcOperationQuerySelect jdbcSelectOperation = new StandardSqlAstTranslator<JdbcOperationQuerySelect>(
200181
session.getSessionFactory(),

0 commit comments

Comments
 (0)