Generate unit test for the grup case

martinfantini · martinfantini · commit 372257279eda · 2025-02-28T16:51:02.000+01:00
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -21,6 +21,7 @@ FASTTYPEGEN_TARGET(simple_types9 simple9.xml)
 FASTTYPEGEN_TARGET(simple_types10 simple10.xml)
 FASTTYPEGEN_TARGET(simple_types11 simple11.xml)
 FASTTYPEGEN_TARGET(simple_types12 simple12.xml)
+FASTTYPEGEN_TARGET(simple_types13 simple13.xml)
 
 
 FASTTYPEGEN_TARGET(test_types1 test1.xml test2.xml)
@@ -41,6 +42,8 @@ add_executable (mfast_test
                 encoder_decoder_test.cpp
                 encoder_decoder_test_v2.cpp
                 field_comparator_test.cpp
+                group_encoder_decoder_v2.cpp
+                group_encoder_decoder.cpp
                 coder_test.cpp
                 value_storage_test.cpp
                 ${FASTTYPEGEN_test_types1_OUTPUTS}
@@ -60,6 +63,7 @@ add_executable (mfast_test
                 ${FASTTYPEGEN_simple_types10_OUTPUTS}
                 ${FASTTYPEGEN_simple_types11_OUTPUTS}
                 ${FASTTYPEGEN_simple_types12_OUTPUTS}
+                ${FASTTYPEGEN_simple_types13_OUTPUTS}
                 fast_type_gen_test.cpp
                 dictionary_builder_test.cpp
                 json_test.cpp
diff --git a/tests/fast_test_coding_case.hpp b/tests/fast_test_coding_case.hpp
@@ -0,0 +1,47 @@
+#include <mfast.h>
+#include <mfast/coder/fast_encoder.h>
+#include <mfast/coder/fast_decoder.h>
+#include "byte_stream.h"
+
+namespace test::coding
+{
+template<typename DESC>
+class fast_test_coding_case
+{
+    public:
+        fast_test_coding_case()
+        {
+            encoder_.include({DESC::instance()});
+            decoder_.include({DESC::instance()});
+        }
+
+        bool encoding(const mfast::message_cref& msg_ref, const byte_stream& result, bool reset=false)
+        {
+            const int buffer_size = 128;
+            char buffer[buffer_size];
+        
+            std::size_t encoded_size = encoder_.encode(msg_ref,
+                                                        buffer,
+                                                        buffer_size,
+                                                        reset);
+        
+            if (result == byte_stream(buffer, encoded_size))
+                return true;
+
+            INFO(  "Got \"" << byte_stream(buffer, encoded_size) << "\" instead." );
+            return false;
+        }
+
+        bool decoding(const byte_stream& bytes, const mfast::message_cref& result, bool reset=false)
+        {
+            const char* first = bytes.data();
+            mfast::message_cref msg = decoder_.decode(first, first+bytes.size(), reset);
+
+            return (msg == result);
+        }
+
+    private:
+        mfast::fast_encoder encoder_;
+        mfast::fast_decoder decoder_;
+};
+}
diff --git a/tests/fast_test_coding_case_v2.hpp b/tests/fast_test_coding_case_v2.hpp
@@ -0,0 +1,44 @@
+#include <mfast.h>
+#include <mfast/coder/fast_encoder_v2.h>
+#include <mfast/coder/fast_decoder_v2.h>
+#include "byte_stream.h"
+
+namespace test::coding
+{
+template<typename DESC>
+class fast_test_coding_case_v2
+{
+    public:
+        fast_test_coding_case_v2():
+            encoder_v2_(DESC::instance()),
+            decoder_v2_(DESC::instance())
+        {}
+
+        bool
+        encoding(const mfast::message_cref& msg_ref, const byte_stream& result, bool reset=false)
+        {
+            const int buffer_size = 128;
+            char buffer[buffer_size];
+      
+            std::size_t encoded_size = encoder_v2_.encode(msg_ref, buffer, buffer_size, reset);
+            if (result == byte_stream(buffer, encoded_size))
+              return true;
+
+            INFO(  "Got \"" << byte_stream(buffer, encoded_size) << "\" instead." );
+            return false;
+        }
+
+        bool
+        decoding(const byte_stream& bytes, const mfast::message_cref& result, bool reset=false)
+        {
+          const char* first = bytes.data();
+          mfast::message_cref msg = decoder_v2_.decode(first, first+bytes.size(), reset);
+
+          return (msg == result);
+        }
+
+    private:
+        mfast::fast_encoder_v2 encoder_v2_;
+        mfast::fast_decoder_v2<0> decoder_v2_;
+};
+}
diff --git a/tests/group_encoder_decoder.cpp b/tests/group_encoder_decoder.cpp
@@ -4,16 +4,16 @@
 #include "fast_test_coding_case.hpp"
 #include "byte_stream.h"
 
-#include "simple14.h"
+#include "simple13.h"
 
 using namespace test::coding;
 
 TEST_CASE("only field without group encoder/decoder","[field_without_group_encoder_decoder]")
 {
-    fast_test_coding_case<simple14::templates_description> test_case;
+    fast_test_coding_case<simple13::templates_description> test_case;
 
-    simple14::Test_1 test_1;
-    simple14::Test_1_mref test_1_mref = test_1.mref();
+    simple13::Test_1 test_1;
+    simple13::Test_1_mref test_1_mref = test_1.mref();
 
     test_1_mref.set_field_1_1().as(30);
     test_1_mref.set_field_1_2().as(40);
@@ -24,10 +24,10 @@ TEST_CASE("only field without group encoder/decoder","[field_without_group_encod
 
 TEST_CASE("field with group encoder/decoder","[field_without_group_encoder_decoder]")
 {
-    fast_test_coding_case<simple14::templates_description> test_case;
+    fast_test_coding_case<simple13::templates_description> test_case;
 
-    simple14::Test_1 test_1;
-    simple14::Test_1_mref test_1_mref = test_1.mref();
+    simple13::Test_1 test_1;
+    simple13::Test_1_mref test_1_mref = test_1.mref();
 
     test_1_mref.set_field_1_1().as(30);
     test_1_mref.set_field_1_2().as(40);
diff --git a/tests/group_encoder_decoder_v2.cpp b/tests/group_encoder_decoder_v2.cpp
@@ -4,16 +4,16 @@
 #include "fast_test_coding_case_v2.hpp"
 #include "byte_stream.h"
 
-#include "simple14.h"
+#include "simple13.h"
 
 using namespace test::coding;
 
 TEST_CASE("only field without group encoder_v2/decoder_v2","[field_without_group_encoder_v2_decoder_v2]")
 {
-    fast_test_coding_case_v2<simple14::templates_description> test_case;
+    fast_test_coding_case_v2<simple13::templates_description> test_case;
 
-    simple14::Test_1 test_1;
-    simple14::Test_1_mref test_1_mref = test_1.mref();
+    simple13::Test_1 test_1;
+    simple13::Test_1_mref test_1_mref = test_1.mref();
 
     test_1_mref.set_field_1_1().as(30);
     test_1_mref.set_field_1_2().as(40);
@@ -24,10 +24,10 @@ TEST_CASE("only field without group encoder_v2/decoder_v2","[field_without_group
 
 TEST_CASE("field with group encoder_v2/decoder_v2","[field_without_group_encoder_v2_decoder_v2]")
 {
-    fast_test_coding_case_v2<simple14::templates_description> test_case;
+    fast_test_coding_case_v2<simple13::templates_description> test_case;
 
-    simple14::Test_1 test_1;
-    simple14::Test_1_mref test_1_mref = test_1.mref();
+    simple13::Test_1 test_1;
+    simple13::Test_1_mref test_1_mref = test_1.mref();
 
     test_1_mref.set_field_1_1().as(30);
     test_1_mref.set_field_1_2().as(40);
diff --git a/tests/simple13.xml b/tests/simple13.xml
@@ -0,0 +1,16 @@
+<?xml version=\" 1.0 \"?>
+<templates xmlns="http://www.fixprotocol.org/ns/fast/td/1.1">
+    <template name="Test_1" id="1">
+        <uInt32 name="field_1_1" id="11" presence="optional"></uInt32>
+        <uInt32 name="field_1_2" id="12"></uInt32>
+        <group name="group_1" presence="optional">
+            <string name="field_1_3" id="13">
+                <default value="test"/>
+            </string>
+            <uInt32 name="field_1_4" id="14" presence="optional"></uInt32>
+        </group>
+    </template>
+    <template name="Test_2" id="2">
+        <uInt32 name="field_2_1" id="21" presence="optional"></uInt32>
+    </template>
+</templates>
