roller/tests/org/roller/business BookmarkManagerTest.java,1.18,1.19

Update of /cvsroot/roller/roller/tests/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv28933/tests/org/roller/business

Modified Files:
        BookmarkManagerTest.java 
Log Message:
Gavin: "make sure you never catch + handle an exception and 
then keep using the session (ObjectNotFoundException included!)"

Index: BookmarkManagerTest.java
===================================================================
RCS file: 
/cvsroot/roller/roller/tests/org/roller/business/BookmarkManagerTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** BookmarkManagerTest.java    20 Aug 2003 03:28:54 -0000      1.18
--- BookmarkManagerTest.java    14 Sep 2003 19:00:58 -0000      1.19
***************
*** 204,229 ****
        public void testMoveFolderContents() throws RollerException
        {
!         FolderData folder1 = new FolderData(new Vector(), null, 
!             "TestFolder1", "For Testing Only", mWebsite, mTopFolder.getId());
!         mBookmarkMgr.storeFolder(folder1);
! 
!               // Create dest folder (2)
!         FolderData folder2 = new FolderData(new Vector(), null, 
!             "TestFolder2", "For Testing Only", mWebsite, mTopFolder.getId());
!         mBookmarkMgr.storeFolder(folder2);
!                 
          BookmarkData bookmark = new BookmarkData(null, "TestBookmark", 
              "For testing purposes", "http://www.brainopolis.com";,
!             new Integer(1), new Integer(2), folder1, "test.jpg", 
              "http://feedurl.com"; );
          mBookmarkMgr.storeBookmark(bookmark);
          
!         // Make sure folder1 was stored   
!         FolderData testFolder1 = mBookmarkMgr.retrieveFolder(folder1.getId());
!         assertEquals(folder1, testFolder1);
!         
!         // Make sure folder2 was stored   
!         FolderData testFolder2 = mBookmarkMgr.retrieveFolder(folder2.getId());
!         assertEquals(folder2, testFolder2);
                  
          FolderData[] folders = 
--- 204,230 ----
        public void testMoveFolderContents() throws RollerException
        {
!         // Create src folder with one bookmark
!         FolderData srcFolder = new FolderData(new Vector(), null, 
!             "srcFolder", "For Testing Only", mWebsite, mTopFolder.getId());
!         mBookmarkMgr.storeFolder(srcFolder);
!         
          BookmarkData bookmark = new BookmarkData(null, "TestBookmark", 
              "For testing purposes", "http://www.brainopolis.com";,
!             new Integer(1), new Integer(2), srcFolder, "test.jpg", 
              "http://feedurl.com"; );
          mBookmarkMgr.storeBookmark(bookmark);
+ 
+               // Create dest folder
+         FolderData destFolder = new FolderData(new Vector(), null, 
+             "destFolder", "For Testing Only", mWebsite, mTopFolder.getId());
+         mBookmarkMgr.storeFolder(destFolder);
+                                
+         // Make sure srcFolder was stored   
+         FolderData srcFolder1 = 
mBookmarkMgr.retrieveFolder(srcFolder.getId());
+         assertEquals(srcFolder, srcFolder1);
          
!         // Make sure destFolder was stored   
!         FolderData destFolder1 = 
mBookmarkMgr.retrieveFolder(destFolder.getId());
!         assertEquals(destFolder, destFolder1);
                  
          FolderData[] folders = 
***************
*** 231,236 ****
          assertEquals( 2, folders.length );       
  
!         // Move folder1 contents to folder2
!         mBookmarkMgr.moveFolderContents(folder1.getId(), folder2.getId());    
  
          
          // if the data is not committed at this point
--- 232,237 ----
          assertEquals( 2, folders.length );       
  
!         // Move src contents to dest
!         mBookmarkMgr.moveFolderContents(srcFolder.getId(), 
destFolder.getId());      
          
          // if the data is not committed at this point
***************
*** 239,258 ****
          
          // See that bookmark moved to folder2
!               folder1 = mBookmarkMgr.retrieveFolder(folder1.getId());
!         folder2 = mBookmarkMgr.retrieveFolder(folder2.getId());
                  
!         // 'contains' will not work, folderids are now different
!         //assertTrue( mFolder1.getBookmarks().contains( mBookmark ));
!         assertEquals( 0, folder1.getBookmarks().size() );
!               assertEquals( 1, folder2.getBookmarks().size() );
          
          // Removing the folders should remove it's contents too   
!         mBookmarkMgr.removeFolder( folder1.getId());
!         mBookmarkMgr.removeFolder( folder2.getId());
          
          // Make sure that removing folder removed everything
          assertNull( mBookmarkMgr.retrieveBookmark( bookmark.getId()) );
!         assertNull( mBookmarkMgr.retrieveFolder( folder1.getId()) );
!         assertNull( mBookmarkMgr.retrieveFolder( folder2.getId()) );        
        }
      
--- 240,257 ----
          
          // See that bookmark moved to folder2
!               srcFolder1 = mBookmarkMgr.retrieveFolder(srcFolder.getId());
!         destFolder1 = mBookmarkMgr.retrieveFolder(destFolder.getId());
                  
!         assertEquals( 0, srcFolder1.getBookmarks().size() );
!               assertEquals( 1, destFolder1.getBookmarks().size() );
          
          // Removing the folders should remove it's contents too   
!         mBookmarkMgr.removeFolder( srcFolder.getId());
!         mBookmarkMgr.removeFolder( destFolder.getId());
          
          // Make sure that removing folder removed everything
          assertNull( mBookmarkMgr.retrieveBookmark( bookmark.getId()) );
!         assertNull( mBookmarkMgr.retrieveFolder( srcFolder.getId()) );
!         assertNull( mBookmarkMgr.retrieveFolder( destFolder.getId()) );       
 
        }
      




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf