Skip to content

Commit

Permalink
tests: replace Boost.MPL with Mp11
Browse files Browse the repository at this point in the history
Change-Id: I4906a1edb1fad95508db1caaff3fdeefc880e726
  • Loading branch information
Pesa committed Sep 17, 2023
1 parent d8521aa commit b5e5765
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
16 changes: 10 additions & 6 deletions tests/dataset-fixtures.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California.
* Copyright (c) 2014-2023, Regents of the University of California.
*
* This file is part of NDN repo-ng (Next generation of NDN repository).
* See AUTHORS.md for complete list of repo-ng authors and contributors.
Expand All @@ -22,8 +22,11 @@

#include "identity-management-fixture.hpp"

#include <list>
#include <map>
#include <vector>
#include <boost/mpl/vector.hpp>

#include <boost/mp11/list.hpp>

namespace repo::tests {

Expand Down Expand Up @@ -173,10 +176,11 @@ class FetchByPrefixDataset : public DatasetBase
}
};

using CommonDatasets = boost::mpl::vector<BasicDataset,
FetchByPrefixDataset,
SamePrefixDataset<10>,
SamePrefixDataset<100>>;
using CommonDatasets = boost::mp11::mp_list<BasicDataset,
FetchByPrefixDataset,
SamePrefixDataset<10>,
SamePrefixDataset<100>>;

} // namespace repo::tests

#endif // REPO_TESTS_DATASET_FIXTURES_HPP
7 changes: 2 additions & 5 deletions tests/integrated/test-basic-command-insert-delete.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California.
* Copyright (c) 2014-2023, Regents of the University of California.
*
* This file is part of NDN repo-ng (Next generation of NDN repository).
* See AUTHORS.md for complete list of repo-ng authors and contributors.
Expand Down Expand Up @@ -32,7 +32,6 @@
#include <ndn-cxx/util/random.hpp>
#include <ndn-cxx/util/time.hpp>

#include <boost/mpl/vector.hpp>
#include <boost/test/unit_test.hpp>

namespace repo::tests {
Expand Down Expand Up @@ -272,9 +271,7 @@ Fixture<T>::scheduleDeleteEvent()
}
}

using Datasets = boost::mpl::vector<BasicDataset,
FetchByPrefixDataset,
SamePrefixDataset<10>>;
using Datasets = boost::mp11::mp_list<BasicDataset, FetchByPrefixDataset, SamePrefixDataset<10>>;

BOOST_FIXTURE_TEST_CASE_TEMPLATE(InsertDelete, T, Datasets, Fixture<T>)
{
Expand Down
4 changes: 1 addition & 3 deletions tests/integrated/test-basic-interest-read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ class BasicInterestReadFixture : public RepoStorageFixture, public Dataset
ndn::Face readFace;
};

using Datasets = boost::mpl::vector<BasicDataset,
FetchByPrefixDataset,
SamePrefixDataset<10>>;
using Datasets = boost::mp11::mp_list<BasicDataset, FetchByPrefixDataset, SamePrefixDataset<10>>;

BOOST_FIXTURE_TEST_CASE_TEMPLATE(Read, T, Datasets, BasicInterestReadFixture<T>)
{
Expand Down

0 comments on commit b5e5765

Please sign in to comment.