test with windows.h header and remedy conflicts (#345)

* test with windows.h header and remedy conflicts * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix cpplint issues --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
LLNL · Oct 18, 2024 · bd4fcf0 · bd4fcf0
1 parent 33a4bf9
commit bd4fcf0
Show file tree

Hide file tree

Showing 28 changed files with 264 additions and 157 deletions.
diff --git a/converter/converter.cpp b/converter/converter.cpp
@@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "CLI11.hpp"
 #include "units/units.hpp"
 #include <cstdio>
+#include <string>
 
 int main(int argc, char* argv[])
 {
@@ -42,10 +43,9 @@ int main(int argc, char* argv[])
            newUnits,
            "the units to convert the measurement to, '*' to convert to base units")
         ->required();
-    app.add_flag_callback("--version,-v", []() {
-        std::cout << "Units conversion " UNITS_VERSION_STRING << '\n';
-        throw CLI::Success();
-    });
+    app.set_version_flag(
+        "--version,-v", "Units conversion " UNITS_VERSION_STRING);
+
     app.positionals_at_end();
 
     CLI11_PARSE(app, argc, argv);

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -140,11 +140,26 @@ else()
     endif()
 
     add_executable(examples_test examples_test.cpp)
-    target_link_libraries(examples_test PRIVATE ${UNITS_LC_PROJECT_NAME}::units)
+    target_link_libraries(
+        examples_test PRIVATE ${UNITS_LC_PROJECT_NAME}::units compile_flags_target
+    )
     target_compile_definitions(examples_test PRIVATE ${TARGET_SPECIAL_COMPILER_FLAGS})
     set_target_properties(examples_test PROPERTIES FOLDER "Tests")
     add_test(examples_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples_test)
 
+    if(WIN32)
+        add_executable(examples_test_windows examples_test_windows.cpp)
+        target_link_libraries(
+            examples_test_windows PRIVATE ${UNITS_LC_PROJECT_NAME}::units
+                                          compile_flags_target
+        )
+        target_compile_definitions(
+            examples_test_windows PRIVATE ${TARGET_SPECIAL_COMPILER_FLAGS}
+        )
+        set_target_properties(examples_test_windows PROPERTIES FOLDER "Tests")
+        add_test(examples_test_windows ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples_test)
+    endif()
+
     add_executable(test_all_unit_base test_all_unit_base.cpp)
     if(MSVC)
         target_compile_options(test_all_unit_base PRIVATE /wd4459)

diff --git a/test/examples_test_windows.cpp b/test/examples_test_windows.cpp
@@ -0,0 +1,58 @@
+/*
+Copyright (c) 2019-2023,
+Lawrence Livermore National Security, LLC;
+See the top-level NOTICE for additional details. All rights reserved.
+SPDX-License-Identifier: BSD-3-Clause
+*/
+#include "units/units_decl.hpp"
+#include <Windows.h>
+
+#include "units/units.hpp"
+#include "units/units_conversion_maps.hpp"
+
+/** @file Test just to load up some unit definitions and do some operations with
+them it tests linking and some usefulness in code coverage */
+
+int main(int argc, char* argv[])
+{
+    units::fixed_precise_measurement fpm1(1250.0, units::precise::cm.pow(3));
+    units::fixed_precise_measurement fpm2(1.25, units::precise::L);
+    if (fpm1 != fpm2) {
+        return -1;
+    }
+
+    units::uncertain_measurement um1(1250.0, 25.0, units::cm.pow(3));
+    units::uncertain_measurement um2(1.25, 0.1, units::L);
+    if (um1 != um2) {
+        return -1;
+    }
+
+    units::measurement m1(1250.0, units::cm.pow(3));
+    if (m1 != 1.25 * units::L) {
+        return -1;
+    }
+
+    units::fixed_measurement fm1(1250.0, units::cm.pow(3));
+    if (fm1 != 1.25 * units::L) {
+        return -1;
+    }
+
+    units::precise_measurement pm1 =
+        units::measurement_from_string("1250 cm^3");
+    if (pm1 != 1.25 * units::precise::L) {
+        return -1;
+    }
+
+    units::precise_unit prec1(1.25, units::precise::L);
+
+    if (prec1 != units::precise_unit(0.00125, units::precise::m.pow(3))) {
+        return -1;
+    }
+
+    units::unit u1(1.25, units::L);
+
+    if (u1 != units::unit(0.00125, units::m.pow(3))) {
+        return -1;
+    }
+    return 0;
+}
diff --git a/test/fuzz_issue_tests.cpp b/test/fuzz_issue_tests.cpp
@@ -11,6 +11,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstring>
 #include <fstream>
 #include <iostream>
+#include <string>
+#include <vector>
 
 using namespace units;
 TEST(fuzzFailures, convFailures)

diff --git a/test/test_all_unit_base.cpp b/test/test_all_unit_base.cpp
@@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "test.hpp"
 #include "units/units.hpp"
 
+#include <iostream>
 #include <limits>
 using namespace units;
 

diff --git a/test/test_complete_unit_list.cpp b/test/test_complete_unit_list.cpp
@@ -10,8 +10,10 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <cmath>
 #include <fstream>
+#include <iostream>
 #include <ostream>
 #include <sstream>
+#include <string>
 
 static std::string hexConvert(const std::string& str)
 {

diff --git a/test/test_conversions1.cpp b/test/test_conversions1.cpp
@@ -391,8 +391,8 @@ TEST(TimeConversions, Correctness)
     double one_week_in_day = 7.0;
     double one_day_in_sec = 86400.0;
 
-    EXPECT_NEAR(convert(min, s), one_min_in_sec, test::tolerance);
-    EXPECT_NEAR(convert(hr, min), one_hour_in_min, test::tolerance);
+    EXPECT_NEAR(convert(minute, s), one_min_in_sec, test::tolerance);
+    EXPECT_NEAR(convert(hr, minute), one_hour_in_min, test::tolerance);
     EXPECT_NEAR(
         convert(unit_cast(precise::time::day), hr),
         one_day_in_hour,
@@ -421,10 +421,10 @@ TEST(TimeConversionsPrecise, Correctness)
     double one_day_in_sec = 86400.0;
 
     EXPECT_NEAR(
-        convert(min, units::precise::s),
+        convert(minute, units::precise::s),
         one_min_in_sec,
         test::precise_tolerance);
-    EXPECT_NEAR(convert(hr, min), one_hour_in_min, test::precise_tolerance);
+    EXPECT_NEAR(convert(hr, minute), one_hour_in_min, test::precise_tolerance);
     EXPECT_NEAR(convert(day, hr), one_day_in_hour, test::precise_tolerance);
     EXPECT_NEAR(convert(week, day), one_week_in_day, test::precise_tolerance);
     EXPECT_NEAR(

diff --git a/test/test_conversions2.cpp b/test/test_conversions2.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <algorithm>
 #include <fstream>
+#include <string>
 #include <vector>
 
 // structure containing information on a single conversion

diff --git a/test/test_defined_units.cpp b/test/test_defined_units.cpp
@@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "test.hpp"
 #include "units/units_conversion_maps.hpp"
 #include <map>
+#include <string>
 #include <unordered_map>
 
 TEST(unitStringDefinitions, siVectorLength)

diff --git a/test/test_equation_units.cpp b/test/test_equation_units.cpp
@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "test.hpp"
 #include "units/units.hpp"
 
+#include <vector>
+
 using namespace units;
 
 TEST(logUnits, nonEquality)

diff --git a/test/test_google_units.cpp b/test/test_google_units.cpp
@@ -10,8 +10,10 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <cmath>
 #include <fstream>
+#include <iostream>
 #include <ostream>
 #include <sstream>
+#include <string>
 
 TEST(googleUnits, unitTypes)
 {

diff --git a/test/test_leadingNumbers.cpp b/test/test_leadingNumbers.cpp
@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <cmath>
+#include <string>
+#include <vector>
 
 using namespace units::detail::testing;
 

diff --git a/test/test_measurement_strings.cpp b/test/test_measurement_strings.cpp
@@ -8,7 +8,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <iostream>
+#include <string>
 #include <type_traits>
+#include <vector>
 
 using namespace units;
 TEST(MeasurementStrings, basic)

diff --git a/test/test_r20.cpp b/test/test_r20.cpp
@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "test.hpp"
 #include "units/units.hpp"
 
+#include <iostream>
+#include <string>
 #include <tuple>
 
 using unitD = std::tuple<const char*, const char*, units::precise_unit>;

diff --git a/test/test_random_round_trip.cpp b/test/test_random_round_trip.cpp
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <chrono>
 #include <limits>
 #include <random>
+#include <vector>
 
 using namespace units;
 

diff --git a/test/test_siunits.cpp b/test/test_siunits.cpp
@@ -12,6 +12,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <fstream>
 #include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 static std::vector<std::vector<std::string>>
     loadCsvFile(const std::string& file)

diff --git a/test/test_ucum.cpp b/test/test_ucum.cpp
@@ -11,9 +11,12 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <cmath>
 #include <fstream>
+#include <iostream>
 #include <json.hpp>
 #include <ostream>
+#include <set>
 #include <sstream>
+#include <string>
 
 TEST(UCUM, domain_exclusion)
 {

diff --git a/test/test_udunits.cpp b/test/test_udunits.cpp
@@ -11,8 +11,10 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <cmath>
 #include <fstream>
+#include <iostream>
 #include <ostream>
 #include <sstream>
+#include <string>
 
 TEST(UDUNITS, acceptedNameSymbols)
 {

diff --git a/test/test_uncertain_measurements.cpp b/test/test_uncertain_measurements.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <memory>
+#include <string>
 
 using namespace units;
 TEST(uncertainOps, construction)

diff --git a/test/test_unit_ops.cpp b/test/test_unit_ops.cpp
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units_decl.hpp"
 #include "units/units_util.hpp"
 
+#include <limits>
 #include <memory>
 
 using namespace units;

diff --git a/test/test_unit_strings.cpp b/test/test_unit_strings.cpp
@@ -8,6 +8,9 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "test.hpp"
 #include <algorithm>
+#include <limits>
+#include <string>
+#include <vector>
 
 #if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703)
 #ifndef UNITS_CONSTEXPR_IF_SUPPORTED
@@ -1513,7 +1516,7 @@ TEST(userDefinedUnits, definitionStrings)
     addUserDefinedUnit("idgit", idgit);
 
     auto ipm = unit_from_string("idgit/min");
-    EXPECT_EQ(ipm, idgit / min);
+    EXPECT_EQ(ipm, idgit / minute);
 
     auto str = to_string(ipm);
     EXPECT_EQ(str, "idgit/min");
@@ -1529,7 +1532,7 @@ TEST(userDefinedUnits, definitionStringsInputOnly)
     addUserDefinedInputUnit("idgit", idgit);
 
     auto ipm = unit_from_string("idgit/min");
-    EXPECT_EQ(ipm, idgit / min);
+    EXPECT_EQ(ipm, idgit / minute);
 
     auto str = to_string(ipm);
     /** input only should not result in any string result with the user defined
@@ -1544,9 +1547,9 @@ TEST(userDefinedUnits, definitionStringsOutputOnly)
     addUserDefinedOutputUnit("idgit", idgit);
 
     auto ipm = unit_from_string("idgit/min");
-    EXPECT_NE(ipm, idgit / min);
+    EXPECT_NE(ipm, idgit / minute);
 
-    auto str = to_string(idgit / min);
+    auto str = to_string(idgit / minute);
     /** output only should make this work*/
     EXPECT_EQ(str, "idgit/min");
     clearUserDefinedUnits();