Refactored weightArrayElement

include/faker-cxx/Helper.h

@@ -132,21 +132,18 @@ class Helper
             throw std::invalid_argument{"Sum of weights is zero."};
         }
 
-        const std::integral auto targetWeightValue = Number::integer<unsigned>(sumOfWeights);
-
+        const std::integral auto targetWeightValue = Number::integer<unsigned>(1, sumOfWeights);
         unsigned currentSum = 0;
+        size_t currentIdx = 0;
 
-        for (const auto& element : data)
-        {
-            currentSum += element.weight;
-
-            if (targetWeightValue <= currentSum)
-            {
-                return element.value;
-            }
+        while (currentIdx < data.size()) {
+            currentSum += data[currentIdx].weight;
+            if (currentSum >= targetWeightValue)
+                break;
+            currentIdx++;
         }
 
-        return data.at(data.size() - 1).value;
+        return data.at(currentIdx).value;
     }
 
     /**

src/modules/helper/HelperTest.cpp

@@ -59,6 +59,17 @@ TEST_F(HelperTest, WeightedArrayElement)
                                     { return result == element.value; }));
 }
 
+TEST_F(HelperTest, WeightedArrayZeroSum) {
+    std::vector<Helper::WeightedElement<std::string>> data{{0, "hello"}, {0, "world"}};
+    ASSERT_THROW(Helper::weightedArrayElement(data), std::invalid_argument);
+}
+
+TEST_F(HelperTest, WeightedArrayEmptyData) {
+    std::vector<Helper::WeightedElement<std::string>> data{};
+    ASSERT_THROW(Helper::weightedArrayElement(data), std::invalid_argument);
+}
+
+
 TEST_F(HelperTest, ShuffleString)
 {
     std::string input = "Hello World!";