Fix this stupid test, *again*

This commit is contained in:
David Sansome 2010-06-16 22:32:02 +00:00
parent c15afd8083
commit d423d008d4

View File

@ -25,6 +25,7 @@
#include <QDir> #include <QDir>
#include <QEventLoop> #include <QEventLoop>
#include <QSignalSpy> #include <QSignalSpy>
#include <QtDebug>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <cstdlib> #include <cstdlib>
@ -203,11 +204,15 @@ TEST_F(SongLoaderTest, LoadRemotePlainM3U) {
TEST_F(SongLoaderTest, LoadLocalDirectory) { TEST_F(SongLoaderTest, LoadLocalDirectory) {
// Make a directory and shove some files in it // Make a directory and shove some files in it
char* dir = tmpnam(NULL); QString dir;
ASSERT_TRUE(dir); {
QTemporaryFile ffffuuuuuuuu;
ffffuuuuuuuu.open();
dir = ffffuuuuuuuu.fileName();
}
QDir d; QDir d;
d.mkdir(dir); ASSERT_TRUE(d.mkdir(dir));
QFile resource(":/testdata/beep.mp3"); QFile resource(":/testdata/beep.mp3");
resource.open(QIODevice::ReadOnly); resource.open(QIODevice::ReadOnly);
@ -234,7 +239,8 @@ TEST_F(SongLoaderTest, LoadLocalDirectory) {
QFile::remove(QString(dir) + "/1.mp3"); QFile::remove(QString(dir) + "/1.mp3");
QFile::remove(QString(dir) + "/2.mp3"); QFile::remove(QString(dir) + "/2.mp3");
QFile::remove(QString(dir) + "/somethingelse.foo"); QFile::remove(QString(dir) + "/somethingelse.foo");
rmdir(dir);
d.rmdir(dir);
} }
void SongLoaderTest::LoadLocalDirectory(const QString &filename) { void SongLoaderTest::LoadLocalDirectory(const QString &filename) {