[hibernate-commits] Hibernate SVN: r15551 - in core/trunk/envers/src: test/java/org/hibernate/envers/test and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: adamw
Date: 2008-11-12 07:28:54 -0500 (Wed, 12 Nov 2008)
New Revision: 15551

Added:
   core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java
Modified:
   core/trunk/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java
   core/trunk/envers/src/test/java/org/hibernate/envers/test/
Log:
HHH-3594: bug fix with test

Modified: core/trunk/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java
===================================================================
--- core/trunk/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java	2008-11-12 11:03:15 UTC (rev 15550)
+++ core/trunk/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java	2008-11-12 12:28:54 UTC (rev 15551)
@@ -195,16 +195,23 @@
 
     public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
         CollectionEntry collectionEntry = getCollectionEntry(event);
-        onCollectionAction(event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry);
+        if (!collectionEntry.getLoadedPersister().isInverse()) {
+            onCollectionAction(event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry);
+        }
     }
 
     public void onPreRemoveCollection(PreCollectionRemoveEvent event) {
         CollectionEntry collectionEntry = getCollectionEntry(event);
-        onCollectionAction(event, null, collectionEntry.getSnapshot(), collectionEntry);
+        if (!collectionEntry.getLoadedPersister().isInverse()) {
+            onCollectionAction(event, null, collectionEntry.getSnapshot(), collectionEntry);
+        }
     }
 
     public void onPostRecreateCollection(PostCollectionRecreateEvent event) {
-        onCollectionAction(event, event.getCollection(), null, getCollectionEntry(event));
+        CollectionEntry collectionEntry = getCollectionEntry(event);
+        if (!collectionEntry.getLoadedPersister().isInverse()) {
+            onCollectionAction(event, event.getCollection(), null, collectionEntry);
+        }
     }
 
     @SuppressWarnings({"unchecked"})


Property changes on: core/trunk/envers/src/test/java/org/hibernate/envers/test
___________________________________________________________________
Name: svn:ignore
   + working


Copied: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java (from rev 15549, core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java)
===================================================================
--- core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java	                        (rev 0)
+++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java	2008-11-12 12:28:54 UTC (rev 15551)
@@ -0,0 +1,109 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC 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 Middleware LLC.
+ *
+ * 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.onetomany;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import javax.persistence.EntityManager;
+
+import org.hibernate.envers.test.AbstractEntityTest;
+import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity;
+import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity;
+import org.hibernate.envers.test.tools.TestTools;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.hibernate.ejb.Ejb3Configuration;
+
+/**
+ * @author Adam Warski (adam at warski dot org)
+ */
+public class InverseSideChanges extends AbstractEntityTest {
+    private Integer ed1_id;
+
+    private Integer ing1_id;
+
+    public void configure(Ejb3Configuration cfg) {
+        cfg.addAnnotatedClass(SetRefEdEntity.class);
+        cfg.addAnnotatedClass(SetRefIngEntity.class);
+    }
+
+    @BeforeClass(dependsOnMethods = "init")
+    public void initData() {
+        EntityManager em = getEntityManager();
+
+        SetRefEdEntity ed1 = new SetRefEdEntity(1, "data_ed_1");
+
+        SetRefIngEntity ing1 = new SetRefIngEntity(3, "data_ing_1");
+
+        // Revision 1
+        em.getTransaction().begin();
+
+        em.persist(ed1);
+
+        em.getTransaction().commit();
+
+        // Revision 2
+
+        em.getTransaction().begin();
+
+        ed1 = em.find(SetRefEdEntity.class, ed1.getId());
+        
+        em.persist(ing1);
+
+        ed1.setReffering(new HashSet<SetRefIngEntity>());
+        ed1.getReffering().add(ing1);
+
+        em.getTransaction().commit();
+
+        //
+
+        ed1_id = ed1.getId();
+
+        ing1_id = ing1.getId();
+    }
+
+    @Test
+    public void testRevisionsCounts() {
+        assert Arrays.asList(1).equals(getAuditReader().getRevisions(SetRefEdEntity.class, ed1_id));
+
+        assert Arrays.asList(2).equals(getAuditReader().getRevisions(SetRefIngEntity.class, ing1_id));
+    }
+
+    @Test
+    public void testHistoryOfEdId1() {
+        SetRefEdEntity rev1 = getAuditReader().find(SetRefEdEntity.class, ed1_id, 1);
+
+        assert rev1.getReffering().equals(Collections.EMPTY_SET);
+    }
+
+    @Test
+    public void testHistoryOfEdIng1() {
+        SetRefIngEntity rev2 = getAuditReader().find(SetRefIngEntity.class, ing1_id, 2);
+
+        assert rev2.getReference() == null;
+    }
+}
\ No newline at end of file


Property changes on: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java
___________________________________________________________________
Name: svn:mergeinfo
   +