rangelist: debug assert on negative numbers

mixxxdj · Apr 19, 2021 · cd95da5 · cd95da5
1 parent b549298
commit cd95da5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/test/rangelist_test.cpp b/src/test/rangelist_test.cpp
@@ -51,11 +51,6 @@ TEST(DisplayIntListTest, duplicateValuesAreIgnored) {
     EXPECT_EQ(QList<int>({1, 2, 3}), mixxx::parseRangeList("1, 1, 1, 1, 2, 2, 3"));
 }
 
-// TEST(DisplayIntListTest, negativeValuesAreIgnored) {
-//     EXPECT_EQ(QList<int>({}), mixxx::parseRangeList("-1,-2,-3"));
-//     EXPECT_QSTRING_EQ("", mixxx::stringifyRangeList(QList<int>({-1, -2, -3})));
-// }
-
 TEST(DisplayIntListTest, resultingListIsSortedAscending) {
     const auto list = mixxx::parseRangeList("4, 2, 3, 1, 6, 5");
     EXPECT_TRUE(std::is_sorted(list.cbegin(), list.cend()));

diff --git a/src/util/rangelist.cpp b/src/util/rangelist.cpp
@@ -55,6 +55,9 @@ QString stringifyRangeList(const QList<int>& rangeList) {
         auto first_duplicate = std::adjacent_find(rangeList.cbegin(), rangeList.cend());
         return first_duplicate == rangeList.cend();
     }());
+    DEBUG_ASSERT(std::all_of(rangeList.cbegin(), rangeList.cend(), [](int val) {
+        return val >= 0;
+    }));
 
     QString stringifiedRangeList;
 

diff --git a/src/util/rangelist.h b/src/util/rangelist.h
@@ -11,7 +11,8 @@ QList<int> parseRangeList(const QString& input);
 /// take a list of positive integers and stringify them into a neat
 /// user friendly representation (eg {1, 2, 3} => "1 - 3").
 /// inverse counterpart of `parseRangeList`.
-/// assumes rangeList is well-formed (sorted and not containing duplicates)
+/// assumes rangeList is well-formed
+/// (sorted, not containing duplicates, and positive integers only)
 QString stringifyRangeList(const QList<int>& rangeList);
 
 } // namespace mixxx