💚 Print out the names of both the literal and potentially-detected ex…

…ecution encodings
soasis · Apr 17, 2022 · d04c3cf · d04c3cf
1 parent 75f2ab9
commit d04c3cf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/tests/basic_run_time/source/main.cpp b/tests/basic_run_time/source/main.cpp
@@ -32,22 +32,18 @@
 #include <catch2/catch_all.hpp>
 
 #include <ztd/text/tests/basic_unicode_strings.hpp>
-
 #include <ztd/text/tests/utf8_startup.hpp>
 
+#include <ztd/idk/encoding_detection.hpp>
+
 #include <iostream>
-#include <clocale>
 
 int main(int argc, char* argv[]) {
 	std::cout << "=== Encoding Names ===" << std::endl;
-	std::cout << "Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
-	          << std::endl;
-	std::cout << "Wide Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
-	          << std::endl;
+	std::cout << "Literal Encoding: " << ztd::literal_encoding_name() << std::endl;
+	std::cout << "Wide Literal Encoding: " << ztd::wide_literal_encoding_name() << std::endl;
+	std::cout << "Execution Encoding: " << ztd::execution_encoding_name() << std::endl;
+	std::cout << "Wide Execution Encoding: " << ztd::wide_execution_encoding_name() << std::endl;
 	int result = Catch::Session().run(argc, argv);
 	return result;
 }
diff --git a/tests/iconv/source/main.cpp b/tests/iconv/source/main.cpp
@@ -32,22 +32,18 @@
 #include <catch2/catch_all.hpp>
 
 #include <ztd/text/tests/basic_unicode_strings.hpp>
-
 #include <ztd/text/tests/utf8_startup.hpp>
 
+#include <ztd/idk/encoding_detection.hpp>
+
 #include <iostream>
-#include <clocale>
 
 int main(int argc, char* argv[]) {
 	std::cout << "=== Encoding Names ===" << std::endl;
-	std::cout << "Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
-	          << std::endl;
-	std::cout << "Wide Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
-	          << std::endl;
+	std::cout << "Literal Encoding: " << ztd::literal_encoding_name() << std::endl;
+	std::cout << "Wide Literal Encoding: " << ztd::wide_literal_encoding_name() << std::endl;
+	std::cout << "Execution Encoding: " << ztd::execution_encoding_name() << std::endl;
+	std::cout << "Wide Execution Encoding: " << ztd::wide_execution_encoding_name() << std::endl;
 	int result = Catch::Session().run(argc, argv);
 	return result;
 }
diff --git a/tests/tiny_buffer/source/main.cpp b/tests/tiny_buffer/source/main.cpp
@@ -34,18 +34,16 @@
 #include <ztd/text/tests/basic_unicode_strings.hpp>
 #include <ztd/text/tests/utf8_startup.hpp>
 
+#include <ztd/idk/encoding_detection.hpp>
+
 #include <iostream>
 
 int main(int argc, char* argv[]) {
 	std::cout << "=== Encoding Names ===" << std::endl;
-	std::cout << "Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
-	          << std::endl;
-	std::cout << "Wide Literal Encoding: "
-	          << ztd::__idk_detail::to_name(
-	                  ztd::__idk_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
-	          << std::endl;
+	std::cout << "Literal Encoding: " << ztd::literal_encoding_name() << std::endl;
+	std::cout << "Wide Literal Encoding: " << ztd::wide_literal_encoding_name() << std::endl;
+	std::cout << "Execution Encoding: " << ztd::execution_encoding_name() << std::endl;
+	std::cout << "Wide Execution Encoding: " << ztd::wide_execution_encoding_name() << std::endl;
 	int result = Catch::Session().run(argc, argv);
 	return result;
 }