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

The BTestApp class from libcppunit always uses R5's BApplication, but here a Haiku BMessenger is tried to be created from it, which can't work. Can probably be rewritten to work, but I'm too lazy at the moment.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10685 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-01-12 03:46:14 +00:00
parent c10206311d
commit 77b9927bb4
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/app/RegistrarThreadManagerTest.cpp
+18 -6
View File
@@ -6,7 +6,7 @@
#include <TestApp.h> #include <TestApp.h>
#include <TestUtils.h> #include <TestUtils.h>
#if !TEST_R5 #ifndef TEST_R5
#include <RegistrarThread.h> #include <RegistrarThread.h>
#include <RegistrarThreadManager.h> #include <RegistrarThreadManager.h>
#endif // !TEST_R5 #endif // !TEST_R5
@@ -28,7 +28,7 @@ RegistrarThreadManagerTest::Suite() {
return suite; return suite;
} }
#if !TEST_R5 #ifndef TEST_R5
// Base test thread class // Base test thread class
class TestThread : public RegistrarThread { class TestThread : public RegistrarThread {
public: public:
@@ -109,7 +109,7 @@ void
RegistrarThreadManagerTest::setUp() RegistrarThreadManagerTest::setUp()
{ {
BTestCase::setUp(); BTestCase::setUp();
#if !TEST_R5 #ifndef TEST_R5
// Setup our application // Setup our application
fApplication = new BTestApp("application/x-vnd.obos.RegistrarThreadManagerTest"); fApplication = new BTestApp("application/x-vnd.obos.RegistrarThreadManagerTest");
if (fApplication->Init() != B_OK) { if (fApplication->Init() != B_OK) {
@@ -124,7 +124,7 @@ RegistrarThreadManagerTest::setUp()
void void
RegistrarThreadManagerTest::tearDown() RegistrarThreadManagerTest::tearDown()
{ {
#if !TEST_R5 #ifndef TEST_R5
// Terminate the Application // Terminate the Application
if (fApplication) { if (fApplication) {
fApplication->Terminate(); fApplication->Terminate();
@@ -138,7 +138,7 @@ RegistrarThreadManagerTest::tearDown()
void void
RegistrarThreadManagerTest::ShutdownTest() RegistrarThreadManagerTest::ShutdownTest()
{ {
#if TEST_R5 #ifdef TEST_R5
Outputf("(no tests performed for R5 version)\n"); Outputf("(no tests performed for R5 version)\n");
#else #else
NextSubTest(); NextSubTest();
@@ -151,6 +151,12 @@ RegistrarThreadManagerTest::ShutdownTest()
// fApplication->AddHandler(&manager); // fApplication->AddHandler(&manager);
NextSubTest(); NextSubTest();
BMessenger managerMessenger(NULL, fApplication, &err); BMessenger managerMessenger(NULL, fApplication, &err);
// TODO: Do something about this...
if (err != B_OK) {
fprintf(stderr, "Fails because we try to init an Haiku BMessenger with a "
"BLooper from R5's libbe (more precisely a BTestApp living in libcppunit, "
"which is only linked against R5's libbe).\n");
}
NextSubTest(); NextSubTest();
CHK(err == B_OK && managerMessenger.IsValid()); CHK(err == B_OK && managerMessenger.IsValid());
NextSubTest(); NextSubTest();
@@ -222,7 +228,7 @@ RegistrarThreadManagerTest::ShutdownTest()
void void
RegistrarThreadManagerTest::ThreadLimitTest() RegistrarThreadManagerTest::ThreadLimitTest()
{ {
#if TEST_R5 #ifdef TEST_R5
Outputf("(no tests performed for R5 version)\n"); Outputf("(no tests performed for R5 version)\n");
#else #else
NextSubTest(); NextSubTest();
@@ -230,6 +236,12 @@ RegistrarThreadManagerTest::ThreadLimitTest()
RegistrarThreadManager manager; RegistrarThreadManager manager;
CHK(fApplication && fApplication->InitCheck() == B_OK); CHK(fApplication && fApplication->InitCheck() == B_OK);
BMessenger managerMessenger(NULL, fApplication, &err); BMessenger managerMessenger(NULL, fApplication, &err);
// TODO: Do something about this...
if (err != B_OK) {
fprintf(stderr, "Fails because we try to init an Haiku BMessenger with a "
"BLooper from R5's libbe (more precisely a BTestApp living in libcppunit, "
"which is only linked against R5's libbe).\n");
}
CHK(err == B_OK && managerMessenger.IsValid()); CHK(err == B_OK && managerMessenger.IsValid());
const uint termThreads = 2; const uint termThreads = 2;