Fix handling of some failure cases

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1882 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shadow303 2002-11-09 00:54:02 +00:00
parent 6de29761ec
commit 394cc79e32
3 changed files with 30 additions and 0 deletions

View File

@ -29,6 +29,9 @@
*/ */
void BClipboardTester::BClipboard1() void BClipboardTester::BClipboard1()
{ {
#ifdef TEST_R5
CHK(false);
#endif
BClipboard clip(NULL); BClipboard clip(NULL);
CHK(strcmp(clip.Name(),"system") == 0); CHK(strcmp(clip.Name(),"system") == 0);
} }

View File

@ -48,6 +48,7 @@ static int32 LockTest2(void *data)
*/ */
void LockTester::Lock2() void LockTester::Lock2()
{ {
CHK(false); // fail until I figure out why it is hanging
BClipboard *clip = new BClipboard("Lock2"); BClipboard *clip = new BClipboard("Lock2");
/* This method isn't guaranteed to work, but *should* work. /* This method isn't guaranteed to work, but *should* work.

View File

@ -30,8 +30,12 @@
*/ */
void ReadWriteTester::Clear1() void ReadWriteTester::Clear1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Clear1"); BClipboard clip("Clear1");
#ifdef TEST_R5
CHK(false);
#endif
CHK(clip.Clear() == B_ERROR); CHK(clip.Clear() == B_ERROR);
} }
@ -43,6 +47,7 @@ void ReadWriteTester::Clear1()
*/ */
void ReadWriteTester::Clear2() void ReadWriteTester::Clear2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Clear2"); BClipboard clip("Clear2");
BMessage *data; BMessage *data;
@ -61,8 +66,12 @@ void ReadWriteTester::Clear2()
*/ */
void ReadWriteTester::Revert1() void ReadWriteTester::Revert1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Revert1"); BClipboard clip("Revert1");
#ifdef TEST_R5
CHK(false);
#endif
CHK(clip.Revert() == B_ERROR); CHK(clip.Revert() == B_ERROR);
} }
@ -74,6 +83,7 @@ void ReadWriteTester::Revert1()
*/ */
void ReadWriteTester::Revert2() void ReadWriteTester::Revert2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Revert2"); BClipboard clip("Revert2");
BMessage *data; BMessage *data;
char *str; char *str;
@ -114,8 +124,12 @@ void ReadWriteTester::Revert2()
*/ */
void ReadWriteTester::Commit1() void ReadWriteTester::Commit1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Commit1"); BClipboard clip("Commit1");
#ifdef TEST_R5
CHK(false);
#endif
CHK(clip.Commit() == B_ERROR); CHK(clip.Commit() == B_ERROR);
} }
@ -127,6 +141,7 @@ void ReadWriteTester::Commit1()
*/ */
void ReadWriteTester::Commit2() void ReadWriteTester::Commit2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clipA("Commit2"); BClipboard clipA("Commit2");
BClipboard clipB("Commit2"); BClipboard clipB("Commit2");
BMessage *data; BMessage *data;
@ -161,8 +176,12 @@ void ReadWriteTester::Commit2()
*/ */
void ReadWriteTester::Data1() void ReadWriteTester::Data1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Data1"); BClipboard clip("Data1");
#ifdef TEST_R5
CHK(false);
#endif
CHK(!clip.Data()); CHK(!clip.Data());
} }
@ -173,6 +192,7 @@ void ReadWriteTester::Data1()
*/ */
void ReadWriteTester::Data2() void ReadWriteTester::Data2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("Data2"); BClipboard clip("Data2");
BMessage *data; BMessage *data;
char *str; char *str;
@ -204,6 +224,7 @@ void ReadWriteTester::Data2()
*/ */
void ReadWriteTester::DataSource1() void ReadWriteTester::DataSource1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("DataSource1"); BClipboard clip("DataSource1");
CHK(!clip.DataSource().IsValid()); CHK(!clip.DataSource().IsValid());
@ -216,6 +237,7 @@ void ReadWriteTester::DataSource1()
*/ */
void ReadWriteTester::DataSource2() void ReadWriteTester::DataSource2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clipA("DataSource2"); BClipboard clipA("DataSource2");
BClipboard clipB("DataSource2"); BClipboard clipB("DataSource2");
BMessage *data; BMessage *data;
@ -240,6 +262,7 @@ void ReadWriteTester::DataSource2()
*/ */
void ReadWriteTester::DataSource3() void ReadWriteTester::DataSource3()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clipA("DataSource3"); BClipboard clipA("DataSource3");
BClipboard clipB("DataSource3"); BClipboard clipB("DataSource3");
BMessage *data; BMessage *data;
@ -268,6 +291,7 @@ void ReadWriteTester::DataSource3()
*/ */
void ReadWriteTester::StartWatching1() void ReadWriteTester::StartWatching1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("StartWatching1"); BClipboard clip("StartWatching1");
BMessage *data; BMessage *data;
char *str; char *str;
@ -295,6 +319,7 @@ void ReadWriteTester::StartWatching1()
*/ */
void ReadWriteTester::StopWatching1() void ReadWriteTester::StopWatching1()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("StopWatching1"); BClipboard clip("StopWatching1");
if ( clip.StartWatching(be_app_messenger) == B_OK ) if ( clip.StartWatching(be_app_messenger) == B_OK )
{ {
@ -309,6 +334,7 @@ void ReadWriteTester::StopWatching1()
*/ */
void ReadWriteTester::StopWatching2() void ReadWriteTester::StopWatching2()
{ {
BApplication app("application/x-vnd.clipboardtest");
BClipboard clip("StopWatching2"); BClipboard clip("StopWatching2");
CHK(clip.StopWatching(be_app_messenger) == B_BAD_VALUE); CHK(clip.StopWatching(be_app_messenger) == B_BAD_VALUE);
} }