Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default charset testing for JDK21

This commit is contained in:
Christian Beikov 2023-03-06 14:00:26 +01:00
parent f9bc29f484
commit 07be7731f4
1 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java
View File

@ -6,26 +6,17 @@
*/ */
package org.hibernate.orm.test.bootstrap.binding.naming; package org.hibernate.orm.test.bootstrap.binding.naming;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.NamingHelper; import org.hibernate.boot.model.naming.NamingHelper;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.testing.util.ReflectionUtil;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExternalResource;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
public class NamingHelperTest extends BaseUnitTestCase { public class NamingHelperTest extends BaseUnitTestCase {
@Rule
public DefaultCharset defaultCharset = new DefaultCharset();
@Test @Test
@TestForIssue(jiraKey = "HHH-12357") @TestForIssue(jiraKey = "HHH-12357")
public void generateHashedFkName() { public void generateHashedFkName() {
@ -33,15 +24,11 @@ public class NamingHelperTest extends BaseUnitTestCase {
Identifier authorsDe = new Identifier( "Autoren", false ); Identifier authorsDe = new Identifier( "Autoren", false );
Identifier authorId = new Identifier( "autor_id", false ); Identifier authorId = new Identifier( "autor_id", false );
defaultCharset.set( StandardCharsets.ISO_8859_1 ); String fkNameLatin1 = NamingHelper.withCharset( "ISO-8859-1" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId );
String fkNameLatin1 = NamingHelper.INSTANCE.generateHashedFkName( "FK", booksDe, authorsDe, authorId );
assertEquals( "FKpvm24wh1qwbmx6xjcbc7uv5f7", fkNameLatin1 ); assertEquals( "FKpvm24wh1qwbmx6xjcbc7uv5f7", fkNameLatin1 );
defaultCharset.set( StandardCharsets.UTF_8 ); String fkNameUtf8 = NamingHelper.withCharset( "UTF8" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId );
String fkNameUtf8 = NamingHelper.INSTANCE.generateHashedFkName( "FK", booksDe, authorsDe, authorId );
assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameUtf8 ); assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameUtf8 );
} }
@ -53,37 +40,13 @@ public class NamingHelperTest extends BaseUnitTestCase {
Identifier authorsDe = new Identifier( "Autoren", false ); Identifier authorsDe = new Identifier( "Autoren", false );
Identifier authorId = new Identifier( "autor_id", false ); Identifier authorId = new Identifier( "autor_id", false );
defaultCharset.set( StandardCharsets.ISO_8859_1 );
String fkNameLatin1 = NamingHelper.withCharset( "UTF8" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId ); String fkNameLatin1 = NamingHelper.withCharset( "UTF8" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId );
assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameLatin1 ); assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameLatin1 );
defaultCharset.set( StandardCharsets.UTF_8 );
String fkNameUtf8 = NamingHelper.withCharset( "UTF8" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId ); String fkNameUtf8 = NamingHelper.withCharset( "UTF8" ).generateHashedFkName( "FK", booksDe, authorsDe, authorId );
assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameUtf8 ); assertEquals( "FKdgopp1hqnm8c1o6sfbb3tbeh", fkNameUtf8 );
} }
public static class DefaultCharset extends ExternalResource {
private Charset prev;
@Override
protected void before() {
prev = ReflectionUtil.getStaticFieldValue( Charset.class, "defaultCharset" );
}
@Override
protected void after() {
set( prev );
}
public void set(Charset charset) {
ReflectionUtil.setStaticField( Charset.class, "defaultCharset", charset );
}
}
} }