[PATCH 1/2] WIP..

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- tests/rlcmac/RLCMACTest.cpp | 8 ++++---- tests/rlcmac/RLCMACTest.ok | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 66bc53c..124e643 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -89,7 +89,7 @@ void testRlcMacDownlink() std::string testData[] = { "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment - "48282407a6a074227201000b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment + "48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Assignment "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" @@ -152,9 +152,9 @@ void testRlcMacUplink() bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); std::string testData[] = { - "400e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block - "400b8020000000000000002480e00b2b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack - "4016713dc094270ca2ae57ef909006aa0fc0001f80222b" // Packet Resource Request + "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block + "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack + "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request "400a9020000000000000003010012a0800132b2b2b2b2b" }; diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 99117ff..801de42 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -7,13 +7,13 @@ vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b =========Start DECODE=========== @@ -32,21 +32,21 @@ vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE UPLINK -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b -vector2 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b =========Start DECODE=========== @@ -56,3 +56,11 @@ vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 == vector2 : TRUE +vector1 = 40a90200000000301012a80132b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 40a90200000000301012a80132b2b2b2b2b +vector2 = 40a90200000000301012a80132b2b2b2b2b +vector1 == vector2 : TRUE -- 2.6.3