#413 Code smells fix

Signed-off-by: Dimitri Baron <[email protected]>
dynawo · Jul 11, 2024 · 6c6b0be · 6c6b0be
1 parent d93be8e
commit 6c6b0be
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/sources/Common/DYNSimulationResult.h b/sources/Common/DYNSimulationResult.h
@@ -54,6 +54,19 @@ class SimulationResult {
    */
   SimulationResult& operator=(const SimulationResult& result);
 
+  /**
+   * @brief move constructor
+   * @param result : result to move
+   */
+  SimulationResult(SimulationResult&& result) = default;
+
+  /**
+   * @brief move operator
+   * @param result result to move
+   * @return new instance of simulationResult
+   */
+  SimulationResult& operator=(SimulationResult&& result) = default;
+
   /**
    * @brief set the id of the scenario
    * @param id id of the scenario

diff --git a/sources/Common/test/TestBaseClasses.cpp b/sources/Common/test/TestBaseClasses.cpp
@@ -141,6 +141,49 @@ TEST(TestBaseClasses, testSimulationResult) {
   ASSERT_EQ(getStatusAsString(srCopy2.getStatus()), "EXECUTION_PROBLEM");
   srCopy2.setStatus(CRITERIA_NON_RESPECTED_STATUS);
   ASSERT_EQ(getStatusAsString(srCopy2.getStatus()), "CRITERIA_NON_RESPECTED");
+
+  sr.getConstraintsStream() << "Test Constraints";
+  sr.getTimelineStream() << "Test Timeline";
+  sr.getLostEquipementsStream() << "Test LostEquipements";
+  sr.setVariation(42);
+  sr.setConstraintsFileExtension("log");
+  sr.setTimelineFileExtension("log");
+  sr.setLostEquipmentsFileExtension("log");
+  sr.setLogPath("Test LogPath");
+  std::vector<std::pair<double, std::string> > failingCriteria;
+  failingCriteria.emplace_back({43, "Test FailingCriteria"});
+  sr.setFailingCriteria(failingCriteria);
+
+  SimulationResult srMove(std::move(sr));
+  ASSERT_EQ(srMove.getScenarioId(), "MyId");
+  ASSERT_TRUE(srMove.getSuccess());
+  ASSERT_EQ(srMove.getStatus(), CONVERGENCE_STATUS);
+  ASSERT_EQ(srMove.getConstraintsStreamStr(), "Test Constraints");
+  ASSERT_EQ(srMove.getTimelineStreamStr(), "Test Timeline");
+  ASSERT_EQ(srMove.getLostEquipementsStreamStr(), "Test LostEquipements");
+  ASSERT_EQ(srMove.getVariation(), 42);
+  ASSERT_EQ(srMove.getConstraintsFileExtension(), "log");
+  ASSERT_EQ(srMove.getTimelineFileExtension(), "log");
+  ASSERT_EQ(srMove.getLostEquipmentsFileExtension(), "log");
+  ASSERT_EQ(srMove.getLogPath(), "Test LogPath");
+  ASSERT_EQ(srMove.getFailingCriteria()[0].first, 43);
+  ASSERT_EQ(srMove.getFailingCriteria()[0].double, "Test FailingCriteria");
+
+  SimulationResult srMove2;
+  srMove2 = std::move(srMove);
+  ASSERT_EQ(srMove2.getScenarioId(), "MyId");
+  ASSERT_TRUE(srMove2.getSuccess());
+  ASSERT_EQ(srMove2.getStatus(), CONVERGENCE_STATUS);
+  ASSERT_EQ(srMove2.getConstraintsStreamStr(), "Test Constraints");
+  ASSERT_EQ(srMove2.getTimelineStreamStr(), "Test Timeline");
+  ASSERT_EQ(srMove2.getLostEquipementsStreamStr(), "Test LostEquipements");
+  ASSERT_EQ(srMove2.getVariation(), 42);
+  ASSERT_EQ(srMove2.getConstraintsFileExtension(), "log");
+  ASSERT_EQ(srMove2.getTimelineFileExtension(), "log");
+  ASSERT_EQ(srMove2.getLostEquipmentsFileExtension(), "log");
+  ASSERT_EQ(srMove2.getLogPath(), "Test LogPath");
+  ASSERT_EQ(srMove2.getFailingCriteria()[0].first, 43);
+  ASSERT_EQ(srMove2.getFailingCriteria()[0].double, "Test FailingCriteria");
 }
 
 TEST(TestBaseClasses, testLoadIncreaseResult) {