From 0fab6a4226b2e11f5a7026cb081fd122ed6c70a8 Mon Sep 17 00:00:00 2001 From: Lukasz Antoniak Date: Wed, 6 Nov 2013 21:31:30 +0100 Subject: [PATCH] HHH-8497 - Fix and test --- .../envers/entities/TypeContributorImpl.java | 3 +- .../ClassicQueryTranslatorFactoryTest.java | 43 +++++++++++++++++++ .../envers/test/integration/basic/Simple.java | 9 ++-- 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/TypeContributorImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/TypeContributorImpl.java index 89be489d49..cb66a0a659 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/TypeContributorImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/TypeContributorImpl.java @@ -20,6 +20,7 @@ */ package org.hibernate.envers.entities; +import org.hibernate.envers.RevisionType; import org.hibernate.metamodel.spi.TypeContributions; import org.hibernate.metamodel.spi.TypeContributor; import org.hibernate.service.ServiceRegistry; @@ -32,7 +33,7 @@ public class TypeContributorImpl implements TypeContributor { @Override public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) { typeContributions.contributeType( new RevisionTypeType(), - new String[] { RevisionTypeType.class.getName() } ); + new String[] { RevisionType.class.getName() } ); } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java new file mode 100644 index 0000000000..96baa4f113 --- /dev/null +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java @@ -0,0 +1,43 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2013, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.test.integration.basic; + +import java.util.Map; + +import org.hibernate.cfg.Environment; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; + +import org.hibernate.testing.TestForIssue; + +/** + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +@TestForIssue(jiraKey = "HHH-8497") +public class ClassicQueryTranslatorFactoryTest extends Simple { + @Override + protected void addConfigOptions(Map options) { + super.addConfigOptions( options ); + options.put( Environment.QUERY_TRANSLATOR, ClassicQueryTranslatorFactory.class.getName() ); + } +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java index 07125f3447..9b605d6393 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java @@ -26,6 +26,7 @@ package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; +import org.junit.Assert; import org.junit.Test; import org.hibernate.ejb.Ejb3Configuration; @@ -61,7 +62,7 @@ public class Simple extends BaseEnversJPAFunctionalTestCase { @Test public void testRevisionsCounts() { - assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(IntTestEntity.class, id1)); + Assert.assertEquals( Arrays.asList( 1, 2 ), getAuditReader().getRevisions( IntTestEntity.class, id1 ) ); } @Test @@ -69,7 +70,7 @@ public class Simple extends BaseEnversJPAFunctionalTestCase { IntTestEntity ver1 = new IntTestEntity(10, id1); IntTestEntity ver2 = new IntTestEntity(20, id1); - assert getAuditReader().find(IntTestEntity.class, id1, 1).equals(ver1); - assert getAuditReader().find(IntTestEntity.class, id1, 2).equals(ver2); + Assert.assertEquals( ver1, getAuditReader().find( IntTestEntity.class, id1, 1 ) ); + Assert.assertEquals( ver2, getAuditReader().find( IntTestEntity.class, id1, 2 ) ); } -} \ No newline at end of file +}