Move test support types to test_types.

Author: steve-downey

src/Beman/Optional26/tests/optional_constexpr.t.cpp

@@ -268,11 +268,6 @@ TEST(OptionalConstexprTest, Nullopt) {
     EXPECT_TRUE(!std::is_default_constructible<beman::optional26::nullopt_t>::value);
 }
 
-struct move_detector {
-    move_detector() = default;
-    move_detector(move_detector&& rhs) { rhs.been_moved = true; }
-    bool been_moved = false;
-};
 
 TEST(OptionalConstexprTest, Observers) {
     constexpr beman::optional26::optional<int>       o1 = 42;
@@ -292,19 +287,6 @@ TEST(OptionalConstexprTest, Observers) {
 
 }
 
-namespace {
-class Point
-{
-    int x_;
-    int y_;
-  public:
-    constexpr Point() : x_(0), y_(0) {}
-    constexpr Point(int x, int y) : x_(x), y_(y) {}
-    auto operator<=>(const Point&) const = default;
-    bool operator==(const Point&) const = default;
-};
-
-}
 TEST(OptionalConstexprTest, RelationalOps) {
     constexpr beman::optional26::optional<int> o1{4};
     constexpr beman::optional26::optional<int> o2{42};
@@ -389,6 +371,8 @@ TEST(OptionalConstexprTest, RelationalOps) {
         }
     }
 
+    using beman::optional26::tests::Point;
+
     constexpr Point p4{2, 3};
     constexpr Point p5{3, 4};
 
@@ -796,6 +780,8 @@ consteval bool testComparisons() {
         }
     }
 
+    using beman::optional26::tests::Point;
+
     constexpr Point p4{2, 3};
     constexpr Point p5{3, 4};
 

src/Beman/Optional26/tests/optional_ref.t.cpp

@@ -405,12 +405,6 @@ TEST(OptionalRefTest, Nullopt) {
     EXPECT_TRUE(!std::is_default_constructible<beman::optional26::nullopt_t>::value);
 }
 
-struct move_detector {
-    move_detector() = default;
-    move_detector(move_detector&& rhs) { rhs.been_moved = true; }
-    bool been_moved = false;
-};
-
 TEST(OptionalRefTest, Observers) {
     int                                     var = 42;
     beman::optional26::optional<int&>       o1  = var;

src/Beman/Optional26/tests/test_types.hpp

@@ -49,6 +49,23 @@ struct derived : public base {
     auto operator<=>(const derived&) const = default;
 };
 
+struct move_detector {
+    move_detector() = default;
+    move_detector(move_detector&& rhs) { rhs.been_moved = true; }
+    bool been_moved = false;
+};
+
+class Point {
+    int x_;
+    int y_;
+
+  public:
+    constexpr Point() : x_(0), y_(0) {}
+    constexpr Point(int x, int y) : x_(x), y_(y) {}
+    auto operator<=>(const Point&) const = default;
+    bool operator==(const Point&) const  = default;
+};
+
 } // namespace beman::optional26::tests
 
 #endif // BEMAN_OPTIONAL26_TESTS_TEST_TYPES_HPP