Skip to content

Commit db888da

Browse files
james-d-mitchelljames-d-mitchell
committed
tests: remove deprecated header
1 parent f5166a4 commit db888da

File tree

1 file changed

+46
-52
lines changed

1 file changed

+46
-52
lines changed

‎tests/test_perm_all.cpp‎

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include <boost/functional.hpp>
2222
#include <boost/mpl/list.hpp>
23-
#include <boost/test/test_case_template.hpp>
2423
#include <boost/test/unit_test.hpp>
2524

2625
//____________________________________________________________________________//
@@ -44,10 +43,9 @@ struct Fixture : public IsPermFunctions<typename _PermType::vect> {
4443
using PermType = _PermType;
4544

4645
Fixture()
47-
: zero({0}), V01({0, 1}), V10({1, 0}), V11({1, 1}),
48-
V1({}, 1), PPa({1, 2, 3, 4, 0, 5}),
49-
PPb({1, 2, 3, 6, 0, 5}), czero(zero), cV01(V01),
50-
RandPerm({3, 1, 0, 5, 10, 2, 6, 7, 4, 8, 9}),
46+
: zero({0}), V01({0, 1}), V10({1, 0}), V11({1, 1}), V1({}, 1),
47+
PPa({1, 2, 3, 4, 0, 5}), PPb({1, 2, 3, 6, 0, 5}), czero(zero),
48+
cV01(V01), RandPerm({3, 1, 0, 5, 10, 2, 6, 7, 4, 8, 9}),
5149
Plist({PPa, PPb, RandPerm}),
5250
Vlist({zero, V01, V10, V11, V1, PPa, PPb, RandPerm}) {
5351
BOOST_TEST_MESSAGE("setup fixture");
@@ -70,12 +68,9 @@ struct Fixture : public IsPermFunctions<typename _PermType::vect> {
7068
//____________________________________________________________________________//
7169

7270
typedef boost::mpl::list<
73-
Fixture<HPCombi::Perm16>,
74-
Fixture<HPCombi::PermGeneric<12>>,
75-
Fixture<HPCombi::PermGeneric<16>>,
76-
Fixture<HPCombi::PermGeneric<32>>,
77-
Fixture<HPCombi::PermGeneric<42>>,
78-
Fixture<HPCombi::PermGeneric<49>>,
71+
Fixture<HPCombi::Perm16>, Fixture<HPCombi::PermGeneric<12>>,
72+
Fixture<HPCombi::PermGeneric<16>>, Fixture<HPCombi::PermGeneric<32>>,
73+
Fixture<HPCombi::PermGeneric<42>>, Fixture<HPCombi::PermGeneric<49>>,
7974
Fixture<HPCombi::PermGeneric<350, uint32_t>>>
8075
Fixtures;
8176

@@ -85,7 +80,7 @@ BOOST_AUTO_TEST_SUITE(VectType_test)
8580
//____________________________________________________________________________//
8681

8782
BOOST_FIXTURE_TEST_CASE_TEMPLATE(sizeof_test, F, Fixtures, F) {
88-
BOOST_TEST(sizeof(F::zero) == F::VectType::Size()*sizeof(F::zero[0]));
83+
BOOST_TEST(sizeof(F::zero) == F::VectType::Size() * sizeof(F::zero[0]));
8984
}
9085

9186
BOOST_FIXTURE_TEST_CASE_TEMPLATE(equal_test, F, Fixtures, F) {
@@ -163,47 +158,46 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(operator_less_partial_test, F, Fixtures, F) {
163158
BOOST_TEST(F::PPb.less_partial(F::PPa, 5) > 0);
164159
}
165160

166-
167161
BOOST_FIXTURE_TEST_CASE_TEMPLATE(first_zero_test, F, Fixtures, F) {
168-
BOOST_TEST(F::zero.first_zero() == 0u);
169-
BOOST_TEST(F::V01.first_zero() == 0u);
170-
BOOST_TEST(F::PPa.first_zero() == 4u);
171-
BOOST_TEST(F::V10.first_zero() == 1u);
172-
BOOST_TEST(F::V1.first_zero() == F::VectType::Size());
173-
BOOST_TEST(F::V10.first_zero(1) == F::VectType::Size());
174-
BOOST_TEST(F::PPa.first_zero(5) == 4u);
175-
BOOST_TEST(F::PPa.first_zero(3) == F::VectType::Size());
162+
BOOST_TEST(F::zero.first_zero() == 0u);
163+
BOOST_TEST(F::V01.first_zero() == 0u);
164+
BOOST_TEST(F::PPa.first_zero() == 4u);
165+
BOOST_TEST(F::V10.first_zero() == 1u);
166+
BOOST_TEST(F::V1.first_zero() == F::VectType::Size());
167+
BOOST_TEST(F::V10.first_zero(1) == F::VectType::Size());
168+
BOOST_TEST(F::PPa.first_zero(5) == 4u);
169+
BOOST_TEST(F::PPa.first_zero(3) == F::VectType::Size());
176170
}
177171

178172
BOOST_FIXTURE_TEST_CASE_TEMPLATE(last_zero_test, F, Fixtures, F) {
179-
BOOST_TEST(F::zero.last_zero() == F::VectType::Size() - 1);
180-
BOOST_TEST(F::V01.last_zero() == F::VectType::Size() - 1);
181-
BOOST_TEST(F::PPa.last_zero() == 4u);
182-
BOOST_TEST(F::V1.last_zero() == F::VectType::Size());
183-
BOOST_TEST(F::V01.last_zero(1) == 0u);
184-
BOOST_TEST(F::V10.last_zero(1) == F::VectType::Size());
185-
BOOST_TEST(F::PPa.last_zero(5) == 4u);
186-
BOOST_TEST(F::PPa.last_zero(3) == F::VectType::Size());
173+
BOOST_TEST(F::zero.last_zero() == F::VectType::Size() - 1);
174+
BOOST_TEST(F::V01.last_zero() == F::VectType::Size() - 1);
175+
BOOST_TEST(F::PPa.last_zero() == 4u);
176+
BOOST_TEST(F::V1.last_zero() == F::VectType::Size());
177+
BOOST_TEST(F::V01.last_zero(1) == 0u);
178+
BOOST_TEST(F::V10.last_zero(1) == F::VectType::Size());
179+
BOOST_TEST(F::PPa.last_zero(5) == 4u);
180+
BOOST_TEST(F::PPa.last_zero(3) == F::VectType::Size());
187181
}
188182

189183
BOOST_FIXTURE_TEST_CASE_TEMPLATE(first_non_zero_test, F, Fixtures, F) {
190-
BOOST_TEST(F::zero.first_non_zero() == F::VectType::Size());
191-
BOOST_TEST(F::V01.first_non_zero() == 1u);
192-
BOOST_TEST(F::PPa.first_non_zero() == 0u);
193-
BOOST_TEST(F::V01.first_non_zero() == 1u);
194-
BOOST_TEST(F::V01.first_non_zero(1) == F::VectType::Size());
195-
BOOST_TEST(F::PPa.first_non_zero(5) == 0u);
196-
BOOST_TEST(F::PPa.first_non_zero(3) == 0u);
184+
BOOST_TEST(F::zero.first_non_zero() == F::VectType::Size());
185+
BOOST_TEST(F::V01.first_non_zero() == 1u);
186+
BOOST_TEST(F::PPa.first_non_zero() == 0u);
187+
BOOST_TEST(F::V01.first_non_zero() == 1u);
188+
BOOST_TEST(F::V01.first_non_zero(1) == F::VectType::Size());
189+
BOOST_TEST(F::PPa.first_non_zero(5) == 0u);
190+
BOOST_TEST(F::PPa.first_non_zero(3) == 0u);
197191
}
198192

199193
BOOST_FIXTURE_TEST_CASE_TEMPLATE(last_non_zero_test, F, Fixtures, F) {
200-
BOOST_TEST(F::zero.last_non_zero() == F::VectType::Size());
201-
BOOST_TEST(F::V01.last_non_zero() == 1u);
202-
BOOST_TEST(F::PPa.last_non_zero() == F::VectType::Size() - 1);
203-
BOOST_TEST(F::V01.last_non_zero() == 1u);
204-
BOOST_TEST(F::V01.last_non_zero(1) == F::VectType::Size());
205-
BOOST_TEST(F::PPa.last_non_zero(5) == 3u);
206-
BOOST_TEST(F::PPa.last_non_zero(3) == 2u);
194+
BOOST_TEST(F::zero.last_non_zero() == F::VectType::Size());
195+
BOOST_TEST(F::V01.last_non_zero() == 1u);
196+
BOOST_TEST(F::PPa.last_non_zero() == F::VectType::Size() - 1);
197+
BOOST_TEST(F::V01.last_non_zero() == 1u);
198+
BOOST_TEST(F::V01.last_non_zero(1) == F::VectType::Size());
199+
BOOST_TEST(F::PPa.last_non_zero(5) == 3u);
200+
BOOST_TEST(F::PPa.last_non_zero(3) == 2u);
207201
}
208202

209203
BOOST_FIXTURE_TEST_CASE_TEMPLATE(permuted_test, F, Fixtures, F) {
@@ -266,7 +260,8 @@ template <class _Perm> struct PermFixture : public IsPermFunctions<_Perm> {
266260
PermFixture()
267261
: id(PermType::one()), RandPerm({3, 1, 0, 5, 10, 2, 11, 6, 7, 4, 8, 9}),
268262
Plist({id, RandPerm}) {
269-
for (uint64_t i = 0; i < std::min<size_t>(PermType::size(), 30) - 1; i++)
263+
for (uint64_t i = 0; i < std::min<size_t>(PermType::size(), 30) - 1;
264+
i++)
270265
Plist.push_back(PermType::elementary_transposition(i));
271266
for (uint64_t i = std::max<size_t>(30, PermType::size() - 20);
272267
i < PermType::size() - 1; i++)
@@ -285,14 +280,13 @@ template <class _Perm> struct PermFixture : public IsPermFunctions<_Perm> {
285280

286281
//____________________________________________________________________________//
287282

288-
typedef boost::mpl::list<
289-
PermFixture<HPCombi::Perm16>,
290-
PermFixture<HPCombi::PermGeneric<12>>,
291-
PermFixture<HPCombi::PermGeneric<16>>,
292-
PermFixture<HPCombi::PermGeneric<32>>,
293-
PermFixture<HPCombi::PermGeneric<42>>,
294-
PermFixture<HPCombi::PermGeneric<49>>,
295-
PermFixture<HPCombi::PermGeneric<350, uint32_t>>>
283+
typedef boost::mpl::list<PermFixture<HPCombi::Perm16>,
284+
PermFixture<HPCombi::PermGeneric<12>>,
285+
PermFixture<HPCombi::PermGeneric<16>>,
286+
PermFixture<HPCombi::PermGeneric<32>>,
287+
PermFixture<HPCombi::PermGeneric<42>>,
288+
PermFixture<HPCombi::PermGeneric<49>>,
289+
PermFixture<HPCombi::PermGeneric<350, uint32_t>>>
296290
PermFixtures;
297291

298292
//____________________________________________________________________________//

0 commit comments

Comments
 (0)