diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fe7a87908..bbb17d391 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,13 +6,13 @@ Since last release ====================== **Added:** +* Added package parameter to storage (#603, #612) **Changed:** * Rely on ``python3`` in environment instead of ``python`` (#602) * Link against ``libxml++`` imported target in CMake instead of ``LIBXMLXX_LIBRARIES`` (#608) * Cleaned up ``using`` declarations throughout archetypes (#610) -* Added package parameter to storage (#603) **Fixed:** diff --git a/src/storage_tests.cc b/src/storage_tests.cc index 7a66496fb..f28a9d686 100644 --- a/src/storage_tests.cc +++ b/src/storage_tests.cc @@ -1036,9 +1036,9 @@ TEST_F(StorageTest, PackageMerge) { res_conds.push_back(cyclus::Cond("PackageName", "==", p->name())); cyclus::QueryResult qr_res = sim.db().Query("Resources", &res_conds); // Combines two 0.5 mass resources to make packages with mass 1 - EXPECT_EQ(qr_res.rows.size(), 2); - EXPECT_EQ(qr_res.GetVal("Quantity", 0), 1); - EXPECT_EQ(qr_res.GetVal("Quantity", 1), 1); + EXPECT_EQ(2, qr_res.rows.size()); + EXPECT_EQ(1, qr_res.GetVal("Quantity", 0)); + EXPECT_EQ(1, qr_res.GetVal("Quantity", 1)); } } // namespace cycamore