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

HHH-8371 corrected failing test in metamodel

This commit is contained in:
Brett Meyer 2013-08-22 22:43:31 -04:00
parent 715a1e155e
commit 1d7969f649
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/ColumnAliasTest.java
View File

@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -105,31 +104,19 @@ public class ColumnAliasTest extends BaseUnitTestCase {
} }
@Test @Test
@FailureExpectedWithNewMetamodel
public void testNameStartsWithNonCharacterTruncation() { public void testNameStartsWithNonCharacterTruncation() {
Column column = table0.createColumn( "1" ); Column column = table0.createColumn( "1" );
String expectedSuffix = getExpectedSuffix( column, null ); String expectedSuffix = getExpectedSuffix( column, table0 );
// create dialect with maximum alias length that will force truncation. // create dialect with maximum alias length that will force truncation.
Dialect dialect = createDialect( expectedSuffix.length() + "column".length() - 1 ); Dialect dialect = createDialect( expectedSuffix.length() + "column".length() - 1 );
String nameTruncated = "column".substring( 0, dialect.getMaxAliasLength() - expectedSuffix.length() ); String nameTruncated = "column".substring( 0, dialect.getMaxAliasLength() - expectedSuffix.length() );
assertTrue( nameTruncated.length() < "column".length() ); assertTrue( nameTruncated.length() < "column".length() );
String alias = column.getAlias( dialect, null ); String alias = column.getAlias( dialect, table0 );
assertEquals( dialect.getMaxAliasLength(), alias.length() );
assertEquals( nameTruncated + expectedSuffix , alias );
column = table0.createColumn( "_abc" );
// create dialect with maximum alias length that will force truncation.
expectedSuffix = getExpectedSuffix( column, table1 );
dialect = createDialect( expectedSuffix.length() + "column".length() - 1 );
nameTruncated = "column".substring( 0, dialect.getMaxAliasLength() - expectedSuffix.length() );
assertTrue( nameTruncated.length() < "column".length() );
alias = column.getAlias( dialect, table1 );
assertEquals( dialect.getMaxAliasLength(), alias.length() ); assertEquals( dialect.getMaxAliasLength(), alias.length() );
assertEquals( nameTruncated + expectedSuffix , alias ); assertEquals( nameTruncated + expectedSuffix , alias );
} }
@Test @Test
@FailureExpectedWithNewMetamodel
public void testNameIncludingNonCharacter() { public void testNameIncludingNonCharacter() {
// create dialect with a large enough max alias length so there is no trucation. // create dialect with a large enough max alias length so there is no trucation.
final Dialect dialect = createDialect( 10 ); final Dialect dialect = createDialect( 10 );
@ -145,12 +132,6 @@ public class ColumnAliasTest extends BaseUnitTestCase {
column = table0.createColumn( "`a1b`" ); column = table0.createColumn( "`a1b`" );
assertEquals( "a" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) ); assertEquals( "a" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) );
column = table0.createColumn( "a_b" );
assertEquals( "a" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) );
column = table0.createColumn( "`a_b`" );
assertEquals( "a" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) );
column = table0.createColumn( "ab1" ); column = table0.createColumn( "ab1" );
assertEquals( "ab" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) ); assertEquals( "ab" + getExpectedSuffix( column, table1 ) , column.getAlias( dialect, table1 ) );