Merge branch 'master' into master

cyclus · May 31, 2019 · a2105d3 · a2105d3
2 parents 06ab278 + 1b82c83
commit a2105d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/reactor_tests.cc b/src/reactor_tests.cc
@@ -680,7 +680,6 @@ TEST(ReactorTests, ByProduct) {
   conds.push_back(Cond("Value", "==", 0));
   qr = sim.db().Query("ReactorSideProducts", &conds);
   EXPECT_EQ(5, qr.rows.size());
-
 }
 
 TEST(ReactorTests, MultipleByProduct) {
@@ -706,18 +705,19 @@ TEST(ReactorTests, MultipleByProduct) {
   sim.AddRecipe("spentuox", c_spentuox());
   int id = sim.Run();
 
+
   std::vector<Cond> conds;
   // test if it produces heat when reactor is running
   int quantity = 10;
-  conds.push_back(Cond("Product", "==", "process_heat"));
+  conds.push_back(Cond("Product", "==", std::string("process_heat")));
   conds.push_back(Cond("Value", "==", quantity));
   QueryResult qr = sim.db().Query("ReactorSideProducts", &conds);
   EXPECT_EQ(5, qr.rows.size());
 
   // test if it produces water when reactor is running
   conds.clear();
   quantity = 100;
-  conds.push_back(Cond("Product", "==", "water"));
+  conds.push_back(Cond("Product", "==", std::string("water")));
   conds.push_back(Cond("Value", "==", quantity));
   qr = sim.db().Query("ReactorSideProducts", &conds);
   EXPECT_EQ(5, qr.rows.size());