[Openutils-svn] SF.net SVN: openutils:[4589] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4589
          http://openutils.svn.sourceforge.net/openutils/?rev=4589&view=rev
Author:   gcatania
Date:     2014-08-01 17:21:35 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Merged revisions 4587 via svnmerge from 
svn+ssh://gcatania@svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5

........
  r4587 | gcatania | 2014-08-01 19:09:42 +0200 (ven, 01 ago 2014) | 1 line
  
  BSHD-26 improve test coverage
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4587&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java

Added Paths:
-----------
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-08-01 17:14:45 UTC (rev 4588)
+++ branches/openutils-bshd5-backport	2014-08-01 17:21:35 UTC (rev 4589)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-08-01 17:14:45 UTC (rev 4588)
+++ branches/openutils-bshd5-backport/pom.xml	2014-08-01 17:21:35 UTC (rev 4589)
@@ -190,6 +190,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
     <slf4j.version>1.6.5</slf4j.version>

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:09:42 UTC (rev 4587)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:21:35 UTC (rev 4589)
@@ -20,10 +20,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.Matcher;
 import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
-import org.hibernate.event.spi.EventSource;
 import org.hibernate.metadata.ClassMetadata;
 import org.mockito.ArgumentMatcher;
 import org.testng.Assert;
@@ -135,16 +136,20 @@
         Assert.assertEquals(getPath(new String[]{"a", "b", "c" }), "a.b.c");
     }
 
+    /**
+     * TODO also test HibernateProxy case
+     */
     @Test
     public void testAddIdentifierRestrictionWhenAdded()
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
         // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
+        when(sess.getEntityMode()).thenReturn(EntityMode.POJO);
         when(clm.getIdentifierPropertyName()).thenReturn("id");
-        when(clm.getIdentifier(entity, sess)).thenReturn(1);
+        when(clm.getIdentifier(entity, EntityMode.POJO)).thenReturn(1);
 
         boolean added = addIdentifierRestriction(crit, entity, clm, sess);
         Assert.assertTrue(added, "identifier restriction not added");
@@ -168,8 +173,7 @@
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
-        // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
         when(clm.getIdentifierPropertyName()).thenReturn(null);
 
@@ -182,11 +186,11 @@
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
-        // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
+        when(sess.getEntityMode()).thenReturn(EntityMode.POJO);
         when(clm.getIdentifierPropertyName()).thenReturn("id");
-        when(clm.getIdentifier(entity, sess)).thenReturn(null);
+        when(clm.getIdentifier(entity, EntityMode.POJO)).thenReturn(null);
 
         boolean added = addIdentifierRestriction(crit, entity, clm, sess);
         Assert.assertFalse(added, "identifier restriction added");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.