[haiku-commits] haiku: hrev47343 - in src/tests/kits: storage translation
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 10 Jun 2014 10:11:53 +0200 (CEST)
hrev47343 adds 3 changesets to branch 'master'
old head: 888f72ca9a5e2fcd22b4839c7aebce12e03c336e
new head: 0256e7a458a84de206700fcfef9aa8410ed8642a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=0256e7a+%5E888f72c
----------------------------------------------------------------------------
64e8975: ResourcesTest: fix build.
* There are several SetTo methods, specify the one we want to test.
182a5f8: Disable test for TranslatorResoter::Version
* The method was made private and deprecated, so there is no way to
compile code calling it directly.
0256e7a: Disable the MIME type test.
* This tests requires some private APIs which have been changed, it
needs to be rewritten.
* I'm also not sure if it's still possible to work on a copy of the MIME
* database to avoid messing with the system one.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 12 insertions(+), 13 deletions(-)
src/tests/kits/storage/Jamfile | 2 +-
src/tests/kits/storage/ResourcesTest.cpp | 4 ++--
src/tests/kits/storage/StorageKitTestAddon.cpp | 2 ++
src/tests/kits/translation/TranslatorRosterTest.cpp | 17 +++++++----------
############################################################################
Commit: 64e89753697ab65a6cec75a37dbe605791ed6183
URL: http://cgit.haiku-os.org/haiku/commit/?id=64e8975
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Jun 10 08:08:34 2014 UTC
ResourcesTest: fix build.
* There are several SetTo methods, specify the one we want to test.
----------------------------------------------------------------------------
diff --git a/src/tests/kits/storage/ResourcesTest.cpp
b/src/tests/kits/storage/ResourcesTest.cpp
index 7b8738e..17ef3a3 100644
--- a/src/tests/kits/storage/ResourcesTest.cpp
+++ b/src/tests/kits/storage/ResourcesTest.cpp
@@ -519,7 +519,7 @@ ResourcesTest::InitTest()
BResources resources;
// R5: A NULL file is B_OK!
// CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_BAD_VALUE );
- CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_OK );
+ CPPUNIT_ASSERT( resources.SetTo((BFile*)NULL, false) == B_OK );
}
}
@@ -923,7 +923,7 @@ ResourcesTest::ReadTest()
BResources resources;
// R5: A NULL file is B_OK!
// CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_BAD_VALUE );
- CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_OK );
+ CPPUNIT_ASSERT( resources.SetTo((BFile*)NULL, false) == B_OK );
ReadBadResTest(resources, testResource1);
}
// bad args
############################################################################
Commit: 182a5f8e531124740aba1e17e3026b03a1b1bab5
URL: http://cgit.haiku-os.org/haiku/commit/?id=182a5f8
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Jun 10 08:09:13 2014 UTC
Disable test for TranslatorResoter::Version
* The method was made private and deprecated, so there is no way to
compile code calling it directly.
----------------------------------------------------------------------------
diff --git a/src/tests/kits/translation/TranslatorRosterTest.cpp
b/src/tests/kits/translation/TranslatorRosterTest.cpp
index 52dc504..adf57c6 100644
--- a/src/tests/kits/translation/TranslatorRosterTest.cpp
+++ b/src/tests/kits/translation/TranslatorRosterTest.cpp
@@ -31,12 +31,15 @@
// DEALINGS IN THE SOFTWARE.
/*****************************************************************************/
#include "TranslatorRosterTest.h"
+
#include <stdio.h>
-#include <Message.h>
+
+#include <Application.h>
#include <Archivable.h>
#include <File.h>
-#include <Application.h>
+#include <Message.h>
#include <OS.h>
+#include <TranslatorFormats.h>
/* cppunit framework */
#include <cppunit/Test.h>
@@ -142,14 +145,6 @@ TranslatorRosterTest::InitializeTest()
NextSubTest();
BTranslatorRoster *proster = BTranslatorRoster::Default();
CPPUNIT_ASSERT(proster);
-
- //print version information
- int32 outCurVersion;
- int32 outMinVersion;
- long inAppVersion;
- const char *info = proster->Version(&outCurVersion, &outMinVersion,
- inAppVersion);
- printf("Default TranslatorRoster aquired. Version: %s\n", info);
}
/**
@@ -372,6 +367,7 @@ TranslatorRosterTest::InstantiateTest()
void
TranslatorRosterTest::VersionTest()
{
+#if 0
NextSubTest();
int32 outCurVersion = 0;
int32 outMinVersion = 0;
@@ -381,6 +377,7 @@ TranslatorRosterTest::VersionTest()
CPPUNIT_ASSERT(info != NULL);
CPPUNIT_ASSERT(outCurVersion > 0);
CPPUNIT_ASSERT(outMinVersion > 0);
+#endif
}
//
############################################################################
Revision: hrev47343
Commit: 0256e7a458a84de206700fcfef9aa8410ed8642a
URL: http://cgit.haiku-os.org/haiku/commit/?id=0256e7a
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Jun 10 08:10:30 2014 UTC
Disable the MIME type test.
* This tests requires some private APIs which have been changed, it
needs to be rewritten.
* I'm also not sure if it's still possible to work on a copy of the MIME
* database to avoid messing with the system one.
----------------------------------------------------------------------------
diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile
index fbd52e2..f933155 100644
--- a/src/tests/kits/storage/Jamfile
+++ b/src/tests/kits/storage/Jamfile
@@ -14,7 +14,7 @@ UnitTestLib libstoragetest.so
FindDirectoryTest.cpp
FileTest.cpp
MimeSnifferTest.cpp
- MimeTypeTest.cpp
+ # MimeTypeTest.cpp
NodeInfoTest.cpp
NodeTest.cpp
PathTest.cpp
diff --git a/src/tests/kits/storage/StorageKitTestAddon.cpp
b/src/tests/kits/storage/StorageKitTestAddon.cpp
index 2b17aa6..2a50a2e 100644
--- a/src/tests/kits/storage/StorageKitTestAddon.cpp
+++ b/src/tests/kits/storage/StorageKitTestAddon.cpp
@@ -26,7 +26,9 @@ BTestSuite* getTestSuite() {
suite->addTest("BDirectory", DirectoryTest::Suite());
suite->addTest("BEntry", EntryTest::Suite());
suite->addTest("BFile", FileTest::Suite());
+#if 0
suite->addTest("BMimeType", MimeTypeTest::Suite());
+#endif
suite->addTest("BNode", NodeTest::Suite());
suite->addTest("BNodeInfo", NodeInfoTest::Suite());
suite->addTest("BPath", PathTest::Suite());
Other related posts:
