From 75120765af8ac31b16df6289cba010eb33c21287 Mon Sep 17 00:00:00 2001 From: Tyler Dauwalder Date: Fri, 16 Aug 2002 23:21:48 +0000 Subject: [PATCH] Modified MimeTypeTestSuite slightly so as to not remove the copied mime database directory if it already existed in the first place. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@791 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/storage/MimeTypeTest.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tests/kits/storage/MimeTypeTest.cpp b/src/tests/kits/storage/MimeTypeTest.cpp index a485d61ece..108ba69ded 100644 --- a/src/tests/kits/storage/MimeTypeTest.cpp +++ b/src/tests/kits/storage/MimeTypeTest.cpp @@ -117,7 +117,7 @@ void FillWithMimeTypes(ContainerAdapter &container, BMessage &typeMessage, const // before running all the BMimeType tests class MimeTypeTestSuite : public CppUnit::TestSuite { public: - MimeTypeTestSuite() : CppUnit::TestSuite() {} + MimeTypeTestSuite() : CppUnit::TestSuite(), fMimeDirExisted(false) {} virtual void setUp() { // If we're using a directory other than the R5 MIME database directory, make @@ -132,6 +132,7 @@ public: + " " + mimeDatabaseDir; ExecCommand(cmd.c_str()); } else { + fMimeDirExisted = true; if (BTestShell::GlobalBeVerbose()) cout << "(Using existing copy of MIME database in '" + mimeDatabaseDir + "')" << endl; } @@ -140,7 +141,7 @@ public: virtual void tearDown() { - if (mimeDatabaseDir != R5DatabaseDir) { + if (mimeDatabaseDir != R5DatabaseDir && !fMimeDirExisted) { if (BTestShell::GlobalBeVerbose()) cout << "(Removing copy of MIME database in '" + mimeDatabaseDir + "')" << endl; std::string cmd = std::string("rm -rf ") + mimeDatabaseDir; @@ -153,7 +154,9 @@ public: setUp(); CppUnit::TestSuite::run(result); tearDown(); - } + } +private: + bool fMimeDirExisted; }; // Suite