X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fnet%2FPacketTest.cpp;h=5b6deed47974c1285f679d824d227ab603a0bc3d;hb=ca90ec459ca0bd48c1483a45f30496aed61e9c21;hp=751421b2f9bcb351090c34776ea4c777adbceec9;hpb=933ca0fe6c660e482edd45742d981f2de59a32df;p=blank.git

diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp
index 751421b..5b6deed 100644
--- a/tst/net/PacketTest.cpp
+++ b/tst/net/PacketTest.cpp
@@ -1,6 +1,6 @@
 #include "PacketTest.hpp"
 
-#include "model/CompositeModel.hpp"
+#include "model/Model.hpp"
 #include "world/Entity.hpp"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(blank::test::PacketTest);
@@ -45,8 +45,7 @@ void PacketTest::testSizes() {
 }
 
 void PacketTest::testControl() {
-	Packet::TControl ctrl;
-	ctrl.ack = 10;
+	Packet::TControl ctrl{ 0, 10, 0 };
 
 	CPPUNIT_ASSERT_MESSAGE(
 		"TControl should ack the packet in the ack field",
@@ -230,7 +229,7 @@ void PacketTest::testSpawnEntity() {
 
 	Entity write_entity;
 	write_entity.ID(534574);
-	CompositeModel model;
+	Model model;
 	model.ID(23);
 	model.Instantiate(write_entity.GetModel());
 	write_entity.GetState().chunk_pos = { 7, 2, -3 };
@@ -511,6 +510,46 @@ void PacketTest::testBlockUpdate() {
 	);
 }
 
+void PacketTest::testMessage() {
+	auto pack = Packet::Make<Packet::Message>(udp_pack);
+	AssertPacket("Message", 12, 6, 455, pack);
+
+	const uint8_t write_type = 1;
+	const uint32_t write_ref = 6433235;
+	const string write_msg("hello, world");
+
+	pack.length = Packet::Message::GetSize(write_msg);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"length not correctly set in BlockUpdate packet",
+		size_t(5 + write_msg.size() + 1), pack.length
+	);
+
+	pack.WriteType(write_type);
+	pack.WriteReferral(write_ref);
+	pack.WriteMessage(write_msg);
+
+	uint8_t read_type = 5;
+	uint32_t read_ref = 884373;
+	string read_msg;
+
+	pack.ReadType(read_type);
+	pack.ReadReferral(read_ref);
+	pack.ReadMessage(read_msg);
+
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"type not correctly transported in Message packet",
+		write_type, read_type
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"referral not correctly transported in Message packet",
+		write_ref, read_ref
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"message not correctly transported in Message packet",
+		write_msg, read_msg
+	);
+}
+
 
 void PacketTest::AssertPacket(
 	const string &name,