HHH-6446 removed @FailureExpectedWithNewMetamodel annotations

This commit is contained in:
Brett Meyer 2013-08-28 11:08:58 -04:00
parent 479bc0bb5a
commit 3154756789
5 changed files with 6 additions and 18 deletions

View File

@ -23,14 +23,12 @@
*/ */
package org.hibernate.test.multitenancy.schema; package org.hibernate.test.multitenancy.schema;
import org.junit.Assert;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver; import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.junit.Assert;
/** /**
* SessionFactory has to use the {@link CurrentTenantIdentifierResolver} when * SessionFactory has to use the {@link CurrentTenantIdentifierResolver} when
@ -40,7 +38,6 @@ import org.hibernate.testing.TestForIssue;
* @author Steve Ebersole * @author Steve Ebersole
*/ */
@TestForIssue(jiraKey = "HHH-7306") @TestForIssue(jiraKey = "HHH-7306")
@FailureExpectedWithNewMetamodel(message = "Needs updated to remove Configuration uses.")
public class CurrentTenantResolverMultiTenancyTest extends SchemaBasedMultiTenancyTest { public class CurrentTenantResolverMultiTenancyTest extends SchemaBasedMultiTenancyTest {
private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver(); private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver();

View File

@ -26,11 +26,6 @@ package org.hibernate.test.multitenancy.schema;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.MultiTenancyStrategy; import org.hibernate.MultiTenancyStrategy;
import org.hibernate.Session; import org.hibernate.Session;
@ -44,17 +39,19 @@ import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.mapping.RootClass; import org.hibernate.mapping.RootClass;
import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.cache.CachingRegionFactory;
import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.env.ConnectionProviderBuilder;
import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.tool.hbm2ddl.ConnectionHelper; import org.hibernate.tool.hbm2ddl.ConnectionHelper;
import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
/** /**
* @author Steve Ebersole * @author Steve Ebersole
*/ */
@FailureExpectedWithNewMetamodel(message = "Needs updated to remove Configuration uses.")
public class SchemaBasedMultiTenancyTest extends BaseUnitTestCase { public class SchemaBasedMultiTenancyTest extends BaseUnitTestCase {
private DriverManagerConnectionProviderImpl acmeProvider; private DriverManagerConnectionProviderImpl acmeProvider;
private DriverManagerConnectionProviderImpl jbossProvider; private DriverManagerConnectionProviderImpl jbossProvider;

View File

@ -30,13 +30,12 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.ServiceRegistryBuilder;
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.tool.hbm2ddl.UniqueConstraintSchemaUpdateStrategy;
import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.hbm2ddl.SchemaUpdate;
import org.hibernate.tool.hbm2ddl.UniqueConstraintSchemaUpdateStrategy;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -45,7 +44,6 @@ import org.junit.Test;
* @author Max Rydahl Andersen * @author Max Rydahl Andersen
* @author Brett Meyer * @author Brett Meyer
*/ */
@FailureExpectedWithNewMetamodel(message = "Needs updated to remove Configuration uses.")
public class MigrationTest extends BaseUnitTestCase { public class MigrationTest extends BaseUnitTestCase {
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;

View File

@ -24,13 +24,11 @@
package org.hibernate.test.schemaupdate; package org.hibernate.test.schemaupdate;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport;
/** /**
* @author Gail Badner * @author Gail Badner
*/ */
@FailureExpectedWithNewMetamodel(message = "Needs updated to remove Configuration uses.")
public class SchemaExportManagedConnectionTest extends SchemaExportTest { public class SchemaExportManagedConnectionTest extends SchemaExportTest {
@Override @Override
protected SchemaExport createSchemaExport(Configuration cfg) { protected SchemaExport createSchemaExport(Configuration cfg) {

View File

@ -24,13 +24,11 @@
package org.hibernate.test.schemaupdate; package org.hibernate.test.schemaupdate;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport;
/** /**
* @author Gail Badner * @author Gail Badner
*/ */
@FailureExpectedWithNewMetamodel(message = "Needs updated to remove Configuration uses.")
public class SchemaExportSuppliedConnectionTest extends SchemaExportTest { public class SchemaExportSuppliedConnectionTest extends SchemaExportTest {
@Override @Override