diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-21 21:34:29 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-21 21:34:29 +0000 |
| commit | 0f785ecb3f3c62d82a80090fce8f5e89b5100df0 (patch) | |
| tree | c6bee916b5e31980b2d8ba19023d62c7b1b8eb90 /vdslib/src/tests/distribution | |
| parent | 2b7e8001b853df092c0793498ea54327648450bb (diff) | |
GC unused include
Diffstat (limited to 'vdslib/src/tests/distribution')
| -rw-r--r-- | vdslib/src/tests/distribution/distributiontest.cpp | 29 | ||||
| -rw-r--r-- | vdslib/src/tests/distribution/grouptest.cpp | 1 |
2 files changed, 9 insertions, 21 deletions
diff --git a/vdslib/src/tests/distribution/distributiontest.cpp b/vdslib/src/tests/distribution/distributiontest.cpp index 664c50a3fc9..be93ec614cf 100644 --- a/vdslib/src/tests/distribution/distributiontest.cpp +++ b/vdslib/src/tests/distribution/distributiontest.cpp @@ -3,7 +3,6 @@ #include <vespa/fastos/fastos.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/distribution/idealnodecalculator.h> -#include <boost/assign.hpp> #include <vespa/config/helper/configfetcher.h> #include <cmath> #include <chrono> @@ -1453,38 +1452,28 @@ DistributionTest::testActivePerGroup() void DistributionTest::testHierarchicalDistributeLessThanRedundancy() { - using namespace boost::assign; - Distribution distr("redundancy 4\n" - "active_per_leaf_group true\n" + groupConfig); + Distribution distr("redundancy 4\nactive_per_leaf_group true\n" + groupConfig); ClusterState state("storage:6"); std::vector<uint16_t> actual; { - distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), - actual, "uim", 4); - std::vector<uint16_t> expected; - expected += 3, 5, 1, 2; + distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), actual, "uim", 4); + std::vector<uint16_t> expected({3, 5, 1, 2}); CPPUNIT_ASSERT_EQUAL(expected, actual); } { - distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), - actual, "uim", 3); - std::vector<uint16_t> expected; - expected += 3, 5, 1; + distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), actual, "uim", 3); + std::vector<uint16_t> expected({3, 5, 1}); CPPUNIT_ASSERT_EQUAL(expected, actual); } { - distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), - actual, "uim", 2); - std::vector<uint16_t> expected; - expected += 3, 1; + distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), actual, "uim", 2); + std::vector<uint16_t> expected({3, 1}); CPPUNIT_ASSERT_EQUAL(expected, actual); } { - distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), - actual, "uim", 1); - std::vector<uint16_t> expected; - expected += 3; + distr.getIdealNodes(NodeType::STORAGE, state, document::BucketId(16, 0), actual, "uim", 1); + std::vector<uint16_t> expected({3}); CPPUNIT_ASSERT_EQUAL(expected, actual); } } diff --git a/vdslib/src/tests/distribution/grouptest.cpp b/vdslib/src/tests/distribution/grouptest.cpp index 828a00ff7d0..b182c19d072 100644 --- a/vdslib/src/tests/distribution/grouptest.cpp +++ b/vdslib/src/tests/distribution/grouptest.cpp @@ -3,7 +3,6 @@ #include <vespa/fastos/fastos.h> #include <vespa/vdslib/distribution/group.h> -#include <boost/assign.hpp> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/vdstestlib/cppunit/macros.h> |