Update of /cvsroot/roller/roller/tests/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv30400/tests/org/roller/business
Modified Files:
TestAll.java BookmarkManagerTest.java
Log Message:
OK, so the Hibe BookmarkManager is still not quite green bar
Index: TestAll.java
===================================================================
RCS file: /cvsroot/roller/roller/tests/org/roller/business/TestAll.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestAll.java 26 Mar 2003 13:49:44 -0000 1.6
--- TestAll.java 28 Mar 2003 12:56:46 -0000 1.7
***************
*** 38,44 ****
else
{
! suite.addTest(NewsfeedManagerTest.suite());
suite.addTest(BookmarkManagerTest.suite());
! suite.addTest(RefererManagerTest.suite());
//suite.addTest(UserManagerTest.suite());
//suite.addTest(WeblogManagerTest.suite());
--- 38,44 ----
else
{
! //suite.addTest(NewsfeedManagerTest.suite());
suite.addTest(BookmarkManagerTest.suite());
! //suite.addTest(RefererManagerTest.suite());
//suite.addTest(UserManagerTest.suite());
//suite.addTest(WeblogManagerTest.suite());
Index: BookmarkManagerTest.java
===================================================================
RCS file:
/cvsroot/roller/roller/tests/org/roller/business/BookmarkManagerTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BookmarkManagerTest.java 25 Mar 2003 04:35:42 -0000 1.9
--- BookmarkManagerTest.java 28 Mar 2003 12:56:46 -0000 1.10
***************
*** 27,43 ****
private UserData mUser = null;
private WebsiteData mWebsite = null;
private static Log mLogger =
LogFactory.getFactory().getInstance(BookmarkManagerTest.class);
- // Instance of BookmarkManager for testing
protected BookmarkManager mBookmarkMgr = null;
!
! protected String mUsername = "TestUser";
!
! protected BookmarkData mBookmark = null;
! protected FolderData mFolder1 = null;
! protected FolderData mFolder2 = null;
!
//------------------------------------------------------------------------
public BookmarkManagerTest()
--- 27,37 ----
private UserData mUser = null;
private WebsiteData mWebsite = null;
+ private FolderData mTopFolder = null;
private static Log mLogger =
LogFactory.getFactory().getInstance(BookmarkManagerTest.class);
protected BookmarkManager mBookmarkMgr = null;
!
//------------------------------------------------------------------------
public BookmarkManagerTest()
***************
*** 65,69 ****
//------------------------------------------------------------------------
! /**
* @see TestCase#setUp()
*/
--- 59,63 ----
//------------------------------------------------------------------------
! /**
* @see TestCase#setUp()
*/
***************
*** 85,102 ****
mBookmarkMgr = getRoller().getBookmarkManager();
!
! mFolder1 = new FolderData(new Vector(), null,
! "TestFolder1", "For Testing Only", mWebsite, null);
! mBookmarkMgr.storeFolder(mFolder1);
!
! mFolder2 = new FolderData(new Vector(), null,
! "TestFolder2", "For Testing Only", mWebsite, "2");
! mBookmarkMgr.storeFolder(mFolder2);
!
! mBookmark = new BookmarkData(
! null, "TestBookmark",
! "For testing purposes", "http://www.brainopolis.com";,
! new Integer(1), new Integer(2), mFolder2, "test.jpg",
! "http://feedurl.com"; );
}
catch (RollerException e)
--- 79,85 ----
mBookmarkMgr = getRoller().getBookmarkManager();
! mTopFolder = new FolderData(new Vector(), null,
! "TopFolder", "For Testing Only", mWebsite, null);
! mBookmarkMgr.storeFolder(mTopFolder);
}
catch (RollerException e)
***************
*** 106,109 ****
--- 89,94 ----
}
+ //------------------------------------------------------------------------
+
/**
* Child TestCases should take care to tearDown() their own resources
***************
*** 117,124 ****
try
{
getRoller().getUserManager().removeWebsite(mWebsite.getId());
getRoller().getUserManager().removeUser(mUser.getId());
- getRoller().getBookmarkManager().removeFolder(mFolder1.getId());
- getRoller().getBookmarkManager().removeFolder(mFolder2.getId());
}
catch (RollerException e)
--- 102,108 ----
try
{
+ mBookmarkMgr.removeFolder(mTopFolder.getId());
getRoller().getUserManager().removeWebsite(mWebsite.getId());
getRoller().getUserManager().removeUser(mUser.getId());
}
catch (RollerException e)
***************
*** 130,147 ****
//------------------------------------------------------------------------
! public void testBookmarkImport()
{
! boolean success = false;
! try
! {
! FileInputStream fis = new FileInputStream("bookmarks.opml" );
! mBookmarkMgr.importBookmarks( "currency","imports",
fileToString(fis) );
! success = true;
! }
! catch (Exception e)
! {
! mLogger.error("Unexpected exception",e);
! }
! assertTrue( success );
}
--- 114,126 ----
//------------------------------------------------------------------------
! public void testBookmarkImport() throws Exception
{
! FileInputStream fis = new FileInputStream("bookmarks.opml" );
! mBookmarkMgr.importBookmarks("testuser","imports",fileToString(fis));
!
! FolderData fd = mBookmarkMgr.getFolder("testuser","imports");
! assertTrue( fd.getBookmarks().size() > 0 );
!
! mBookmarkMgr.removeFolder( fd.getId() );
}
***************
*** 164,307 ****
public void testStoreBookmark() throws RollerException
{
! // These objects do not exist in the database yet
! mFolder1.setId(null);
! mBookmark.setId(null);
!
! // Create a folder to hold the bookmark
! mFolder1.setWebsite(mWebsite);
! mBookmarkMgr.storeFolder(mFolder1);
// Make sure folder was stored
! FolderData testFolder = mBookmarkMgr.retrieveFolder(mFolder1.getId());
! assertEquals(mFolder1, testFolder);
!
! // Store bookmark in folder
! mBookmark.setFolder(mFolder1);
! mBookmarkMgr.storeBookmark( mBookmark );
!
// Make sure bookmark was stored
BookmarkData testBookmark =
! mBookmarkMgr.retrieveBookmark(mBookmark.getId());
! assertEquals(mBookmark, testBookmark);
// Removing the folder should remove it's contents too
! mBookmarkMgr.removeFolder(mFolder1.getId());
// Make sure that removing folder removed everything
! assertNull( mBookmarkMgr.retrieveBookmark(mBookmark.getId()) );
! assertNull( mBookmarkMgr.retrieveFolder(mFolder1.getId()) );
! }
!
! public void testRetrieveBookmark() throws RollerException
! {
! // covered by testStoreBookmark
! }
!
! public void testStoreFolder() throws RollerException
! {
! // covered by testStoreBookmark
! }
!
! public void testRetrieveFolder() throws RollerException
! {
! // covered by testStoreBookmark
! }
!
! public void testRemoveFolder() throws RollerException
! {
! // covered by testStoreBookmark
! }
!
! public void testRemoveBookmark() throws RollerException
! {
! // covered by testStoreBookmark
}
public void testMoveFolderContents() throws RollerException
{
! // These objects do not exist in the database yet
! mFolder1.setId(null);
! mFolder2.setId(null);
! mBookmark.setId(null);
!
!
!
! // Create source folder (1)
! mFolder1.setWebsite(mWebsite);
! mBookmarkMgr.storeFolder(mFolder1);
// Make sure folder1 was stored
! FolderData testFolder1 =
mBookmarkMgr.retrieveFolder(mFolder1.getId());
! assertEquals(mFolder1, testFolder1);
!
!
// Create dest folder (2)
! mFolder2.setWebsite(mWebsite);
! mBookmarkMgr.storeFolder(mFolder2);
// Make sure folder2 was stored
! FolderData testFolder2 =
mBookmarkMgr.retrieveFolder(mFolder2.getId());
! assertEquals(mFolder2, testFolder2);
!
!
// Store bookmark in folder1
! mBookmark.setFolder(mFolder1);
! mBookmarkMgr.storeBookmark( mBookmark );
// Move folder1 contents to folder2
! mBookmarkMgr.moveFolderContents(mFolder1.getId(), mFolder2.getId());
// See that bookmark moved to folder2
! mFolder2 = mBookmarkMgr.retrieveFolder(mFolder2.getId());
// 'contains' will not work, folderids are now different
//assertTrue( mFolder1.getBookmarks().contains( mBookmark ));
! assertTrue( mFolder1.getBookmarks().size() == 0 );
! assertTrue( mFolder2.getBookmarks().size() == 1 );
!
! // Move bookmark back from folder2 to folder1
! //mBookmarkMgr.moveBookmark(mBookmark.getId(), mFolder1.getId());
!
! // See that bookmark moved back to folder1
! //assertTrue( mFolder1.getBookmarks().size() == 1 );
! //assertTrue( mFolder2.getBookmarks().size() == 0 );
!
!
// Removing the folders should remove it's contents too
! mBookmarkMgr.removeFolder(mFolder1.getId());
! mBookmarkMgr.removeFolder(mFolder2.getId());
// Make sure that removing folder removed everything
! assertNull( mBookmarkMgr.retrieveBookmark(mBookmark.getId()) );
! assertNull( mBookmarkMgr.retrieveFolder(mFolder1.getId()) );
! assertNull( mBookmarkMgr.retrieveFolder(mFolder2.getId()) );
! }
!
! public void testMoveBookmark() throws RollerException
! {
! // TODO covered by testMoveFolderContents
! }
!
! public void testGetTopLevelFolder() throws RollerException
! {
! // TODO testGetTopLevelFolder
! //FolderData testFolder = mBookmarkMgr.getTopLevelFolder(
mUsername );
! //assertEquals(testFolder, mFolder2);
! }
!
! public void testGetTopLevelFolders() throws RollerException
! {
! // TODO testGetTopLevelFolders
! //FolderData[] folders = mBookmarkMgr.getTopLevelFolders(
mUsername, true );
! //assertEquals( folders.length, 1);
}
! public void testGetFolder() throws RollerException
! {
! // TODO testGetFolder
! //FolderData folder = mBookmarkMgr.getFolder( mUsername,
mFolder2.getName());
! //assertEquals( folder, mFolder2);
! }
}
--- 143,284 ----
public void testStoreBookmark() throws RollerException
{
! FolderData folder = new FolderData(new Vector(), null,
! "TestFolder1", "For Testing Only", mWebsite, mTopFolder.getId());
! mBookmarkMgr.storeFolder(folder);
!
! BookmarkData bookmark = new BookmarkData(null, "TestBookmark",
! "For testing purposes", "http://www.brainopolis.com";,
! new Integer(1), new Integer(2), folder, "test.jpg",
! "http://feedurl.com"; );
! mBookmarkMgr.storeBookmark(bookmark);
// Make sure folder was stored
! FolderData testFolder = mBookmarkMgr.retrieveFolder(folder.getId());
! assertEquals(folder, testFolder);
!
// Make sure bookmark was stored
BookmarkData testBookmark =
! mBookmarkMgr.retrieveBookmark(bookmark.getId());
! assertEquals(bookmark, testBookmark);
// Removing the folder should remove it's contents too
! mBookmarkMgr.removeFolder(folder.getId());
// Make sure that removing folder removed everything
! assertNull( mBookmarkMgr.retrieveBookmark(bookmark.getId()) );
! assertNull( mBookmarkMgr.retrieveFolder(folder.getId()) );
}
+ //------------------------------------------------------------------------
+
+ public void testGetFolder() throws RollerException
+ {
+ FolderData fd = mBookmarkMgr.getFolder("testuser","TestFolder1");
+ assertTrue( fd.getBookmarks().size()>0 );
+ }
+
+ //------------------------------------------------------------------------
+
public void testMoveFolderContents() throws RollerException
{
! FolderData folder1 = new FolderData(new Vector(), null,
! "TestFolder1", "For Testing Only", mWebsite, mTopFolder.getId());
! mBookmarkMgr.storeFolder(folder1);
!
! 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);
// Create dest folder (2)
! folder2.setWebsite(mWebsite);
! mBookmarkMgr.storeFolder(folder2);
// Make sure folder2 was stored
! FolderData testFolder2 = mBookmarkMgr.retrieveFolder(folder2.getId());
! assertEquals(folder2, testFolder2);
// Store bookmark in folder1
! bookmark.setFolder(folder1);
! mBookmarkMgr.storeBookmark( bookmark );
// Move folder1 contents to folder2
! mBookmarkMgr.moveFolderContents(folder1.getId(), folder2.getId());
// See that bookmark moved to folder2
! folder2 = mBookmarkMgr.retrieveFolder(folder2.getId());
// 'contains' will not work, folderids are now different
//assertTrue( mFolder1.getBookmarks().contains( mBookmark ));
! assertTrue( folder1.getBookmarks().size() == 0 );
! assertTrue( folder2.getBookmarks().size() == 1 );
// 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()) );
}
! // public void testMoveBookmark() throws RollerException
! // {
! // // TODO covered by testMoveFolderContents
! // }
! //
! // public void testGetTopLevelFolder() throws RollerException
! // {
! // // TODO testGetTopLevelFolder
! // //FolderData testFolder = mBookmarkMgr.getTopLevelFolder(
mUsername );
! // //assertEquals(testFolder, mFolder2);
! // }
! //
! // public void testGetTopLevelFolders() throws RollerException
! // {
! // // TODO testGetTopLevelFolders
! // //FolderData[] folders = mBookmarkMgr.getTopLevelFolders(
mUsername, true );
! // //assertEquals( folders.length, 1);
! // }
! //
! // public void testGetFolder() throws RollerException
! // {
! // // TODO testGetFolder
! // //FolderData folder = mBookmarkMgr.getFolder( mUsername,
mFolder2.getName());
! // //assertEquals( folder, mFolder2);
! // }
! // public void testRetrieveBookmark() throws RollerException
! // {
! // // covered by testStoreBookmark
! // }
! //
! // public void testStoreFolder() throws RollerException
! // {
! // // covered by testStoreBookmark
! // }
! //
! // public void testRetrieveFolder() throws RollerException
! // {
! // // covered by testStoreBookmark
! // }
! //
! // public void testRemoveFolder() throws RollerException
! // {
! // // covered by testStoreBookmark
! // }
! //
! // public void testRemoveBookmark() throws RollerException
! // {
! // // covered by testStoreBookmark
! // }
!
}
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
|
