[hibernate-commits] Hibernate SVN: r12749 - in core/trunk/code: testsuite/src/test/java/org/hibernate/test/legacy and 1 other directories.

Author: d.plentz Date: 2007-07-08 06:46:37 -0400 (Sun, 08 Jul 2007) New Revision: 12749 Modified: core/trunk/code/core/src/main/java/org/hibernate/Transaction.java core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java Log: [HHH-2566] Remove FlushMode.NEVER Modified: core/trunk/code/core/src/main/java/org/hibernate/Transaction.java =================================================================== --- core/trunk/code/core/src/main/java/org/hibernate/Transaction.java 2007-07-08 09:24:38 UTC (rev 12748) +++ core/trunk/code/core/src/main/java/org/hibernate/Transaction.java 2007-07-08 10:46:37 UTC (rev 12749) @@ -32,7 +32,7 @@ /** * Flush the associated <tt>Session</tt> and end the unit of work (unless - * we are in {@link FlushMode#NEVER}. + * we are in {@link FlushMode#MANUAL}. * </p> * This method will commit the underlying transaction if and only * if the underlying transaction was initiated by this object. Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java =================================================================== --- core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2007-07-08 09:24:38 UTC (rev 12748) +++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2007-07-08 10:46:37 UTC (rev 12749) @@ -4442,7 +4442,7 @@ s.connection().commit(); s.close(); s = openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); l = (Location) s.find("from Location l where l.countryCode = 'AU' and l.description='foo bar'").get(0); assertTrue( l.getCountryCode().equals("AU") ); assertTrue( l.getCity().equals("Melbourne") ); @@ -4746,7 +4746,7 @@ s.close(); s = openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); t = s.beginTransaction(); Foo foo = (Foo) s.get(Foo.class, id); t.commit(); Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java =================================================================== --- core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2007-07-08 09:24:38 UTC (rev 12748) +++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2007-07-08 10:46:37 UTC (rev 12749) @@ -719,7 +719,7 @@ /////////////////////////////////////////////////////////////////////////// // Test insertions across serializations Session s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); Simple simple = new Simple(); simple.setAddress("123 Main St. Anytown USA"); @@ -751,7 +751,7 @@ /////////////////////////////////////////////////////////////////////////// // Test updates across serializations s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); simple = (Simple) s.get( Simple.class, new Long(10) ); assertTrue("Not same parent instances", check.getName().equals( simple.getName() ) ); @@ -773,7 +773,7 @@ /////////////////////////////////////////////////////////////////////////// // Test deletions across serializations s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); simple = (Simple) s.get( Simple.class, new Long(10) ); assertTrue("Not same parent instances", check.getName().equals( simple.getName() ) ); @@ -795,7 +795,7 @@ /////////////////////////////////////////////////////////////////////////// // Test collection actions across serializations s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); Fum fum = new Fum( fumKey("uss-fum") ); fum.setFo( new Fum( fumKey("uss-fo") ) ); @@ -824,7 +824,7 @@ s.close(); s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); fum = (Fum) s.load( Fum.class, fum.getId() ); assertTrue("the Fum.friends did not get saved", fum.getFriends().size() == 2); @@ -842,7 +842,7 @@ s.close(); s = getSessions().openSession(); - s.setFlushMode(FlushMode.NEVER); + s.setFlushMode(FlushMode.MANUAL); fum = (Fum) s.load( Fum.class, fum.getId() ); assertTrue("the Fum.friends is not empty", fum.getFriends() == null || fum.getFriends().size() == 0); s.connection().commit(); Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java =================================================================== --- core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2007-07-08 09:24:38 UTC (rev 12748) +++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2007-07-08 10:46:37 UTC (rev 12749) @@ -325,7 +325,7 @@ s.close(); s = openSession(); - s.setFlushMode( FlushMode.NEVER ); + s.setFlushMode( FlushMode.MANUAL ); t = s.beginTransaction(); // load the last container as a proxy Container proxy = ( Container ) s.load( Container.class, lastContainerId );