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

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

Revision: 4083
          http://openutils.svn.sourceforge.net/openutils/?rev=4083&view=rev
Author:   gcatania
Date:     2012-06-29 16:34:55 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merged revisions 4082 via svnmerge from 
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5

........
  r4082 | gcatania | 2012-06-29 18:32:50 +0200 (Fri, 29 Jun 2012) | 1 line
  
  fix unit tests after backwards compatibility fix
........

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

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java

Property Changed:
----------------
    branches/openutils-bshd5-backport/
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4080
   + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4082
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*
   + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*


Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080
   + /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082


Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080
   + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java	2012-06-29 16:32:50 UTC (rev 4082)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java	2012-06-29 16:34:55 UTC (rev 4083)
@@ -101,7 +101,9 @@
                 criteria.add(Restrictions.lt(propertyName, 22d));
             }
         };
-        List<Sticker> found = stickerDAO.findFiltered(new Sticker(), Collections.singletonMap("height", fm));
+        Sticker stickerFilter = new Sticker();
+        stickerFilter.setHeight(12d); // unused but must be not null for backwards compatibility
+        List<Sticker> found = stickerDAO.findFiltered(stickerFilter, Collections.singletonMap("height", fm));
         Assert.assertEquals(found.size(), 1);
         Assert.assertEquals(found.get(0), st1);
     }
@@ -143,7 +145,9 @@
             }
         };
         Car filter = new Car();
-        filter.setStickers(Collections.singletonList(new Sticker()));
+        Sticker stickerFilter = new Sticker();
+        stickerFilter.setHeight(12d); // unused but must be not null for backwards compatibility
+        filter.setStickers(Collections.singletonList(stickerFilter));
         List<Car> found = carDAO.findFiltered(filter, Collections.singletonMap("stickers.height", fm));
         Assert.assertEquals(found.size(), 1);
         Car actual = found.get(0);

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