#959 Update load model tests to call updateLoads()

DARMA-tasking · Sep 11, 2020 · 3e0af58 · 3e0af58
1 parent aee3585
commit 3e0af58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/tests/unit/collection/test_model_comm_overhead.nompi.cc b/tests/unit/collection/test_model_comm_overhead.nompi.cc
@@ -164,7 +164,9 @@ TEST_F(TestModelCommOverhead, test_model_comm_overhead_1) {
     {1, {TimeType{16.6}, TimeType{280}, TimeType{23}}}};
 
   for (; num_phases < 2; ++num_phases) {
+    test_model->updateLoads(num_phases);
     int objects_seen = 0;
+
     for (auto&& obj : *test_model) {
       EXPECT_TRUE(obj == 1 || obj == 2 || obj == 3);
       ++objects_seen;

diff --git a/tests/unit/collection/test_model_norm.nompi.cc b/tests/unit/collection/test_model_norm.nompi.cc
@@ -123,6 +123,7 @@ TEST_F(TestModelNorm, test_model_norm_1) {
 
   auto test_model = std::make_shared<Norm>(std::make_shared<StubModel>(), 3.0);
   test_model->setLoads(&proc_load, &proc_subphase_load, nullptr);
+  test_model->updateLoads(0);
 
   for (unsigned int iter = 0; iter < num_subphases; ++iter) {
     int objects_seen = 0;
@@ -155,6 +156,7 @@ TEST_F(TestModelNorm, test_model_norm_2) {
   // finite 'power' value
   auto test_model = std::make_shared<Norm>(std::make_shared<StubModel>(), 3.0);
   test_model->setLoads(&proc_load, &proc_subphase_load, nullptr);
+  test_model->updateLoads(0);
 
   std::array<TimeType, 2> expected_norms = {
     TimeType{33.019}, TimeType{73.986}};
@@ -188,6 +190,7 @@ TEST_F(TestModelNorm, test_model_norm_3) {
   auto test_model = std::make_shared<Norm>(
     std::make_shared<StubModel>(), std::numeric_limits<double>::infinity());
   test_model->setLoads(&proc_load, &proc_subphase_load, nullptr);
+  test_model->updateLoads(0);
 
   std::array<TimeType, 2> expected_norms = {TimeType{30}, TimeType{60}};
 

diff --git a/tests/unit/collection/test_model_select_subphases.nompi.cc b/tests/unit/collection/test_model_select_subphases.nompi.cc
@@ -127,6 +127,7 @@ TEST_F(TestModelSelectSubphases, test_model_select_subphases_1) {
   EXPECT_EQ(test_model->getNumSubphases(), subphases.size());
 
   test_model->setLoads(&proc_load, &proc_subphase_load, nullptr);
+  test_model->updateLoads(0);
 
   std::unordered_map<ElementIDType, std::vector<TimeType>> expected_values = {
     {1,
@@ -174,6 +175,7 @@ TEST_F(TestModelSelectSubphases, test_model_select_subphases_2) {
   EXPECT_EQ(test_model->getNumSubphases(), subphases.size());
 
   test_model->setLoads(&proc_load, &proc_subphase_load, nullptr);
+  test_model->updateLoads(0);
 
   std::unordered_map<ElementIDType, TimeType> expected_values = {
     {1, TimeType{50}}, {2, TimeType{110}}};