i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a #if clause to exclude the __mime_table code from the

Browse Source 
OBOS::GetSupportingApps() tests, as the __mime_table is not
currently used.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@927 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Tyler Dauwalder
2002-08-29 00:00:57 +00:00
parent d7526269d7
commit 74ec200f31
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/storage/MimeTypeTest.cpp
+4 -2
View File
@@ -2300,7 +2300,7 @@ MimeTypeTest::SupportingAppsTest() {
msg.PrintToStream(); msg.PrintToStream();
} */ } */
NextSubTest(); NextSubTest();
if (true) // Doesn't quite work right yet. if (true)
{ {
std::set<std::string> typeList; // Stores all installed MIME types std::set<std::string> typeList; // Stores all installed MIME types
std::set<std::string> appList; // Stores all installed application subtypes std::set<std::string> appList; // Stores all installed application subtypes
@@ -2378,6 +2378,7 @@ MimeTypeTest::SupportingAppsTest() {
} }
} }
#if !TEST_R5
// Now, add in all the types listed in MIME_DB_DIR/__mime_table // Now, add in all the types listed in MIME_DB_DIR/__mime_table
{ {
BEntry entry((std::string(mimeDatabaseDir) + "/__mime_table").c_str()); BEntry entry((std::string(mimeDatabaseDir) + "/__mime_table").c_str());
@@ -2406,6 +2407,7 @@ MimeTypeTest::SupportingAppsTest() {
} }
} }
} }
#endif
// For each installed type, get a list of the supported apps, and // For each installed type, get a list of the supported apps, and
// verify that the list matches the list we generated. Also check // verify that the list matches the list we generated. Also check
@@ -2465,7 +2467,7 @@ MimeTypeTest::WildcardAppsTest() {
#if TEST_R5 #if TEST_R5
CHK(BMimeType::GetWildcardApps(NULL) == B_OK); // R5 == B_OK (???) CHK(BMimeType::GetWildcardApps(NULL) == B_OK); // R5 == B_OK (???)
#else #else
CHK(RES(BMimeType::GetWildcardApps(NULL)) != B_OK); // Personally I think we ought to return B_BAD_VALUE CHK(BMimeType::GetWildcardApps(NULL) == B_BAD_VALUE);
#endif #endif
} }
// Normal function (compare to BMimeType("application/octet-stream").GetSupportingApps()) // Normal function (compare to BMimeType("application/octet-stream").GetSupportingApps())