Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mostly cosmetic changes to TestStorageClient & fiddling with doxytag

Browse source
This commit is contained in:
fgerlits 2004-11-11 15:39:15 +00:00
parent 9db6d24725
commit dc58a33ca4
4 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
livesupport/modules/storage/src/TestStorageClient.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.13 $
Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
------------------------------------------------------------------------------*/
@ -249,25 +249,13 @@ TestStorageClient :: acquirePlaylist(Ptr<const UniqueId>::Ref id) const
++it;
}
char fileName[] = "/tmp/tempPlaylistXXXXXX";
if (!mkstemp(fileName)) {
throw std::logic_error("could not create temp file");
}
std::string sysCommand = "mv ";
sysCommand += fileName;
sysCommand += " ";
sysCommand += fileName;
sysCommand += ".smil > /dev/null 2>&1";
if (system(sysCommand.c_str()) != 0) {
throw std::logic_error("could not rename temp file");
}
std::stringstream fileName;
fileName << "file:///tmp/tempPlaylist" << newPlaylist->getId()->getId()
<< "#" << std::rand() << ".smil";
std::string smilFileName("file://");
smilFileName += fileName;
smilFileName += ".smil";
smilDocument->write_to_file(smilFileName, "UTF-8");
smilDocument->write_to_file(fileName.str(), "UTF-8");
Ptr<std::string>::Ref playlistUri(new std::string(smilFileName));
Ptr<std::string>::Ref playlistUri(new std::string(fileName.str()));
newPlaylist->setUri(playlistUri);
return newPlaylist;
}
@ -285,12 +273,11 @@ TestStorageClient :: releasePlaylist(Ptr<Playlist>::Ref playlist) const
}
std::ifstream ifs(playlist->getUri()->substr(7).c_str());
if (ifs) {
if (!ifs) {
ifs.close();
}
else {
throw std::logic_error("playlist temp file not found");
}
ifs.close();
std::remove(playlist->getUri()->substr(7).c_str());
@ -425,12 +412,11 @@ TestStorageClient :: acquireAudioClip(Ptr<const UniqueId>::Ref id) const
std::string audioClipFileName = storedAudioClip->getUri()->substr(5);
std::ifstream ifs(audioClipFileName.c_str());
if (ifs) {
if (!ifs) {
ifs.close();
}
else {
throw std::logic_error("could not read audio clip");
}
ifs.close();
Ptr<AudioClip>::Ref audioClip(new AudioClip(*storedAudioClip));

8
livesupport/modules/storage/src/TestStorageClientTest.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.12 $
Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
------------------------------------------------------------------------------*/
@ -272,12 +272,11 @@ TestStorageClientTest :: acquirePlaylistTest(void)
CPPUNIT_ASSERT(playlist->getUri()->substr(0,7) == "file://");
std::ifstream ifs1(playlist->getUri()->substr(7).c_str());
if (ifs1) {
if (!ifs1) {
ifs1.close();
}
else {
CPPUNIT_FAIL("temp file not created correctly");
}
ifs1.close();
string savedTempFilePath = playlist->getUri()->substr(7);
try {
@ -294,6 +293,7 @@ TestStorageClientTest :: acquirePlaylistTest(void)
ifs2.close();
CPPUNIT_FAIL("temp file not destroyed correctly");
}
ifs2.close();
try {
playlist = tsc->acquirePlaylist(id77);