From 0492ddf8cc45b071930200d208b6a0879aa3bc7a Mon Sep 17 00:00:00 2001 From: Yusuf Efe <120668197+yuefdev@users.noreply.github.com> Date: Sun, 13 Sep 2026 19:02:31 +0300 Subject: [PATCH] fix: Preserve spaces in string list options Signed-off-by: Yusuf Efe <120668197+yuefdev@users.noreply.github.com> --- tests/validation/UNIT/ListOption.cpp | 98 ++++++++++++++++++++++++++++ utils/command_line/ListOption.h | 29 +++++++- 2 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 tests/validation/UNIT/ListOption.cpp diff --git a/tests/validation/UNIT/ListOption.cpp b/tests/validation/UNIT/ListOption.cpp new file mode 100644 index 00000000000..2981bd03266 --- /dev/null +++ b/tests/validation/UNIT/ListOption.cpp @@ -0,0 +1,98 @@ +/* + * SPDX-FileCopyrightText: 2026 Yusuf Efe + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "utils/command_line/ListOption.h" + +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" + +#include +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(UNIT) +TEST_SUITE(ListOption) + +TEST_CASE(PreserveStringWhitespace, framework::DatasetMode::ALL) +{ + utils::ListOption option("example_args"); + const std::vector expected{"--image=/tmp/test images/sample.ppm", "--threads=2"}; + ARM_COMPUTE_EXPECT(option.parse("--image=/tmp/test images/sample.ppm,--threads=2"), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); +} + +TEST_CASE(PreserveLeadingTrailingAndTabWhitespace, framework::DatasetMode::ALL) +{ + utils::ListOption option("values"); + const std::vector expected{" first value ", "second\tvalue", " "}; + ARM_COMPUTE_EXPECT(option.parse(" first value ,second\tvalue, "), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); +} + +TEST_CASE(AppendStringValues, framework::DatasetMode::ALL) +{ + utils::ListOption option("values", {"default"}); + const std::vector expected{"default", "first", "second", "third value"}; + ARM_COMPUTE_EXPECT(option.parse("first,second"), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.parse("third value"), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); +} + +TEST_CASE(EmptyStringInput, framework::DatasetMode::ALL) +{ + utils::ListOption option("values"); + ARM_COMPUTE_EXPECT(option.parse(""), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.value().empty(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.parse("value,"), framework::LogLevel::ERRORS); + const std::vector expected{"value"}; + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); +} + +TEST_CASE(RejectEmptyStringItem, framework::DatasetMode::ALL) +{ + utils::ListOption option("values"); + ARM_COMPUTE_EXPECT(!option.parse("first,,second"), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!option.is_set(), framework::LogLevel::ERRORS); + const std::vector expected{"first", "second"}; + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); +} + +TEST_CASE(ParseIntegerValues, framework::DatasetMode::ALL) +{ + utils::ListOption option("values"); + const std::vector expected{1, -2, 3}; + ARM_COMPUTE_EXPECT(option.parse("1, -2,3"), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(option.value() == expected, framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!option.parse("invalid"), framework::LogLevel::ERRORS); +} + +TEST_SUITE_END() // ListOption +TEST_SUITE_END() // UNIT +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/utils/command_line/ListOption.h b/utils/command_line/ListOption.h index f318e1646a3..37643ad3041 100644 --- a/utils/command_line/ListOption.h +++ b/utils/command_line/ListOption.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2018 Arm Limited. + * SPDX-FileCopyrightText: 2026 Yusuf Efe * * SPDX-License-Identifier: MIT * @@ -21,8 +22,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_UTILS_LISTOPTION -#define ARM_COMPUTE_UTILS_LISTOPTION +#ifndef ACL_UTILS_COMMAND_LINE_LISTOPTION_H +#define ACL_UTILS_COMMAND_LINE_LISTOPTION_H #include "Option.h" #include @@ -101,6 +102,28 @@ bool ListOption::parse(std::string value) } } +template <> +inline bool ListOption::parse(std::string value) +{ + _is_set = true; + std::stringstream stream{value}; + std::string item; + + while (std::getline(stream, item, ',')) + { + if (item.empty()) + { + _is_set = false; + } + else + { + _values.emplace_back(std::move(item)); + } + } + + return _is_set; +} + template inline std::string ListOption::help() const { @@ -114,4 +137,4 @@ inline const std::vector &ListOption::value() const } } // namespace utils } // namespace arm_compute -#endif /* ARM_COMPUTE_UTILS_LISTOPTION */ +#endif // ACL_UTILS_COMMAND_LINE_LISTOPTION_H