passing test (#2)

wrench-project · Oct 2, 2019 · 68b66a2 · 68b66a2
1 parent 3793d50
commit 68b66a2
Show file tree

Hide file tree

Showing 18 changed files with 138 additions and 103 deletions.
diff --git a/test/compute_services/BareMetalComputeService/BareMetalComputeServiceOneTaskTest.cpp b/test/compute_services/BareMetalComputeService/BareMetalComputeServiceOneTaskTest.cpp
@@ -995,7 +995,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, DISABLED_ExecutionWithDefaultStorageS
 
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithDefaultStorageService_test() {
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1143,7 +1143,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithPrePostCopiesTaskCleanup
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithPrePostCopiesTaskCleanup_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1286,7 +1286,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithPrePostCopiesNoTaskNoCle
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithPrePostCopiesNoTaskNoCleanup_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1410,7 +1410,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithPreNoPostCopiesNoTaskCle
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithPreNoPostCopiesNoTaskCleanup_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1535,7 +1535,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithMissingFile) {
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithMissingFile_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1658,7 +1658,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithNotEnoughCores) {
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithNotEnoughCores_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");
@@ -1779,7 +1779,7 @@ TEST_F(BareMetalComputeServiceOneTaskTest, ExecutionWithNotEnoughRAM) {
 void BareMetalComputeServiceOneTaskTest::do_ExecutionWithNotEnoughRAM_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("one_task_test");

diff --git a/test/compute_services/BareMetalComputeService/BareMetalComputeServiceTestPilotJobs.cpp b/test/compute_services/BareMetalComputeService/BareMetalComputeServiceTestPilotJobs.cpp
@@ -145,7 +145,7 @@ TEST_F(BareMetalComputeServiceTestPilotJobs, UnsupportedPilotJobs) {
 void BareMetalComputeServiceTestPilotJobs::do_UnsupportedPilotJobs_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");

diff --git a/test/compute_services/BareMetalComputeService/BareMetalComputeServiceTestStandardJobs.cpp b/test/compute_services/BareMetalComputeService/BareMetalComputeServiceTestStandardJobs.cpp
@@ -216,7 +216,7 @@ DO_TEST_WITH_FORK(do_UnsupportedStandardJobs_test);
 void BareMetalComputeServiceTestStandardJobs::do_UnsupportedStandardJobs_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -324,7 +324,7 @@ DO_TEST_WITH_FORK(do_BogusNumCores_test);
 void BareMetalComputeServiceTestStandardJobs::do_BogusNumCores_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -449,7 +449,7 @@ DO_TEST_WITH_FORK(do_TwoSingleCoreTasks_test);
 void BareMetalComputeServiceTestStandardJobs::do_TwoSingleCoreTasks_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -575,7 +575,7 @@ DO_TEST_WITH_FORK(do_TwoDualCoreTasksCase1_test);
 void BareMetalComputeServiceTestStandardJobs::do_TwoDualCoreTasksCase1_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -713,7 +713,7 @@ DO_TEST_WITH_FORK(do_TwoDualCoreTasksCase2_test);
 void BareMetalComputeServiceTestStandardJobs::do_TwoDualCoreTasksCase2_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -902,7 +902,7 @@ class BareMetalComputeServiceTwoDualCoreTasksCase3TestWMS : public wrench::WMS {
             throw std::runtime_error("Error while getting and execution event: " + e.getCause()->toString());
         }
         if (std::dynamic_pointer_cast<wrench::StandardJobCompletedEvent>(event)) {
-            two_task_job_2_completion_date = simulation->getCurrentSimulatedDate();
+            two_task_job_2_completion_date = wrench::Simulation::getCurrentSimulatedDate();
             // success, do nothing for now
         } else {
             throw std::runtime_error("Unexpected workflow execution event: " + event->toString());
@@ -936,7 +936,7 @@ DO_TEST_WITH_FORK(do_TwoDualCoreTasksCase3_test);
 void BareMetalComputeServiceTestStandardJobs::do_TwoDualCoreTasksCase3_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");

diff --git a/test/compute_services/BatchService/BatchServiceBatschedContiguityTest.cpp b/test/compute_services/BatchService/BatchServiceBatschedContiguityTest.cpp
@@ -111,7 +111,7 @@ class BatchJobContiguousAllocationTestWMS : public wrench::WMS {
             wrench::WorkflowTask *task4 = this->getWorkflow()->addTask(cs->getName() + "task4", 59, 1, 1, 1.0, 0);
             wrench::StandardJob *job;
 
-            double start_time = this->simulation->getCurrentSimulatedDate();
+            double start_time = wrench::Simulation::getCurrentSimulatedDate();
 
             // Submit a sequential task that lasts one min and requires 1 host
             job = job_manager->createStandardJob(task1, {});
@@ -178,7 +178,7 @@ class BatchJobContiguousAllocationTestWMS : public wrench::WMS {
                 if (real_event) {
                     wrench::WorkflowTask *task = *(real_event->standard_job->getTasks().begin());
                     if (task == task4) {
-                        double now = simulation->getCurrentSimulatedDate();
+                        double now = wrench::Simulation::getCurrentSimulatedDate();
                         contiguous = (now >= start_time + 120);
                     }
                 } else {

diff --git a/test/compute_services/BatchService/BatchServiceBatschedQueueWaitTimePredictionTest.cpp b/test/compute_services/BatchService/BatchServiceBatschedQueueWaitTimePredictionTest.cpp
@@ -170,7 +170,7 @@ class BatchJobBrokenEstimateWaitingTimeTestWMS : public wrench::WMS {
                         "Got some exception"
                 );
             }
-            double first_job_running = this->simulation->getCurrentSimulatedDate();
+            double first_job_running = wrench::Simulation::getCurrentSimulatedDate();
 
             auto batch_service = (*this->getAvailableComputeServices<wrench::BatchComputeService>().begin());
             std::string job_id = "my_tentative_job";
@@ -355,7 +355,7 @@ class BatchJobBasicEstimateWaitingTimeTestWMS : public wrench::WMS {
                         "Got some exception"
                 );
             }
-            auto first_job_running = this->simulation->getCurrentSimulatedDate();
+            auto first_job_running = wrench::Simulation::getCurrentSimulatedDate();
 
             auto batch_service = (*this->getAvailableComputeServices<wrench::BatchComputeService>().begin());
             std::string job_id = "my_tentative_job";
@@ -528,7 +528,7 @@ class BatchJobEstimateWaitingTimeTestWMS : public wrench::WMS {
                         "Got some exception"
                 );
             }
-            double first_job_running = this->simulation->getCurrentSimulatedDate();
+            double first_job_running = wrench::Simulation::getCurrentSimulatedDate();
 
 
             auto batch_service = (*this->getAvailableComputeServices<wrench::BatchComputeService>().begin());

diff --git a/test/compute_services/BatchService/BatchServiceFCFSTest.cpp b/test/compute_services/BatchService/BatchServiceFCFSTest.cpp
@@ -166,7 +166,7 @@ class SimpleFCFSTestWMS : public wrench::WMS {
                 throw std::runtime_error("Error while getting and execution event: " + e.getCause()->toString());
             }
             if (std::dynamic_pointer_cast<wrench::StandardJobCompletedEvent>(event)) {
-                actual_completion_times[i] =  this->simulation->getCurrentSimulatedDate();
+                actual_completion_times[i] =  wrench::Simulation::getCurrentSimulatedDate();
             } else {
                 throw std::runtime_error("Unexpected workflow execution event: " + event->toString());
             }

diff --git a/test/compute_services/BatchService/BatchServiceTest.cpp b/test/compute_services/BatchService/BatchServiceTest.cpp
@@ -699,7 +699,7 @@ class TwoStandardJobSubmissionTestWMS : public wrench::WMS {
                 //ignore (network error or something)
             }
 
-            double completion_time = this->simulation->getCurrentSimulatedDate();
+            double completion_time = wrench::Simulation::getCurrentSimulatedDate();
             double expected_completion_time;
             if (job == standard_job_1) {
                 expected_completion_time = 1800;
@@ -1080,7 +1080,7 @@ TEST_F(BatchServiceTest, StandardPlusPilotJobSubmissionTest) {
 void BatchServiceTest::do_StandardPlusPilotJobTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -1214,7 +1214,7 @@ TEST_F(BatchServiceTest, InsufficientCoresJobSubmissionTest) {
 void BatchServiceTest::do_InsufficientCoresTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -1340,7 +1340,7 @@ TEST_F(BatchServiceTest, NoArgumentsJobSubmissionTest) {
 void BatchServiceTest::do_noArgumentsJobSubmissionTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -1493,7 +1493,7 @@ TEST_F(BatchServiceTest, StandardJobTimeOutTaskTest) {
 void BatchServiceTest::do_StandardJobTimeOutTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -1846,7 +1846,7 @@ TEST_F(BatchServiceTest, BestFitStandardJobSubmissionTest)
 void BatchServiceTest::do_BestFitTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2010,7 +2010,7 @@ TEST_F(BatchServiceTest, FirstFitStandardJobSubmissionTest)
 void BatchServiceTest::do_FirstFitTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2192,7 +2192,7 @@ class RoundRobinStandardJobSubmissionTestWMS : public wrench::WMS {
 
             double EPSILON = 1.0;
             double not_expected_date = 60; //FIRSTFIT and BESTFIT would complete in ~60 seconds but ROUNDROBIN would finish, in this case, in ~90 seconds
-            if (std::abs(this->simulation->getCurrentSimulatedDate() - not_expected_date) <= EPSILON) {
+            if (std::abs(wrench::Simulation::getCurrentSimulatedDate() - not_expected_date) <= EPSILON) {
                 throw std::runtime_error(
                         "BatchServiceTest::ROUNDROBINTEST():: The tasks did not finish on time: Simulation Date > Expected Date"
                 );
@@ -2282,7 +2282,7 @@ TEST_F(BatchServiceTest, RoundRobinTaskTest)
 void BatchServiceTest::do_RoundRobinTask_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2465,7 +2465,7 @@ TEST_F(BatchServiceTest, StandardJobInsidePilotJobTimeOutTaskTest) {
 void BatchServiceTest::do_StandardJobInsidePilotJobTimeOutTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2628,7 +2628,7 @@ TEST_F(BatchServiceTest, StandardJobInsidePilotJobSucessTaskTest) {
 void BatchServiceTest::do_StandardJobInsidePilotJobSucessTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2782,7 +2782,7 @@ TEST_F(BatchServiceTest, InsufficientCoresInsidePilotJobTaskTest) {
 void BatchServiceTest::do_InsufficientCoresInsidePilotJobTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -2924,7 +2924,7 @@ TEST_F(BatchServiceTest, MultipleStandardJobSubmissionTest) {
 void BatchServiceTest::do_MultipleStandardTaskTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -3072,7 +3072,7 @@ TEST_F(BatchServiceTest, DISABLED_DifferentBatchAlgorithmsSubmissionTest)
 void BatchServiceTest::do_DifferentBatchAlgorithmsSubmissionTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");
@@ -3230,7 +3230,7 @@ TEST_F(BatchServiceTest, ShutdownWithPendingRunningJobsTest)
 void BatchServiceTest::do_ShutdownWithPendingRunningJobsTest_test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("batch_service_test");

diff --git a/test/compute_services/BatchService/BatchServiceTraceFileTest.cpp b/test/compute_services/BatchService/BatchServiceTraceFileTest.cpp
@@ -521,7 +521,7 @@ class WorkloadTraceFileSWFTestWMS : public wrench::WMS {
                 //ignore (network error or something)
             }
 
-            double completion_time = this->simulation->getCurrentSimulatedDate();
+            double completion_time = wrench::Simulation::getCurrentSimulatedDate();
             double expected_completion_time;
             if (job == standard_job_2_nodes) {
                 expected_completion_time = 3600  + 1800;

diff --git a/test/file_registry_services/FileRegistryTest.cpp b/test/file_registry_services/FileRegistryTest.cpp
@@ -427,7 +427,7 @@ TEST_F(FileRegistryTest, LookupEntry) {
 void FileRegistryTest::do_lookupEntry_Test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("file_registry_lookup_entry_test");

diff --git a/test/network_proximity_services/NetworkProximityTest.cpp b/test/network_proximity_services/NetworkProximityTest.cpp
@@ -202,7 +202,7 @@ TEST_F(NetworkProximityTest, NetworkProximity) {
 void NetworkProximityTest::do_NetworkProximity_Test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -403,7 +403,7 @@ TEST_F(NetworkProximityTest, CompareNetworkProximity) {
 void NetworkProximityTest::do_CompareNetworkProximity_Test() {
 
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -579,7 +579,7 @@ TEST_F(NetworkProximityTest, VivaldiConvergeTest) {
 
 void NetworkProximityTest::do_VivaldiConverge_Test() {
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");
@@ -684,7 +684,7 @@ TEST_F(NetworkProximityTest, NetworkProximityValidatePropertiesTest) {
 
 void NetworkProximityTest::do_ValidateProperties_Test() {
     // Create and initialize a simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));
     argv[0] = strdup("unit_test");

diff --git a/test/simulation/S4U_DaemonTest.cpp b/test/simulation/S4U_DaemonTest.cpp
@@ -151,7 +151,7 @@ class S4U_DaemonTestWMS : public wrench::WMS {
         // Join and check that we get to the right time
         daemon->join();
 
-        double now = simulation->getCurrentSimulatedDate();
+        double now = wrench::Simulation::getCurrentSimulatedDate();
         if (std::abs(now - 120) > 1) {
             throw std::runtime_error("Joining at time " + std::to_string(now) + " instead of expected 120");
         }

diff --git a/test/storage_services/SimpleStorageService/DataMovementManagerCopyRegisterTest.cpp b/test/storage_services/SimpleStorageService/DataMovementManagerCopyRegisterTest.cpp
@@ -306,7 +306,7 @@ TEST_F(DataMovementManagerCopyRegisterTest, CopyAndRegister) {
 
 void DataMovementManagerCopyRegisterTest::do_CopyRegister_test() {
     // Create and initialize the simulation
-    wrench::Simulation *simulation = new wrench::Simulation();
+    auto simulation = new wrench::Simulation();
 
     int argc = 1;
     char **argv = (char **) calloc(1, sizeof(char *));