From f4062235f3ab89d6ab0a278f28f6011eb659f54e Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 27 Jun 2006 21:42:39 +0000 Subject: [PATCH] updated the storage client tests to reflect [2123] --- .../storageClient/src/WebStorageClient.cxx | 6 +++ .../src/WebStorageClientTest.cxx | 49 +++++-------------- .../gLiveSupport/src/RestoreBackupWindow.cxx | 1 - 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/livesupport/src/modules/storageClient/src/WebStorageClient.cxx b/livesupport/src/modules/storageClient/src/WebStorageClient.cxx index 4794df9cf..1872fbd7e 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClient.cxx +++ b/livesupport/src/modules/storageClient/src/WebStorageClient.cxx @@ -2544,6 +2544,12 @@ WebStorageClient :: restoreBackupCheck( execute(restoreBackupCheckMethodName, parameters, result); +// <<< +// TODO: remove this hack after bug #1708 has been fixed +XmlRpcValue oldResult = result; +result.clear(); +result = oldResult["status"]; +// >>> checkStruct(restoreBackupCheckMethodName, result, restoreBackupStatusParamName, diff --git a/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx b/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx index 09dd0cbaf..185c51002 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx +++ b/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx @@ -285,7 +285,7 @@ WebStorageClientTest :: playlistTest(void) Ptr::Ref> >::Ref searchResults = wsc->getSearchResults(); CPPUNIT_ASSERT(searchResults->size() >= 7); - Ptr::Ref audioClip = searchResults->at(6)->getAudioClip(); + Ptr::Ref audioClip = searchResults->at(4)->getAudioClip(); CPPUNIT_ASSERT(audioClip); Ptr::Ref relativeOffset(new time_duration(0,0,0,0)); @@ -662,7 +662,7 @@ WebStorageClientTest :: searchTest(void) CPPUNIT_ASSERT(numberFound == 1); searchResults = wsc->getSearchResults(); CPPUNIT_ASSERT(searchResults->size() == 1); - CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip3->getId()); + CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip1->getId()); } catch (std::invalid_argument &e) { CPPUNIT_FAIL(e.what()); @@ -698,7 +698,7 @@ WebStorageClientTest :: searchTest(void) CPPUNIT_ASSERT(numberFound == 1); searchResults = wsc->getSearchResults(); CPPUNIT_ASSERT(searchResults->size() == 1); - CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip4->getId()); + CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip0->getId()); } catch (std::invalid_argument &e) { CPPUNIT_FAIL(e.what()); @@ -715,7 +715,7 @@ WebStorageClientTest :: searchTest(void) searchResults = wsc->getSearchResults(); CPPUNIT_ASSERT(searchResults->size() >= 5); CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *playlist0->getId()); - CPPUNIT_ASSERT(*searchResults->at(3)->getId() == *audioClip4->getId()); + CPPUNIT_ASSERT(*searchResults->at(3)->getId() == *audioClip0->getId()); } catch (std::invalid_argument &e) { CPPUNIT_FAIL(e.what()); @@ -733,8 +733,8 @@ WebStorageClientTest :: searchTest(void) CPPUNIT_ASSERT(numberFound >= 5); searchResults = wsc->getSearchResults(); CPPUNIT_ASSERT(searchResults->size() == 2); - CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip3->getId()); - CPPUNIT_ASSERT(*searchResults->at(1)->getId() == *audioClip4->getId()); + CPPUNIT_ASSERT(*searchResults->at(0)->getId() == *audioClip4->getId()); + CPPUNIT_ASSERT(*searchResults->at(1)->getId() == *audioClip5->getId()); } catch (std::invalid_argument &e) { CPPUNIT_FAIL(e.what()); @@ -812,21 +812,21 @@ WebStorageClientTest :: getAllTest(void) Ptr::Ref playlist = playlists->at(0); CPPUNIT_ASSERT(playlist); CPPUNIT_ASSERT(playlist->getId()); - CPPUNIT_ASSERT(playlist->getId()->getId() == 1); + CPPUNIT_ASSERT(playlist->getId()->getId() == 3); Ptr::Ref> >::Ref audioClips = wsc->getAllAudioClips(sessionId); CPPUNIT_ASSERT(audioClips); CPPUNIT_ASSERT(audioClips->size() >= 5); - audioClips = wsc->getAllAudioClips(sessionId, 2, 1); + audioClips = wsc->getAllAudioClips(sessionId, 2, 4); CPPUNIT_ASSERT(audioClips); CPPUNIT_ASSERT(audioClips->size() == 2); Ptr::Ref audioClip = audioClips->at(0); CPPUNIT_ASSERT(audioClip); CPPUNIT_ASSERT(audioClip->getId()); - CPPUNIT_ASSERT(audioClip->getId()->getId() == 0x10002); + CPPUNIT_ASSERT(audioClip->getId()->getId() == 0x10003); try{ authentication->logout(sessionId); @@ -901,15 +901,15 @@ WebStorageClientTest :: restoreBackupTest(void) ); CPPUNIT_ASSERT(sessionId); - Ptr::Ref oldAudioClipId(new UniqueId("0000000000010001")); + Ptr::Ref audioClipId(new UniqueId("7c215b48a9c827e6")); CPPUNIT_ASSERT( - wsc->existsAudioClip(sessionId, oldAudioClipId) + !wsc->existsAudioClip(sessionId, audioClipId) ); Ptr::Ref path(new Glib::ustring()); char * currentDirName = get_current_dir_name(); path->append(currentDirName); - path->append("var/cowbell_backup.tar"); + path->append("/var/cowbell_backup.tar"); free(currentDirName); Ptr::Ref token; @@ -940,12 +940,7 @@ WebStorageClientTest :: restoreBackupTest(void) ); CPPUNIT_ASSERT( - !wsc->existsAudioClip(sessionId, oldAudioClipId) - ); - - Ptr::Ref newAudioClipId(new UniqueId("7c215b48a9c827e6")); - CPPUNIT_ASSERT( - wsc->existsAudioClip(sessionId, newAudioClipId) + wsc->existsAudioClip(sessionId, audioClipId) ); CPPUNIT_ASSERT_NO_THROW( @@ -1045,26 +1040,8 @@ WebStorageClientTest :: importPlaylistTest(void) exportPlaylistHelper(playlistId, StorageClientInterface::internalFormat); - // importing a playlist already in the storage: error Ptr::Ref path(new Glib::ustring( "tmp/testExportedPlaylist.tar")); - CPPUNIT_ASSERT_THROW( - wsc->importPlaylist(sessionId, path), - XmlRpcMethodFaultException - ); - - // deleting the playlist from the storage... - CPPUNIT_ASSERT_NO_THROW( - wsc->reset() - ); - - sessionId.reset(); - CPPUNIT_ASSERT_NO_THROW( - sessionId = authentication->login("root", "q") - ); - CPPUNIT_ASSERT(sessionId); - - // ... and then importing it: this should be OK CPPUNIT_ASSERT_NO_THROW( wsc->importPlaylist(sessionId, path) ); diff --git a/livesupport/src/products/gLiveSupport/src/RestoreBackupWindow.cxx b/livesupport/src/products/gLiveSupport/src/RestoreBackupWindow.cxx index 28b97cad5..d8a38f395 100644 --- a/livesupport/src/products/gLiveSupport/src/RestoreBackupWindow.cxx +++ b/livesupport/src/products/gLiveSupport/src/RestoreBackupWindow.cxx @@ -118,7 +118,6 @@ RestoreBackupWindow :: RestoreBackupWindow ( // set name, size, etc. and show the widgets (not the window itself yet) set_name("restoreBackupWindow"); - set_default_size(150, 50); show_all_children(); }