Fix sonar findings

philips-software · Nov 22, 2023 · 9722608 · 9722608
1 parent 17c12ec
commit 9722608
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/infra/syntax/Json.cpp b/infra/syntax/Json.cpp
@@ -669,7 +669,7 @@ namespace infra
             for (std::size_t count = fractional.size(); count < nanoValueWidth; ++count)
                 fractionalValue = fractionalValue * 10;
 
-        return JsonFloat(integer, fractionalValue, sign);
+        return JsonFloat(static_cast<uint32_t>(integer), fractionalValue, sign);
     }
 
     JsonObject::JsonObject(infra::BoundedConstString objectString)
@@ -1336,7 +1336,15 @@ namespace infra
                 if (token.Negative())
                     stream << '-';
 
-                stream << token.IntValue() << "." << infra::Width(9, '0') << token.NanoFractionalValue();
+                auto fractional = token.NanoFractionalValue();
+                auto width = nanoValueWidth;
+                while (width > 1 && (fractional % 10 == 0))
+                {
+                    fractional = fractional / 10;
+                    --width;
+                }
+
+                stream << token.IntValue() << "." << infra::Width(width, '0') << fractional;
             }
 
             void operator()(infra::JsonToken::Boolean token)

diff --git a/infra/syntax/JsonFormatter.cpp b/infra/syntax/JsonFormatter.cpp
@@ -360,7 +360,7 @@ namespace infra
         if (tag.NanoFractionalValue() % 1000000 == 0)
             AddFractionalFloat(tagName.Raw(), tag.IntValue(), tag.NanoFractionalValue() / 1000000, tag.Negative(), milliValueWidth);
         else
-            AddFractionalFloat(tagName.Raw(), tag.IntValue(), tag.NanoFractionalValue(), tag.Negative(), nanoValueWidth);        
+            AddFractionalFloat(tagName.Raw(), tag.IntValue(), tag.NanoFractionalValue(), tag.Negative(), nanoValueWidth);
     }
 
     void JsonObjectFormatter::Add(const infra::JsonKeyValue& keyValue)
@@ -465,7 +465,7 @@ namespace infra
 
         if (negative)
             *stream << '-';
-    
+
         *stream << intValue << '.' << infra::Width(fractionalWidth, '0') << fractionalValue;
     }
 

diff --git a/infra/syntax/test/TestJson.cpp b/infra/syntax/test/TestJson.cpp
@@ -186,9 +186,9 @@ TEST(JsonTokenizerTest, get_multiple_tokens)
 
 TEST(JsonTokenizerTest, clean_json)
 {
-    infra::BoundedString::WithStorage<512> data(R"({ "key" : "value", "key2" : 1234, "key3" : true })");
+    infra::BoundedString::WithStorage<512> data(R"({ "key" : "value", "key2" : 1234, "key3" : true, "key4" : -42.1 })");
     infra::CleanJsonContents(data);
-    EXPECT_EQ(R"({"key":"value","key2":1234,"key3":true})", data);
+    EXPECT_EQ(R"({"key":"value","key2":1234,"key3":true,"key4":-42.1})", data);
 }
 
 TEST(JsonTokenizerTest, ValidJsonObject)

diff --git a/infra/syntax/test/TestJsonFormatter.cpp b/infra/syntax/test/TestJsonFormatter.cpp
@@ -115,6 +115,18 @@ TEST(JsonObjectFormatter, add_milli_float)
 {
     infra::BoundedString::WithStorage<64> string;
 
+    {
+        infra::JsonObjectFormatter::WithStringStream formatter(infra::inPlace, string);
+        formatter.AddMilliFloat(infra::JsonString("tag"), 4, 002);
+    }
+
+    EXPECT_EQ(R"({ "tag":4.002 })", string);
+}
+
+TEST(JsonObjectFormatter, add_milli_float_jsonstring_key)
+{
+    infra::BoundedString::WithStorage<64> string;
+
     {
         infra::JsonObjectFormatter::WithStringStream formatter(infra::inPlace, string);
         formatter.AddMilliFloat("tag", 12, 34);
@@ -298,6 +310,17 @@ TEST(JsonObjectFormatter, add_key_jsonstring_negative_value_JsonFloat)
     EXPECT_EQ(R"({ "tag":-55.300 })", string);
 }
 
+TEST(JsonObjectFormatter, add_key_jsonstring_nano_value_JsonFloat)
+{
+    infra::BoundedString::WithStorage<64> string;
+
+    {
+        infra::JsonObjectFormatter::WithStringStream formatter(infra::inPlace, string);
+        formatter.Add(infra::JsonString{ "tag" }, infra::JsonValue(infra::InPlaceType<infra::JsonFloat>(), infra::JsonFloat{ 0, 5, false }));
+    }
+    EXPECT_EQ(R"({ "tag":0.000000005 })", string);
+}
+
 TEST(JsonObjectFormatter, add_key_jsonstring_value_JsonString)
 {
     infra::BoundedString::WithStorage<64> string;