From 4363088a85a219c6e101e158d4634cd490a8c72d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan.goodliffe@octal.co.uk>
Date: Mon, 28 Apr 2025 09:31:42 +0100
Subject: Fix all warnings in enumeration details code/tests

---
 test/test-enumDetails.cpp | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'test/test-enumDetails.cpp')

diff --git a/test/test-enumDetails.cpp b/test/test-enumDetails.cpp
index 0e759e5..6bcd627 100644
--- a/test/test-enumDetails.cpp
+++ b/test/test-enumDetails.cpp
@@ -7,47 +7,47 @@
 #include <enumDetails.h>
 #include <stream_support.h>
 
-constexpr std::array INVALID_NAMES {"", "missing", "GlobalScoped::aa", "GlobalScoped", "ns::aa", "a", "bb"};
-constexpr std::array VALID_NAMES {"aa", "b", "c"};
-template<typename E> constexpr std::array VALID_VALUES {E::aa, E::b, E::c};
+constexpr std::array INVALID_NAMES {"", "missing", "GlobalScoped::Aa", "GlobalScoped", "ns::Aa", "A", "Bb"};
+constexpr std::array VALID_NAMES {"Aa", "B", "C"};
+template<typename E> constexpr std::array VALID_VALUES {E::Aa, E::B, E::C};
 // Not a template, else Boost test framework throws printing the context
 constexpr std::array INVALID_VALUES {-1, 3, 20};
 
 #define TESTS_FOR_TYPE(TYPE) \
-	BOOST_DATA_TEST_CASE(invalid_check_##TYPE, INVALID_VALUES, in) \
+	BOOST_DATA_TEST_CASE(invalid_check_##TYPE, INVALID_VALUES, input) \
 	{ \
-		BOOST_CHECK(!EnumDetails<TYPE>::is_valid(static_cast<TYPE>(in))); \
+		BOOST_CHECK(!EnumDetails<TYPE>::isValid(static_cast<TYPE>(input))); \
 	} \
-	BOOST_DATA_TEST_CASE(invalid_parse_##TYPE, INVALID_NAMES, in) \
+	BOOST_DATA_TEST_CASE(invalid_parse_##TYPE, INVALID_NAMES, input) \
 	{ \
-		BOOST_CHECK(!EnumDetails<TYPE>::parse(in).has_value()); \
+		BOOST_CHECK(!EnumDetails<TYPE>::parse(input).has_value()); \
 	} \
-	BOOST_DATA_TEST_CASE(invalid_to_string_##TYPE, INVALID_VALUES, in) \
+	BOOST_DATA_TEST_CASE(invalid_to_string_##TYPE, INVALID_VALUES, input) \
 	{ \
-		BOOST_CHECK(!EnumDetails<TYPE>::to_string(static_cast<TYPE>(in)).has_value()); \
+		BOOST_CHECK(!EnumDetails<TYPE>::toString(static_cast<TYPE>(input)).has_value()); \
 	} \
-	BOOST_DATA_TEST_CASE(valid_check_##TYPE, VALID_VALUES<TYPE>, in) \
+	BOOST_DATA_TEST_CASE(valid_check_##TYPE, VALID_VALUES<TYPE>, input) \
 	{ \
-		BOOST_CHECK(EnumDetails<TYPE>::is_valid(in)); \
+		BOOST_CHECK(EnumDetails<TYPE>::isValid(input)); \
 	} \
-	BOOST_DATA_TEST_CASE(valid_parse_##TYPE, VALID_NAMES ^ VALID_VALUES<TYPE>, in, out) \
+	BOOST_DATA_TEST_CASE(valid_parse_##TYPE, VALID_NAMES ^ VALID_VALUES<TYPE>, input, output) \
 	{ \
-		const auto v = EnumDetails<TYPE>::parse(in); \
-		BOOST_CHECK_IF(vo, v.has_value()) { \
-			BOOST_CHECK_EQUAL(v.value(), out); \
+		const auto parsed = EnumDetails<TYPE>::parse(input); \
+		BOOST_CHECK_IF(parsedOK, parsed.has_value()) { \
+			BOOST_CHECK_EQUAL(parsed.value(), output); \
 		} \
 	} \
-	BOOST_DATA_TEST_CASE(valid_to_string_##TYPE, VALID_VALUES<TYPE> ^ VALID_NAMES, in, out) \
+	BOOST_DATA_TEST_CASE(valid_to_string_##TYPE, VALID_VALUES<TYPE> ^ VALID_NAMES, input, output) \
 	{ \
-		const auto v = EnumDetails<TYPE>::to_string(in); \
-		BOOST_CHECK_IF(vo, v.has_value()) { \
-			BOOST_CHECK_EQUAL(v.value(), out); \
+		const auto parsed = EnumDetails<TYPE>::toString(input); \
+		BOOST_CHECK_IF(parsedOK, parsed.has_value()) { \
+			BOOST_CHECK_EQUAL(parsed.value(), output); \
 		} \
 	}
 
 TESTS_FOR_TYPE(GlobalScoped)
 TESTS_FOR_TYPE(GlobalUnscoped)
-using ns_unscoped = ns::Unscoped;
-using ns_scoped = ns::Scoped;
-TESTS_FOR_TYPE(ns_unscoped)
-TESTS_FOR_TYPE(ns_scoped)
+using NsUnscoped = ns::Unscoped;
+using NsScoped = ns::Scoped;
+TESTS_FOR_TYPE(NsUnscoped)
+TESTS_FOR_TYPE(NsScoped)
-- 
cgit v1.2.3