From 3a6d6279fe386f9591fdbd8c38fe2fb059dbc398 Mon Sep 17 00:00:00 2001 From: Robert LeBlanc Date: Mon, 15 Feb 2016 17:52:05 +0000 Subject: [PATCH] test/common/test_weighted_priority_queue Fix the unit tests since the changes to WeightedPriorityQueue there is no strict round robin dequeueing of classes. Removed that test from the unittest. Signed-off-by: Robert LeBlanc --- src/test/common/test_weighted_priority_queue.cc | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/test/common/test_weighted_priority_queue.cc b/src/test/common/test_weighted_priority_queue.cc index d3ebc4199cfb3..b8519794b6e1e 100644 --- a/src/test/common/test_weighted_priority_queue.cc +++ b/src/test/common/test_weighted_priority_queue.cc @@ -114,13 +114,6 @@ protected: // in the strict queue. LQ::reverse_iterator ri = strictq.rbegin(); EXPECT_EQ(std::get<0>(r), ri->first); - // Check that if there are multiple classes in a priority - // that it is not dequeueing the same class each time. - LastKlass::iterator si = last_strict.find(std::get<0>(r)); - if (strictq[std::get<0>(r)].size() > 1 && si != last_strict.end()) { - EXPECT_NE(std::get<1>(r), si->second); - } - last_strict[std::get<0>(r)] = std::get<1>(r); Item t = strictq[std::get<0>(r)][std::get<1>(r)].front().second; EXPECT_EQ(std::get<2>(r), std::get<2>(t)); @@ -132,14 +125,6 @@ protected: strictq.erase(std::get<0>(r)); } } else { - // Check that if there are multiple classes in a priority - // that it is not dequeueing the same class each time. - LastKlass::iterator si = last_norm.find(std::get<0>(r)); - if (normq[std::get<0>(r)].size() > 1 && si != last_norm.end()) { - EXPECT_NE(std::get<1>(r), si->second); - } - last_norm[std::get<0>(r)] = std::get<1>(r); - Item t = normq[std::get<0>(r)][std::get<1>(r)].front().second; EXPECT_EQ(std::get<2>(r), std::get<2>(t)); normq[std::get<0>(r)][std::get<1>(r)].pop_front(); -- 2.39.5