r1021 - in xwiki/trunk/src: main/java/com/xpn/xwiki/store test/cactus/com/xpn/xwiki/test

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-31 03:01:17 +0200 (Fri, 31 Mar 2006)
New Revision: 1021

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
   xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java
Log:
reverted bad change on deleting objects
fixed test

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-03-31 00:11:08 UTC (rev 1020)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-03-31 01:01:17 UTC (rev 1021)
@@ -894,13 +894,11 @@
                 cobject.setId(object.getId());
                 if (evict)
                     session.evict(cobject);
-                if (session.contains(cobject))
-                    session.delete(cobject);
+                session.delete(cobject);
             } else {
                 if (evict)
                     session.evict(object);
-                if (session.contains(object))
-                    session.delete(object);
+                session.delete(object);
             }
 
             if (bTransaction) {

Modified: xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java
===================================================================
--- xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java	2006-03-31 00:11:08 UTC (rev 1020)
+++ xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java	2006-03-31 01:01:17 UTC (rev 1021)
@@ -2240,7 +2240,7 @@
         BaseClass bclass = doc.getxWikiClass();
         BaseObject bobject = doc.getObject(bclass.getName(), 1);
         String content  =  "template content" ;
-        Utils.createDoc(xwiki.getStore(),"Main","SaveErrorLongtemplate",content,bobject,bclass,context);
+        Utils.createDoc(xwiki.getStore(),"Main","SaveErrorLongTemplate",content,bobject,bclass,context);
 
         setUrl(webRequest, "save", "SaveWithLongTemplate");
         webRequest.addParameter("template", "Main.SaveErrorLongTemplate");
@@ -2253,15 +2253,15 @@
         try {
             String result = webResponse.getText();
             // Verify return
-            assertFalse("Saving not returned exception: " + result, result.indexOf("Exception") == -1);
+            assertTrue("Saving not returned exception: " + result, result.indexOf("Exception") == -1);
             // Flush cache to make sure we read from db
             xwiki.flushCache();
 
             XWikiDocument doc2 = xwiki.getDocument("Main.SaveWithLongTemplate",context);
             String content2 = doc2.getContent() ;
             String parent = doc2.getParent();
-            assertEquals("Content is identical", false, content2.equals("template content"));
-            assertEquals("Parent is  identical", false, parent.equals("XWiki.TestParentComesFromTemplate"));
+            assertEquals("Content is identical", content2, "template content");
+            assertEquals("Parent is  identical", parent, "XWiki.TestParentComesFromTemplate");
 
         } finally {
             clientTearDown();