Skip to content

Commit 6ab7d28

Browse files
committed
style: reformat tests
1 parent 1f88311 commit 6ab7d28

3 files changed

Lines changed: 35 additions & 23 deletions

File tree

tests/test_expected/lwg_4025_tests.cpp

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,54 @@ namespace
1717

1818
struct CopyableNotMovable
1919
{
20-
CopyableNotMovable() = default;
21-
CopyableNotMovable(const CopyableNotMovable &) = default;
20+
CopyableNotMovable() = default;
21+
CopyableNotMovable(const CopyableNotMovable &) = default;
2222
CopyableNotMovable &operator=(const CopyableNotMovable &) = default;
23-
CopyableNotMovable(CopyableNotMovable &&) = delete;
24-
CopyableNotMovable &operator=(CopyableNotMovable &&) = delete;
23+
CopyableNotMovable(CopyableNotMovable &&) = delete;
24+
CopyableNotMovable &operator=(CopyableNotMovable &&) = delete;
2525
};
2626

2727
struct NotCopyableNotMovable
2828
{
29-
NotCopyableNotMovable() = default;
30-
NotCopyableNotMovable(const NotCopyableNotMovable &) = delete;
29+
NotCopyableNotMovable() = default;
30+
NotCopyableNotMovable(const NotCopyableNotMovable &) = delete;
3131
NotCopyableNotMovable &operator=(const NotCopyableNotMovable &) = delete;
32-
NotCopyableNotMovable(NotCopyableNotMovable &&) = delete;
33-
NotCopyableNotMovable &operator=(NotCopyableNotMovable &&) = delete;
32+
NotCopyableNotMovable(NotCopyableNotMovable &&) = delete;
33+
NotCopyableNotMovable &operator=(NotCopyableNotMovable &&) = delete;
3434
};
3535

3636
struct MoveOnly
3737
{
3838
int value;
39-
MoveOnly() : value(0) {}
40-
MoveOnly(int v) : value(v) {}
41-
MoveOnly(const MoveOnly &) = delete;
39+
MoveOnly()
40+
: value(0)
41+
{
42+
}
43+
MoveOnly(int v)
44+
: value(v)
45+
{
46+
}
47+
MoveOnly(const MoveOnly &) = delete;
4248
MoveOnly &operator=(const MoveOnly &) = delete;
43-
MoveOnly(MoveOnly &&) = default;
44-
MoveOnly &operator=(MoveOnly &&) = default;
49+
MoveOnly(MoveOnly &&) = default;
50+
MoveOnly &operator=(MoveOnly &&) = default;
4551
};
4652

4753
struct StatefulCopyableNotMovable
4854
{
4955
int value;
50-
StatefulCopyableNotMovable() : value(0) {}
51-
StatefulCopyableNotMovable(int v) : value(v) {}
52-
StatefulCopyableNotMovable(const StatefulCopyableNotMovable &) = default;
56+
StatefulCopyableNotMovable()
57+
: value(0)
58+
{
59+
}
60+
StatefulCopyableNotMovable(int v)
61+
: value(v)
62+
{
63+
}
64+
StatefulCopyableNotMovable(const StatefulCopyableNotMovable &) = default;
5365
StatefulCopyableNotMovable &operator=(const StatefulCopyableNotMovable &) = default;
54-
StatefulCopyableNotMovable(StatefulCopyableNotMovable &&) = delete;
55-
StatefulCopyableNotMovable &operator=(StatefulCopyableNotMovable &&) = delete;
66+
StatefulCopyableNotMovable(StatefulCopyableNotMovable &&) = delete;
67+
StatefulCopyableNotMovable &operator=(StatefulCopyableNotMovable &&) = delete;
5668
};
5769

5870
} // namespace
@@ -68,8 +80,7 @@ TEST_CASE("expected<void, E> is trivially move-assignable when E is trivial", "[
6880
STATIC_REQUIRE(std::is_nothrow_move_assignable_v<expected<void, int>>);
6981
}
7082

71-
TEST_CASE("expected<void, E> is move-assignable via copy fallback when E is copyable but not movable",
72-
"[LWG-4025]")
83+
TEST_CASE("expected<void, E> is move-assignable via copy fallback when E is copyable but not movable", "[LWG-4025]")
7384
{
7485
STATIC_REQUIRE(std::is_move_assignable_v<expected<void, CopyableNotMovable>>);
7586
STATIC_REQUIRE(std::is_trivially_move_assignable_v<expected<void, CopyableNotMovable>>);
@@ -172,8 +183,7 @@ TEST_CASE("expected<T, E> is trivially move-assignable when E is trivial", "[LWG
172183
STATIC_REQUIRE(std::is_nothrow_move_assignable_v<expected<int, int>>);
173184
}
174185

175-
TEST_CASE("expected<T, E> is move-assignable via copy fallback when E is copyable but not movable",
176-
"[LWG-4025]")
186+
TEST_CASE("expected<T, E> is move-assignable via copy fallback when E is copyable but not movable", "[LWG-4025]")
177187
{
178188
STATIC_REQUIRE(std::is_move_assignable_v<expected<int, CopyableNotMovable>>);
179189
STATIC_REQUIRE(std::is_trivially_move_assignable_v<expected<int, CopyableNotMovable>>);

tests/test_expected/lwg_4031_tests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ using namespace zeus;
66

77
namespace
88
{
9+
910
// Exposing all members for testing
1011
struct test_bad_expected_access : public bad_expected_access<void>
1112
{
1213
using bad_expected_access<void>::bad_expected_access;
1314
};
15+
1416
}
1517

1618
TEST_CASE("bad_expected_access<void> special members are noexcept", "[LWG-4031]")

tests/test_no_exceptions/test_no_exceptions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main()
4040
if (!ev.has_value())
4141
return 8;
4242

43-
zeus::expected<void, int> ev2{zeus::unexpect, 10};
43+
zeus::expected<void, int> ev2 {zeus::unexpect, 10};
4444
if (ev2.has_value())
4545
return 9;
4646
if (ev2.error() != 10)

0 commit comments

Comments
 (0)