Parcourir la source

Message's test completed

mikymod il y a 13 ans
Parent
commit
5246584a49
3 fichiers modifiés avec 60 ajouts et 7 suppressions
  1. 1 1
      src/network/Message.cpp
  2. 10 0
      src/os/OS.h
  3. 49 6
      tests/messages.cpp

+ 1 - 1
src/network/Message.cpp

@@ -495,7 +495,7 @@ int32_t Message::read_bits(int32_t num_bits) const
 	int32_t		value_bits;
 	int32_t		get;
 	int32_t		fraction;
-	bool	sgn;
+	bool		sgn;
 
 	if (!r_data) 
 	{

+ 10 - 0
src/os/OS.h

@@ -157,6 +157,16 @@ struct IPv4Address
 
 		port = p;
 	}
+	
+	void set(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t p)
+	{
+		address[0] = a;
+		address[1] = b;
+		address[2] = c;
+		address[3] = d;
+		
+		port = p;
+	}
 };
 
 //-----------------------------------------------------------------------------

+ 49 - 6
tests/messages.cpp

@@ -277,31 +277,74 @@ void test_string()
 }
 
 void test_data()
-{/*
+{
   	uint32_t bits_written;
 	uint32_t rem_write_bits;
 	uint32_t bits_read;
 	uint32_t rem_read_bits; 
 	
-  	network::Message m = network::Message();*/
+  	network::Message m = network::Message();
+	
+	uint8_t tmp[] = "test generic";
+	uint8_t res[16];
+	
+	m.init(tmp, 16);
+	
+	m.write_data(tmp, 16);
+ 	bits_written = m.get_num_bits_written();
+  	rem_write_bits = m.get_remaining_write_bits();	
+	
+	m.read_data(res, 16);
+	bits_read = m.get_num_bits_read();
+	rem_read_bits = m.get_remaining_read_bits();
+	
 	printf("-----------------------------\n");
 	printf("start write and read for GENERIC\n");
+	printf("string = %s\n", res);
+	printf("bits written = %d\n", bits_written);
+	printf("remaining write bits = %d\n", rem_write_bits);
+	printf("bits read = %d\n", bits_read);
+	printf("remaining read bits = %d\n", rem_read_bits);
 	printf("-----------------------------\n");
-
+	printf("\n");	
 
 }
 
 void test_net_address()
-{/*
+{
   	uint32_t bits_written;
 	uint32_t rem_write_bits;
 	uint32_t bits_read;
 	uint32_t rem_read_bits; 
 	
-  	network::Message m = network::Message();*/
-  	printf("-----------------------------\n");
+	network::Message m = network::Message();
+
+	uint8_t tmp[16];
+	
+	
+	os::IPv4Address addr;
+	os::IPv4Address res;
+	
+	addr.set(192, 168, 0, 1, 80);
+	
+	m.init(tmp, 16);
+	m.write_ipv4addr(addr);
+	bits_written = m.get_num_bits_written();
+	rem_write_bits = m.get_remaining_write_bits();	
+	
+	m.read_ipv4addr(&res);
+	bits_read = m.get_num_bits_read();
+	rem_read_bits = m.get_remaining_read_bits();
+	
+	printf("-----------------------------\n");
 	printf("start write and read for NET_ADDRESS\n");
+	printf("a = %d, b = %d, c = %d, d = %d, p = %d\n", res.address[0], res.address[1], res.address[2], res.address[3], res.port);
+	printf("bits written = %d\n", bits_written);
+	printf("remaining write bits = %d\n", rem_write_bits);
+	printf("bits read = %d\n", bits_read);
+	printf("remaining read bits = %d\n", rem_read_bits);
 	printf("-----------------------------\n");
+	printf("\n");	
 }
 
 int main()