HHH-7664 5.0.0 unit test clean-up

This commit is contained in:
brmeyer 2012-10-02 10:44:20 -04:00
parent 8e4f487003
commit c73162270a
11 changed files with 36 additions and 67 deletions

View File

@ -23,25 +23,22 @@
*/
package org.hibernate.test.annotations.access;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
/**
* @author Emmanuel Bernard
*/
public class AccessTest extends BaseCoreFunctionalTestCase {
@Test
@FailureExpectedWithNewMetamodel
public void testSuperclassOverriding() throws Exception {
Furniture fur = new Furniture();
fur.setColor( "Black" );
@ -62,7 +59,6 @@ public class AccessTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testSuperclassNonOverriding() throws Exception {
Furniture fur = new Furniture();
fur.setGod( "Buddha" );
@ -80,7 +76,6 @@ public class AccessTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testPropertyOverriding() throws Exception {
Furniture fur = new Furniture();
fur.weight = 3;
@ -98,7 +93,6 @@ public class AccessTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testNonOverridenSubclass() throws Exception {
Chair chair = new Chair();
chair.setPillow( "Blue" );
@ -116,7 +110,6 @@ public class AccessTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testOverridenSubclass() throws Exception {
BigBed bed = new BigBed();
bed.size = 5;

View File

@ -23,6 +23,9 @@
*/
package org.hibernate.test.annotations.dataTypes;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@ -30,27 +33,21 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.jdbc.Work;
import org.hibernate.testing.DialectCheck;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.type.descriptor.JdbcTypeNameMapper;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* @author Steve Ebersole
*/
@RequiresDialectFeature(value = {DialectChecks.SupportsExpectedLobUsagePattern.class, BasicOperationsTest.OracleDialectChecker.class}, jiraKey = "HHH-6834")
@FailureExpectedWithNewMetamodel
public class BasicOperationsTest extends BaseCoreFunctionalTestCase {
private static final String SOME_ENTITY_TABLE_NAME = "SOMEENTITY";

View File

@ -40,7 +40,6 @@ import static org.junit.Assert.assertTrue;
/**
* @author Emmanuel Bernard
*/
@FailureExpectedWithNewMetamodel
public class FetchingTest extends BaseCoreFunctionalTestCase {
@Test
public void testLazy() throws Exception {
@ -64,6 +63,7 @@ public class FetchingTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testExtraLazy() throws Exception {
Session s;
Transaction tx;
@ -89,6 +89,7 @@ public class FetchingTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testHibernateFetchingLazy() throws Exception {
Session s;
Transaction tx;

View File

@ -24,23 +24,20 @@
*/
package org.hibernate.test.annotations.fetchprofile;
import java.util.Date;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import java.util.Date;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* @author Emmanuel Bernard
* @author Hardy Ferentschik
*/
@FailureExpectedWithNewMetamodel
public class MoreFetchProfileTest extends BaseCoreFunctionalTestCase {
@Test
public void testFetchWithTwoOverrides() throws Exception {

View File

@ -22,17 +22,15 @@
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.collection.bag;
import java.util.ArrayList;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import java.util.ArrayList;
import org.hibernate.Session;
import org.hibernate.collection.internal.PersistentBag;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* Tests related to operations on a PersistentBag.
@ -46,7 +44,6 @@ public class PersistentBagTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testWriteMethodDirtying() {
BagOwner parent = new BagOwner( "root" );
BagOwner child = new BagOwner( "c1" );

View File

@ -23,6 +23,10 @@
*/
package org.hibernate.test.collection.list;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -31,8 +35,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.collection.internal.PersistentList;
import org.hibernate.jdbc.Work;
@ -40,13 +42,9 @@ import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.collection.QueryableCollection;
import org.hibernate.sql.SimpleSelect;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* Tests related to operations on a PersistentList
@ -122,7 +120,6 @@ public class PersistentListTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testWriteMethodDirtying() {
ListOwner parent = new ListOwner( "root" );
ListOwner child = new ListOwner( "c1" );

View File

@ -40,7 +40,6 @@ import static org.junit.Assert.assertTrue;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase {
private static final String INITIAL_NAME = "thing 1";
private static final String SUBSEQUENT_NAME = "thing 2";
@ -57,6 +56,7 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testOnlyCustomStrategy() {
Session session = openSession();
session.beginTransaction();

View File

@ -23,11 +23,9 @@
*/
package org.hibernate.test.reattachment;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
/**
* Test of collection reattachment semantics
@ -41,7 +39,6 @@ public class CollectionReattachmentTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testUpdateOwnerAfterClear() {
Session s = openSession();
s.beginTransaction();
@ -69,7 +66,6 @@ public class CollectionReattachmentTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testUpdateOwnerAfterEvict() {
Session s = openSession();
s.beginTransaction();

View File

@ -23,17 +23,16 @@
*/
package org.hibernate.test.reattachment;
import static org.junit.Assert.assertEquals;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* Test of proxy reattachment semantics
@ -47,7 +46,6 @@ public class ProxyReattachmentTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testUpdateAfterEvict() {
Session s = openSession();
s.beginTransaction();
@ -74,7 +72,6 @@ public class ProxyReattachmentTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testUpdateAfterClear() {
Session s = openSession();
s.beginTransaction();

View File

@ -23,6 +23,8 @@
*/
package org.hibernate.test.sql.autodiscovery;
import static org.junit.Assert.assertEquals;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -30,21 +32,16 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.jdbc.Work;
import org.hibernate.loader.custom.NonUniqueDiscoveredSqlAliasException;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import org.junit.Assert;
import org.junit.Test;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class AutoDiscoveryTest extends BaseCoreFunctionalTestCase {
private static final String QUERY_STRING =
"select u.name as username, g.name as groupname, m.joindate " +

View File

@ -23,28 +23,25 @@
*/
package org.hibernate.test.typeparameters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.jdbc.Work;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* Test for parameterizable types.
*
* @author Michael Gloegl
*/
@FailureExpectedWithNewMetamodel
public class TypeParameterTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {