Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HHH-11901 - Fix audited collections that contain null values.
(cherry picked from commit 2977d8f)
- Loading branch information
Showing
6 changed files
with
239 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
...c/test/java/org/hibernate/envers/test/integration/collection/CollectionNullValueTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * License: GNU Lesser General Public License (LGPL), version 2.1 or later. | ||
| * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. | ||
| */ | ||
| package org.hibernate.envers.test.integration.collection; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; | ||
| import org.hibernate.envers.test.Priority; | ||
| import org.hibernate.envers.test.entities.collection.StringListEntity; | ||
| import org.hibernate.envers.test.entities.collection.StringMapEntity; | ||
| import org.hibernate.envers.test.entities.collection.StringSetEntity; | ||
| import org.hibernate.envers.test.tools.TestTools; | ||
| import org.junit.Test; | ||
|
|
||
| import org.hibernate.testing.TestForIssue; | ||
|
|
||
| import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; | ||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| /** | ||
| * @author Chris Cranford | ||
| */ | ||
| @TestForIssue(jiraKey = "HHH-11901") | ||
| public class CollectionNullValueTest extends BaseEnversJPAFunctionalTestCase { | ||
| private Integer mapId; | ||
| private Integer listId; | ||
| private Integer setId; | ||
|
|
||
| @Override | ||
| protected Class<?>[] getAnnotatedClasses() { | ||
| return new Class<?>[] { StringMapEntity.class, StringListEntity.class, StringSetEntity.class }; | ||
| } | ||
|
|
||
| @Test | ||
| @Priority(10) | ||
| public void initData() { | ||
| // Persist map with null values | ||
| mapId = doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringMapEntity sme = new StringMapEntity(); | ||
| sme.getStrings().put( "A", "B" ); | ||
| sme.getStrings().put( "B", null ); | ||
| entityManager.persist( sme ); | ||
|
|
||
| return sme.getId(); | ||
| } ); | ||
|
|
||
| // Update map with null values | ||
| doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringMapEntity sme = entityManager.find( StringMapEntity.class, mapId ); | ||
| sme.getStrings().put( "C", null ); | ||
| sme.getStrings().put( "D", "E" ); | ||
| sme.getStrings().remove( "A" ); | ||
| entityManager.merge( sme ); | ||
| } ); | ||
|
|
||
| // Persist list with null values | ||
| listId = doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringListEntity sle = new StringListEntity(); | ||
| sle.getStrings().add( "A" ); | ||
| sle.getStrings().add( null ); | ||
| entityManager.persist( sle ); | ||
|
|
||
| return sle.getId(); | ||
| } ); | ||
|
|
||
| // Update list with null values | ||
| doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringListEntity sle = entityManager.find( StringListEntity.class, listId ); | ||
| sle.getStrings().add( null ); | ||
| sle.getStrings().add( "D" ); | ||
| sle.getStrings().remove( "A" ); | ||
| entityManager.merge( sle ); | ||
| } ); | ||
|
|
||
| // Persist set with null values | ||
| setId = doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringSetEntity sse = new StringSetEntity(); | ||
| sse.getStrings().add( "A" ); | ||
| sse.getStrings().add( null ); | ||
| entityManager.persist( sse ); | ||
|
|
||
| return sse.getId(); | ||
| } ); | ||
|
|
||
| // Update set with null values | ||
| doInJPA( this::entityManagerFactory, entityManager -> { | ||
| final StringSetEntity sse = entityManager.find( StringSetEntity.class, setId ); | ||
| sse.getStrings().add( null ); | ||
| sse.getStrings().add( "D" ); | ||
| sse.getStrings().remove( "A" ); | ||
| entityManager.merge( sse ); | ||
| } ); | ||
| } | ||
|
|
||
| @Test | ||
| public void testStringMapHistory() { | ||
| final List<Number> revisions = getAuditReader().getRevisions( StringMapEntity.class, mapId ); | ||
| assertEquals( Arrays.asList( 1, 2 ), revisions ); | ||
|
|
||
| final StringMapEntity rev1 = getAuditReader().find( StringMapEntity.class, mapId, 1 ); | ||
| assertEquals( TestTools.makeMap( "A", "B" ), rev1.getStrings() ); | ||
|
|
||
| final StringMapEntity rev2 = getAuditReader().find( StringMapEntity.class, mapId, 2 ); | ||
| assertEquals( TestTools.makeMap( "D", "E" ), rev2.getStrings() ); | ||
| } | ||
|
|
||
| @Test | ||
| public void testStringListHistory() { | ||
| final List<Number> revisions = getAuditReader().getRevisions( StringListEntity.class, listId ); | ||
| assertEquals( Arrays.asList( 3, 4 ), revisions ); | ||
|
|
||
| final StringListEntity rev3 = getAuditReader().find( StringListEntity.class, listId, 3 ); | ||
| assertEquals( TestTools.makeList( "A" ), rev3.getStrings() ); | ||
|
|
||
| // NOTE: the only reason this assertion expects a null element is because the collection is indexed. | ||
| // ORM will return a list that consists of { null, "D" } and Envers should effectively mimic that. | ||
| final StringListEntity rev4 = getAuditReader().find( StringListEntity.class, listId, 4 ); | ||
| assertEquals( TestTools.makeList( null, "D" ), rev4.getStrings() ); | ||
| } | ||
|
|
||
| @Test | ||
| public void testStringSetHistory() { | ||
| final List<Number> revisions = getAuditReader().getRevisions( StringSetEntity.class, setId ); | ||
| assertEquals( Arrays.asList( 5, 6 ), revisions ); | ||
|
|
||
| final StringSetEntity rev5 = getAuditReader().find( StringSetEntity.class, setId, 5 ); | ||
| assertEquals( TestTools.makeSet( "A" ), rev5.getStrings() ); | ||
|
|
||
| final StringSetEntity rev6 = getAuditReader().find( StringSetEntity.class, setId, 6 ); | ||
| assertEquals( TestTools.makeSet( "D" ), rev6.getStrings() ); | ||
| } | ||
|
|
||
| } |