diff options
author | Giuliano Procida <gprocida@google.com> | 2024-02-22 11:15:16 +0000 |
---|---|---|
committer | Giuliano Procida <gprocida@google.com> | 2024-03-08 14:23:56 +0000 |
commit | 1cb2c520d310ae1439ecb8f5a807d8a2aa3539d2 (patch) | |
tree | 59e44c1330863569988f880160a801bd407f54c2 | |
parent | d52c700299474cd6217b63e770c5d70f26df847d (diff) | |
download | stg-1cb2c520d310ae1439ecb8f5a807d8a2aa3539d2.tar.gz |
order test: make some order combination tests a bit clearer
* move initialisation of combined ordering closer to use
* simplify one check
PiperOrigin-RevId: 609309062
Change-Id: I8fbf2c53c964e9d94ab0b8a0c5a292f691e85fe2
-rw-r--r-- | order_test.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/order_test.cc b/order_test.cc index 64b507b..17dbf64 100644 --- a/order_test.cc +++ b/order_test.cc @@ -115,15 +115,13 @@ TEST_CASE("randomly-generating ordering sequences, fully-matching") { gen.seed(seed); const auto order1 = MakePermutation(k, gen); const auto order2 = MakePermutation(k, gen); - auto combined = order2; std::ostringstream os; os << "orderings of " << k << " numbers generated using seed " << seed; GIVEN(os.str()) { + auto combined = order2; stg::ExtendOrder(order1, combined); - for (size_t i = 0; i < k; ++i) { - // combined should be unchanged - CHECK(combined[i] == order2[i]); - } + // combined should be unchanged + CHECK(combined == order2); } } } @@ -145,10 +143,10 @@ TEST_CASE("randomly-generating ordering sequences, disjoint") { for (size_t i = 0; i < k; ++i) { order2[i] += k; } - auto combined = order2; std::ostringstream os; os << "orderings of " << k << " numbers generated using seed " << seed; GIVEN(os.str()) { + auto combined = order2; stg::ExtendOrder(order1, combined); for (size_t i = 0; i < k; ++i) { // order1 should appear as the first part @@ -178,10 +176,10 @@ TEST_CASE("randomly-generating ordering sequences, single overlap") { order2[i] += k - 1; } const auto pivot = k - 1; - auto combined = order2; std::ostringstream os; os << "orderings of " << k << " numbers generated using seed " << seed; GIVEN(os.str()) { + auto combined = order2; stg::ExtendOrder(order1, combined); CHECK(combined.size() == 2 * k - 1); // order1 pre, order2 pre, pivot, order1 post, order2 post |