Merge pull request #153 from martinfantini/optional_decimal

Optional decimal

Author: huangminghuang

src/mfast/coder/encoder/encoder_field_operator.cpp

@@ -548,6 +548,7 @@ class delta_operator : public encoder_field_operator,
             cref.exponent() - bv.of_decimal.exponent_;
         delta_storage.of_decimal.mantissa_ =
             cref.mantissa() - bv.of_decimal.mantissa_;
+        delta_storage.of_decimal.present_ = cref.present();
 
         decimal_cref delta(&delta_storage, cref.instruction());
         stream << delta;

tests/encoder_decoder_test.cpp

@@ -280,3 +280,19 @@ TEST_CASE("sequence optional with constant length encoder/decoder","[optional_se
         REQUIRE(test_case.decoding("\xF0\x87\x82\xa0\x82\x82",test_7.cref(),true));
     }
 }
+
+TEST_CASE("decimal optional encoder/decoder","[decimal_optional_encoder_decoder]")
+{
+    fast_test_coding_case<simple12::templates_description> test_case;
+
+    SECTION("encode decimal value")
+    {
+        simple12::Test_8 test_8;
+        simple12::Test_8_mref test_8_mref = test_8.mref();
+        test_8_mref.set_field_8_1().as(15, 1);
+        test_8_mref.set_field_8_2().as(20);
+
+        REQUIRE(test_case.encoding(test_8.cref(),"\xE0\x88\x81\x8F\x94",true));
+        REQUIRE(test_case.decoding("\xE0\x88\x81\x8F\x94",test_8.cref(),true));
+    }
+}

tests/encoder_decoder_test_v2.cpp

@@ -281,3 +281,19 @@ TEST_CASE("sequence optional with constant length encoder_v2/decoder_v2","[optio
         REQUIRE(test_case.decoding("\xF0\x87\x82\xa0\x82\x82",test_7.cref(),true));
     }
 }
+
+TEST_CASE("decimal optional encoder_v2/decoder_v2","[decimal_optional_encoder_v2/decoder_v2]")
+{
+    fast_test_coding_case_v2<simple12::templates_description> test_case;
+
+    SECTION("encode decimal value")
+    {
+        simple12::Test_8 test_8;
+        simple12::Test_8_mref test_8_mref = test_8.mref();
+        test_8_mref.set_field_8_1().as(15, 1);
+        test_8_mref.set_field_8_2().as(20);
+
+        REQUIRE(test_case.encoding(test_8.cref(),"\xE0\x88\x81\x8F\x94",true));
+        REQUIRE(test_case.decoding("\xE0\x88\x81\x8F\x94",test_8.cref(),true));
+    }
+}

tests/sequence_encoder_decoder.cpp

@@ -275,3 +275,24 @@ TEST_CASE("sequence with optional group encoder/decoder","[sequence_optional_gro
         REQUIRE(test_case.decoding("\xC0\x87\x81\xE0\xB2\x94",test_7.cref(),true));
     }
 }
+
+TEST_CASE("sequence with optional decimal encoder/decoder", "[sequence_with_optional_decimal_encoder_decoder]")
+{
+    fast_test_coding_case<simple14::templates_description> test_case;
+
+    SECTION("decimal present")
+    {
+        simple14::Test_8 test_8;
+        simple14::Test_8_mref test_8_mref = test_8.mref();
+
+        auto sequence_8_mref = test_8_mref.set_sequence_8();
+        sequence_8_mref.resize(1);
+
+        auto element_sequence = sequence_8_mref.front();
+        element_sequence.set_field_8_2().as(50);
+        element_sequence.set_field_8_3().as(10, 1);
+
+        REQUIRE(test_case.encoding(test_8.cref(),"\xC0\x88\x81\xC0\xB2\x82\x8A",true));
+        REQUIRE(test_case.decoding("\xC0\x88\x81\xC0\xB2\x82\x8A",test_8.cref(),true));
+    }
+}

tests/sequence_encoder_decoder_v2.cpp

@@ -277,3 +277,24 @@ TEST_CASE("sequence with optional group encoder_V2/decoder_v2","[sequence_option
         REQUIRE(test_case.decoding("\xC0\x87\x81\xE0\xB2\x94",test_7.cref(),true));
     }
 }
+
+TEST_CASE("sequence with optional decimal encoder_V2/decoder_v2", "[sequence_with_optional_decimal_encoder_v2_decoder_v2]")
+{
+    fast_test_coding_case_v2<simple14::templates_description> test_case;
+
+    SECTION("decimal present")
+    {
+        simple14::Test_8 test_8;
+        simple14::Test_8_mref test_8_mref = test_8.mref();
+
+        auto sequence_8_mref = test_8_mref.set_sequence_8();
+        sequence_8_mref.resize(1);
+
+        auto element_sequence = sequence_8_mref.front();
+        element_sequence.set_field_8_2().as(50);
+        element_sequence.set_field_8_3().as(10, 1);
+
+        REQUIRE(test_case.encoding(test_8.cref(),"\xC0\x88\x81\xC0\xB2\x82\x8A",true));
+        REQUIRE(test_case.decoding("\xC0\x88\x81\xC0\xB2\x82\x8A",test_8.cref(),true));
+    }
+}

tests/simple12.xml

@@ -65,4 +65,8 @@
             </uInt32>
         </sequence>
     </template>
+    <template name="Test_8" id="8">
+        <decimal name="field_8_1" id="81"><delta/></decimal>
+        <uInt32 name="field_8_2" id="82"><copy/></uInt32>
+    </template>
 </templates>

tests/simple14.xml

@@ -63,4 +63,11 @@
             </group>
         </sequence>
     </template>
+    <template name="Test_8" id="8">
+        <sequence name="sequence_8">
+            <length name="field_8_1" id="81"></length>
+            <uInt32 name="field_8_2" id="82"><copy/></uInt32>
+            <decimal name="field_8_3" id="84" presence="optional"><delta/></decimal>
+        </sequence>
+    </template>
 </templates>