diff options
author | Salvage <29021710+Saalvage@users.noreply.github.com> | 2022-05-05 20:43:23 +0300 |
---|---|---|
committer | Salvage <29021710+Saalvage@users.noreply.github.com> | 2022-05-05 20:43:23 +0300 |
commit | 7a3f65d7a0deae92cd58fe9ef2e20e4938343e8c (patch) | |
tree | 9d48734c6566f223ad3390c00662703128ca4355 | |
parent | ae8295c1d04e4eb158d3607f00ccb5397842ce89 (diff) |
Try move test to mainfix-equality-op-namespace-type
13 files changed, 40 insertions, 40 deletions
diff --git a/examples/all_features/assertion_macros.cpp b/examples/all_features/assertion_macros.cpp index c10321c7..959a9c3d 100644 --- a/examples/all_features/assertion_macros.cpp +++ b/examples/all_features/assertion_macros.cpp @@ -1,23 +1,6 @@ -namespace A { - struct Bar { - int i; - }; -} - -static bool operator==(const A::Bar& lhs, const A::Bar& rhs) { - return lhs.i == rhs.i; -} - #define DOCTEST_CONFIG_ASSERTS_RETURN_VALUES #include <doctest/doctest.h> -TEST_CASE("equality of namespaced type") { - const auto b0 = A::Bar{}; - const auto b1 = A::Bar{}; - CHECK(b0 == b1); - CHECK_EQ(b0, b1); -} - #include "header.h" DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN diff --git a/examples/all_features/test_output/assertion_macros.cpp.txt b/examples/all_features/test_output/assertion_macros.cpp.txt index 7adbf8cb..fc4cc946 100644 --- a/examples/all_features/test_output/assertion_macros.cpp.txt +++ b/examples/all_features/test_output/assertion_macros.cpp.txt @@ -251,7 +251,7 @@ assertion_macros.cpp(0): ERROR: CHECK_NOTHROW( throw_if(true, 2) ) THREW excepti assertion_macros.cpp(0): ERROR: CHECK_THROWS_WITH( throw_if(true, 2), "1" ) threw a DIFFERENT exception: "2" =============================================================================== -[doctest] test cases: 24 | 5 passed | 19 failed | -[doctest] assertions: 100 | 50 passed | 50 failed | +[doctest] test cases: 23 | 4 passed | 19 failed | +[doctest] assertions: 98 | 48 passed | 50 failed | [doctest] Status: FAILURE! Program code. diff --git a/examples/all_features/test_output/assertion_macros.cpp_junit.txt b/examples/all_features/test_output/assertion_macros.cpp_junit.txt index 68d30221..3802a4e6 100644 --- a/examples/all_features/test_output/assertion_macros.cpp_junit.txt +++ b/examples/all_features/test_output/assertion_macros.cpp_junit.txt @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <testsuites> - <testsuite name="all_features" errors="0" failures="63" tests="100"> - <testcase classname="assertion_macros.cpp" name="equality of namespaced type" status="run"/> + <testsuite name="all_features" errors="0" failures="63" tests="98"> <testcase classname="assertion_macros.cpp" name="normal macros" status="run"> <failure type="CHECK"> assertion_macros.cpp(0): diff --git a/examples/all_features/test_output/assertion_macros.cpp_xml.txt b/examples/all_features/test_output/assertion_macros.cpp_xml.txt index d35fcb2c..b67c33aa 100644 --- a/examples/all_features/test_output/assertion_macros.cpp_xml.txt +++ b/examples/all_features/test_output/assertion_macros.cpp_xml.txt @@ -2,9 +2,6 @@ <doctest binary="all_features"> <Options order_by="file" rand_seed="324" first="0" last="4294967295" abort_after="0" subcase_filter_levels="2147483647" case_sensitive="false" no_throw="false" no_skip="false"/> <TestSuite> - <TestCase name="equality of namespaced type" filename="assertion_macros.cpp" line="0"> - <OverallResultsAsserts successes="2" failures="0" test_case_success="true"/> - </TestCase> <TestCase name="normal macros" filename="assertion_macros.cpp" line="0"> <Expression success="false" type="CHECK" filename="assertion_macros.cpp" line="0"> <Original> @@ -687,7 +684,7 @@ <OverallResultsAsserts successes="0" failures="9" test_case_success="false"/> </TestCase> </TestSuite> - <OverallResultsAsserts successes="50" failures="50"/> - <OverallResultsTestCases successes="5" failures="19"/> + <OverallResultsAsserts successes="48" failures="50"/> + <OverallResultsTestCases successes="4" failures="19"/> </doctest> Program code. diff --git a/examples/all_features/test_output/filter_2.txt b/examples/all_features/test_output/filter_2.txt index a523bf4a..dd726cdf 100644 --- a/examples/all_features/test_output/filter_2.txt +++ b/examples/all_features/test_output/filter_2.txt @@ -1,6 +1,6 @@ [doctest] run with "--help" for options =============================================================================== -[doctest] test cases: 0 | 0 passed | 0 failed | 104 skipped +[doctest] test cases: 0 | 0 passed | 0 failed | 103 skipped [doctest] assertions: 0 | 0 passed | 0 failed | [doctest] Status: SUCCESS! Program code. diff --git a/examples/all_features/test_output/filter_2_xml.txt b/examples/all_features/test_output/filter_2_xml.txt index b85a80e7..fd8a050a 100644 --- a/examples/all_features/test_output/filter_2_xml.txt +++ b/examples/all_features/test_output/filter_2_xml.txt @@ -47,7 +47,6 @@ <TestSuite> <TestCase name="enum 1" filename="enums.cpp" line="0" skipped="true"/> <TestCase name="enum 2" filename="enums.cpp" line="0" should_fail="true" skipped="true"/> - <TestCase name="equality of namespaced type" filename="assertion_macros.cpp" line="0" skipped="true"/> <TestCase name="exceptions-related macros" filename="assertion_macros.cpp" line="0" skipped="true"/> <TestCase name="exceptions-related macros for std::exception" filename="assertion_macros.cpp" line="0" skipped="true"/> <TestCase name="exercising tricky code paths of doctest" filename="coverage_maxout.cpp" line="0" skipped="true"/> @@ -148,6 +147,6 @@ <TestCase name="without a funny name:" filename="subcases.cpp" line="0" skipped="true"/> </TestSuite> <OverallResultsAsserts successes="0" failures="0"/> - <OverallResultsTestCases successes="0" failures="0" skipped="104"/> + <OverallResultsTestCases successes="0" failures="0" skipped="103"/> </doctest> Program code. diff --git a/examples/all_features/test_output/no_multi_lane_atomics.txt b/examples/all_features/test_output/no_multi_lane_atomics.txt index fa7342f9..b95037bd 100644 --- a/examples/all_features/test_output/no_multi_lane_atomics.txt +++ b/examples/all_features/test_output/no_multi_lane_atomics.txt @@ -922,7 +922,7 @@ TEST CASE: without a funny name: subcases.cpp(0): MESSAGE: Nooo =============================================================================== -[doctest] test cases: 84 | 33 passed | 51 failed | -[doctest] assertions: 230 | 111 passed | 119 failed | +[doctest] test cases: 83 | 32 passed | 51 failed | +[doctest] assertions: 228 | 109 passed | 119 failed | [doctest] Status: FAILURE! Program code. diff --git a/examples/all_features/test_output/no_multithreading.txt b/examples/all_features/test_output/no_multithreading.txt index fa7342f9..b95037bd 100644 --- a/examples/all_features/test_output/no_multithreading.txt +++ b/examples/all_features/test_output/no_multithreading.txt @@ -922,7 +922,7 @@ TEST CASE: without a funny name: subcases.cpp(0): MESSAGE: Nooo =============================================================================== -[doctest] test cases: 84 | 33 passed | 51 failed | -[doctest] assertions: 230 | 111 passed | 119 failed | +[doctest] test cases: 83 | 32 passed | 51 failed | +[doctest] assertions: 228 | 109 passed | 119 failed | [doctest] Status: FAILURE! Program code. diff --git a/examples/all_features/test_output/std_headers.txt b/examples/all_features/test_output/std_headers.txt index fa7342f9..b95037bd 100644 --- a/examples/all_features/test_output/std_headers.txt +++ b/examples/all_features/test_output/std_headers.txt @@ -922,7 +922,7 @@ TEST CASE: without a funny name: subcases.cpp(0): MESSAGE: Nooo =============================================================================== -[doctest] test cases: 84 | 33 passed | 51 failed | -[doctest] assertions: 230 | 111 passed | 119 failed | +[doctest] test cases: 83 | 32 passed | 51 failed | +[doctest] assertions: 228 | 109 passed | 119 failed | [doctest] Status: FAILURE! Program code. diff --git a/examples/exe_with_static_libs/main.cpp b/examples/exe_with_static_libs/main.cpp index 8b500229..82f46743 100644 --- a/examples/exe_with_static_libs/main.cpp +++ b/examples/exe_with_static_libs/main.cpp @@ -1,4 +1,22 @@ +namespace A { + struct Bar { + int i; + }; +} + +static bool operator==(const A::Bar& lhs, const A::Bar& rhs) { + return lhs.i == rhs.i; +} + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include <doctest/doctest.h> TEST_CASE("main") { printf("hello from <main.cpp>\n"); } + + +TEST_CASE("equality of namespaced type") { + const auto b0 = A::Bar{}; + const auto b1 = A::Bar{}; + CHECK(b0 == b1); + CHECK_EQ(b0, b1); +} diff --git a/examples/exe_with_static_libs/test_output/exe_with_static_libs.txt b/examples/exe_with_static_libs/test_output/exe_with_static_libs.txt index 5167ef05..503cc3e3 100644 --- a/examples/exe_with_static_libs/test_output/exe_with_static_libs.txt +++ b/examples/exe_with_static_libs/test_output/exe_with_static_libs.txt @@ -4,6 +4,6 @@ hello from <lib_1_src2.cpp> hello from <lib_2_src.cpp> hello from <main.cpp> =============================================================================== -[doctest] test cases: 4 | 4 passed | 0 failed | 0 skipped -[doctest] assertions: 0 | 0 passed | 0 failed | +[doctest] test cases: 5 | 5 passed | 0 failed | 0 skipped +[doctest] assertions: 2 | 2 passed | 0 failed | [doctest] Status: SUCCESS! diff --git a/examples/exe_with_static_libs/test_output/exe_with_static_libs_junit.txt b/examples/exe_with_static_libs/test_output/exe_with_static_libs_junit.txt index bfc12388..000149ec 100644 --- a/examples/exe_with_static_libs/test_output/exe_with_static_libs_junit.txt +++ b/examples/exe_with_static_libs/test_output/exe_with_static_libs_junit.txt @@ -4,10 +4,11 @@ hello from <lib_1_src2.cpp> hello from <lib_2_src.cpp> hello from <main.cpp> <testsuites> - <testsuite name="exe_with_static_libs" errors="0" failures="0" tests="0"> + <testsuite name="exe_with_static_libs" errors="0" failures="0" tests="2"> <testcase classname="lib_1_src1.cpp" name="asd" status="run"/> <testcase classname="lib_1_src2.cpp" name="asd" status="run"/> <testcase classname="lib_2_src.cpp" name="asd" status="run"/> <testcase classname="main.cpp" name="main" status="run"/> + <testcase classname="main.cpp" name="equality of namespaced type" status="run"/> </testsuite> </testsuites> diff --git a/examples/exe_with_static_libs/test_output/exe_with_static_libs_xml.txt b/examples/exe_with_static_libs/test_output/exe_with_static_libs_xml.txt index 7a4e53e6..c09e1545 100644 --- a/examples/exe_with_static_libs/test_output/exe_with_static_libs_xml.txt +++ b/examples/exe_with_static_libs/test_output/exe_with_static_libs_xml.txt @@ -18,7 +18,10 @@ hello from <lib_2_src.cpp> hello from <main.cpp> <OverallResultsAsserts successes="0" failures="0" test_case_success="true"/> </TestCase> + <TestCase name="equality of namespaced type" filename="main.cpp" line="0"> + <OverallResultsAsserts successes="2" failures="0" test_case_success="true"/> + </TestCase> </TestSuite> - <OverallResultsAsserts successes="0" failures="0"/> - <OverallResultsTestCases successes="4" failures="0" skipped="0"/> + <OverallResultsAsserts successes="2" failures="0"/> + <OverallResultsTestCases successes="5" failures="0" skipped="0"/> </doctest> |