Merge pull request #606 from IENT/addToIntFunctionsAndTests

Add conversion function for int and tests for all

YUViewLib/src/common/Functions.cpp

@@ -208,7 +208,21 @@ ByteVector readData(std::istream &istream, const size_t nrBytes)
   return data;
 }
 
-std::optional<unsigned long> toUnsigned(const std::string_view text)
+std::optional<unsigned> toUnsigned(const std::string_view text)
+{
+  unsigned   value{};
+  const auto result = std::from_chars(text.data(), text.data() + text.size(), value);
+
+  if (result.ec != std::errc())
+    return {};
+  const auto allCharactersParsed = (result.ptr == &(*text.end()));
+  if (!allCharactersParsed)
+    return {};
+
+  return value;
+}
+
+std::optional<int> toInt(const std::string_view text)
 {
   int        value{};
   const auto result = std::from_chars(text.data(), text.data() + text.size(), value);

YUViewLib/src/common/Functions.h

@@ -98,6 +98,7 @@ template <typename T, typename R> inline T clip(T val, Range<R> range)
   return (val < T(range.min)) ? T(range.min) : (val > T(range.max)) ? T(range.max) : val;
 }
 
-std::optional<unsigned long> toUnsigned(const std::string_view text);
+std::optional<unsigned> toUnsigned(const std::string_view text);
+std::optional<int>      toInt(const std::string_view text);
 
 } // namespace functions

YUViewUnitTest/common/FunctionsTest.cpp

@@ -0,0 +1,70 @@
+/*  This file is part of YUView - The YUV player with advanced analytics toolset
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <common/Testing.h>
+
+#include <common/Functions.h>
+
+namespace
+{
+
+TEST(FunctionsTest, toUnsigned)
+{
+  EXPECT_EQ(functions::toUnsigned("0"), 0);
+  EXPECT_EQ(functions::toUnsigned("256"), 256);
+  EXPECT_EQ(functions::toUnsigned("4294967295"), 4294967295);
+
+  EXPECT_FALSE(functions::toUnsigned("4294967296"));
+  EXPECT_FALSE(functions::toUnsigned("-1"));
+  EXPECT_FALSE(functions::toUnsigned("-256"));
+  EXPECT_FALSE(functions::toUnsigned("24A"));
+  EXPECT_FALSE(functions::toUnsigned("A24"));
+  EXPECT_FALSE(functions::toUnsigned("NotANumber"));
+}
+
+TEST(FunctionsTest, toInt)
+{
+  EXPECT_EQ(functions::toInt("0"), 0);
+  EXPECT_EQ(functions::toInt("256"), 256);
+  EXPECT_EQ(functions::toInt("2147483647"), 2147483647);
+  EXPECT_EQ(functions::toInt("-1"), -1);
+  EXPECT_EQ(functions::toInt("-256"), -256);
+  EXPECT_EQ(functions::toInt("-2147483648"), -2147483648);
+
+  EXPECT_FALSE(functions::toInt("2147483648"));
+  EXPECT_FALSE(functions::toInt("-2147483649"));
+  EXPECT_FALSE(functions::toInt("24A"));
+  EXPECT_FALSE(functions::toInt("A24"));
+  EXPECT_FALSE(functions::toInt("NotANumber"));
+}
+
+} // namespace