small aesthetic changes

SpectraL519 · Feb 17, 2024 · bff2cf6 · bff2cf6
1 parent 6e27a52
commit bff2cf6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 22 deletions.
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
@@ -2,7 +2,7 @@ name: format
 on:
   push:
     branches:
-      - version-1.1
+      - '*'
   pull_request:
     branches:
       - master

diff --git a/test/source/test_argument_name.cpp b/test/source/test_argument_name.cpp
@@ -7,6 +7,7 @@
 #include <sstream>
 #include <string_view>
 
+using namespace ap_testing;
 using namespace ap::argument::detail;
 
 namespace {
@@ -27,8 +28,6 @@ argument_name default_argument_name_both_names() {
 
 } // namespace
 
-namespace ap_testing {
-
 TEST_SUITE_BEGIN("test_argument_name");
 
 TEST_CASE("argument_name.name member should be correctly "
@@ -121,5 +120,3 @@ TEST_CASE("operator<< should push correct data to the output stream") {
 }
 
 TEST_SUITE_END();
-
-} // namespace ap_testing
diff --git a/test/source/test_argument_parser_add_argument.cpp b/test/source/test_argument_parser_add_argument.cpp
@@ -8,6 +8,7 @@
 
 #include <iostream>
 
+using namespace ap_testing;
 using namespace ap::argument;
 
 namespace {
@@ -20,8 +21,6 @@ constexpr std::string_view other_short_name = "o";
 
 } // namespace
 
-namespace ap_testing {
-
 TEST_SUITE_BEGIN("test_argument_parser_add_argument");
 
 TEST_CASE_FIXTURE(argument_parser_test_fixture, "default_positional_arguments should add the specified arguments") {
@@ -141,5 +140,3 @@ TEST_CASE_FIXTURE(argument_parser_test_fixture, "add_flag should throw only when
 }
 
 TEST_SUITE_END();
-
-} // namespace ap_testing
diff --git a/test/source/test_argument_parser_info.cpp b/test/source/test_argument_parser_info.cpp
@@ -5,13 +5,13 @@
 
 #include <ap/argument_parser.hpp>
 
+using namespace ap_testing;
+
 namespace {
 const std::string test_name = "test program name";
 const std::string test_description = "test program description";
 } // namespace
 
-namespace ap_testing {
-
 TEST_SUITE_BEGIN("test_argument_parser_info");
 
 TEST_CASE_FIXTURE(argument_parser_test_fixture, "parser's program name member should be nullopt by default") {
@@ -45,5 +45,3 @@ TEST_CASE_FIXTURE(argument_parser_test_fixture, "name() should set the program n
 }
 
 TEST_SUITE_END();
-
-} // namespace ap_testing
diff --git a/test/source/test_argument_parser_parse_args.cpp b/test/source/test_argument_parser_parse_args.cpp
@@ -8,6 +8,7 @@
 
 #include <ap/argument_parser.hpp>
 
+using namespace ap_testing;
 using namespace ap::argument;
 using namespace ap::nargs;
 
@@ -28,8 +29,6 @@ const std::string optional_arg_short_name = "oa";
 
 } // namespace
 
-namespace ap_testing {
-
 TEST_SUITE_BEGIN("test_argument_parser_parse_args");
 
 TEST_SUITE_BEGIN("test_argument_parser_parse_args::_preprocess_input");
@@ -649,5 +648,3 @@ TEST_CASE_FIXTURE(
 TEST_SUITE_END(); // test_argument_parser_parse_args::values
 
 TEST_SUITE_END(); // test_argument_parser_parse_args
-
-} // namespace ap_testing
diff --git a/test/source/test_boolean.cpp b/test/source/test_boolean.cpp
@@ -2,9 +2,11 @@
 
 /*
 This test file was created to determine whether the doctest library
-and test Makefiles have been set up correctly :)
+and testing CMakeLists.txt file have been set up correctly :)
 */
 
+TEST_SUITE_BEGIN("test_boolean");
+
 TEST_CASE("true should be true") {
     REQUIRE(true == true);
 }
@@ -20,3 +22,5 @@ TEST_CASE("false should be false") {
 TEST_CASE("false should not be true") {
     REQUIRE_FALSE(false == true);
 }
+
+TEST_SUITE_END();
diff --git a/test/source/test_nargs_range.cpp b/test/source/test_nargs_range.cpp
@@ -6,6 +6,7 @@
 
 #include <limits>
 
+using namespace ap_testing;
 using namespace ap::nargs;
 
 namespace {
@@ -20,8 +21,6 @@ constexpr range::count_type nmax = std::numeric_limits<range::count_type>::max()
 
 } // namespace
 
-namespace ap_testing {
-
 TEST_SUITE_BEGIN("test_nargs_range");
 
 TEST_CASE("in_range should return true for default range only when n is 1") {
@@ -113,5 +112,3 @@ TEST_CASE("range builders should return correct range objects") {
 }
 
 TEST_SUITE_END(); // test_nargs_range
-
-} // namespace ap_testing