From e60c601e2d12770c060d3b4500dfbb1bd799bd9c Mon Sep 17 00:00:00 2001
From: ejakowatz <ejakowatz@nowhere.fake>
Date: Thu, 20 Mar 2003 05:37:07 +0000
Subject: [PATCH] Tweaks to make the tests work correctly and properly scope a
 BMessage function.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2966 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/app/Message.cpp                            | 12 ++++++++----
 src/tests/kits/app/bmessage/MessageDoubleItemTest.h |  2 +-
 src/tests/kits/app/bmessage/MessageFloatItemTest.h  |  2 +-
 src/tests/kits/app/bmessage/MessageTest.cpp         | 10 ++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 94a5a936ab..0224bbaaa3 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -28,6 +28,8 @@
 //					the scripting mechanisms.
 //------------------------------------------------------------------------------
 
+#define USING_TEMPLATE_MADNESS
+
 // Standard Includes -----------------------------------------------------------
 #include <stdio.h>
 
@@ -313,13 +315,15 @@ status_t BMessage::SendReply(uint32 command, BHandler* reply_to)
 status_t BMessage::SendReply(BMessage* the_reply, BHandler* reply_to,
 							 bigtime_t timeout)
 {
-	// TODO: implement
+	BMessenger messenger(fReplyTo.team, fReplyTo.port, fReplyTo.target,
+						 fReplyTo.preferred);
+	return SendReply(the_reply, messenger, timeout);
 }
 //------------------------------------------------------------------------------
 status_t BMessage::SendReply(BMessage* the_reply, BMessenger reply_to,
 							 bigtime_t timeout)
 {
-	// TODO: implement
+	// TODO: implement *
 }
 //------------------------------------------------------------------------------
 status_t BMessage::SendReply(uint32 command, BMessage* reply_to_reply)
@@ -331,7 +335,7 @@ status_t BMessage::SendReply(uint32 command, BMessage* reply_to_reply)
 status_t BMessage::SendReply(BMessage* the_reply, BMessage* reply_to_reply,
 							 bigtime_t send_timeout, bigtime_t reply_timeout)
 {
-	// TODO: implement
+	// TODO: implement *
 }
 //------------------------------------------------------------------------------
 ssize_t BMessage::FlattenedSize() const
@@ -588,7 +592,7 @@ status_t BMessage::AddSpecifier(const BMessage* specifier)
 	return err;
 }
 //------------------------------------------------------------------------------
-status_t SetCurrentSpecifier(int32 index)
+status_t BMessage::SetCurrentSpecifier(int32 index)
 {
 	type_code	type;
 	int32		count;
diff --git a/src/tests/kits/app/bmessage/MessageDoubleItemTest.h b/src/tests/kits/app/bmessage/MessageDoubleItemTest.h
index 149a9ee4b7..e0ef063855 100644
--- a/src/tests/kits/app/bmessage/MessageDoubleItemTest.h
+++ b/src/tests/kits/app/bmessage/MessageDoubleItemTest.h
@@ -45,7 +45,7 @@ struct TDoubleInitPolicy : public ArrayTypeBase<double>
 	}
 };
 
-struct TInt8AssertPolicy
+struct TDoubleAssertPolicy
 {
 	inline static double Zero()		{ return 0; }
 	inline static double Invalid()	{ return 0;}
diff --git a/src/tests/kits/app/bmessage/MessageFloatItemTest.h b/src/tests/kits/app/bmessage/MessageFloatItemTest.h
index f5a4667c6d..ce107fc5c6 100644
--- a/src/tests/kits/app/bmessage/MessageFloatItemTest.h
+++ b/src/tests/kits/app/bmessage/MessageFloatItemTest.h
@@ -45,7 +45,7 @@ struct TFloatInitPolicy : public ArrayTypeBase<float>
 	}
 };
 
-struct TInt8AssertPolicy
+struct TFloatAssertPolicy
 {
 	inline static float Zero()		{ return 0; }
 	inline static float Invalid()	{ return 0;}
diff --git a/src/tests/kits/app/bmessage/MessageTest.cpp b/src/tests/kits/app/bmessage/MessageTest.cpp
index 983cdd5fe7..dc71292852 100644
--- a/src/tests/kits/app/bmessage/MessageTest.cpp
+++ b/src/tests/kits/app/bmessage/MessageTest.cpp
@@ -4,8 +4,6 @@
 #include "MessageConstructTest.h"
 #include "MessageOpAssignTest.h"
 #include "MessageBoolItemTest.h"
-#include "MessageFloatItemTest.h"
-#include "MessageDoubleItemTest.h"
 #include "MessageInt8ItemTest.h"
 #include "MessageInt16ItemTest.h"
 #include "MessageInt32ItemTest.h"
@@ -13,6 +11,9 @@
 #include "MessageBRectItemTest.h"
 #include "MessageBPointItemTest.h"
 #include "MessageEasyFindTest.h"
+#include "MessageFloatItemTest.h"
+#include "MessageDoubleItemTest.h"
+//#include "MessageRefItemTest.h"
 
 Test* MessageTestSuite()
 {
@@ -21,8 +22,6 @@ Test* MessageTestSuite()
 	tests->addTest(TMessageConstructTest::Suite());
 	tests->addTest(TMessageOpAssignTest::Suite());
 	tests->addTest(TMessageBoolItemTest::Suite());
-	tests->addTest(TMessageFloatItemTest::Suite());
-	tests->addTest(TMessageDoubleItemTest::Suite());
 	tests->addTest(TMessageInt8ItemTest::Suite());
 	tests->addTest(TMessageInt16ItemTest::Suite());
 	tests->addTest(TMessageInt32ItemTest::Suite());
@@ -30,6 +29,9 @@ Test* MessageTestSuite()
 	tests->addTest(TMessageBRectItemTest::Suite());
 	tests->addTest(TMessageBPointItemTest::Suite());
 	tests->addTest(TMessageEasyFindTest::Suite());
+	tests->addTest(TMessageFloatItemTest::Suite());
+	tests->addTest(TMessageDoubleItemTest::Suite());
+//	tests->addTest(TMessageRefItemTest::Suite());
 
 	return tests;
 }