Removed a dead class

CMakeLists.txt

@@ -145,8 +145,6 @@ set(SOURCE_FILES
         src/wrench/workflow/execution_events/FailureCause.cpp
         src/wrench/services/ServiceMessage.cpp
         src/wrench/services/compute/ComputeServiceMessage.cpp
-        src/wrench/services/compute/multihost_multicore/MulticoreComputeServiceMessage.cpp
-        src/wrench/services/compute/multihost_multicore/MulticoreComputeServiceMessage.h
         src/wrench/services/storage/StorageServiceMessage.cpp
         src/wrench/services/storage/StorageServiceMessage.h
         src/wrench/services/file_registry/FileRegistryMessage.cpp

src/wrench/services/compute/multihost_multicore/MultihostMulticoreComputeService.cpp

@@ -12,7 +12,6 @@
 
 #include "wrench/services/ServiceMessage.h"
 #include "wrench/services/compute/ComputeServiceMessage.h"
-#include "services/compute/multihost_multicore/MulticoreComputeServiceMessage.h"
 #include "services/compute/standard_job_executor/StandardJobExecutorMessage.h"
 #include "wrench/simgrid_S4U_util/S4U_Mailbox.h"
 #include "wrench/exceptions/WorkflowExecutionException.h"

test/simulation/MultihostMulticoreComputeService/MultihostMulticoreComputeServiceOneTaskTest.cpp

@@ -345,10 +345,14 @@ class StandardJobConstructorTestWMS : public wrench::WMS {
       } catch (std::invalid_argument &e) {
         success = false;
       }
+
       if (success) {
         throw std::runtime_error("Should not be able to create a job with an empty task");
       }
 
+
+
+
       // Create a job with an empty vector of tasks (and no file copies)
       success = true;
       try {
@@ -759,6 +763,12 @@ class ExecutionWithLocationMapTestWMS : public wrench::WMS {
                                            {{test->input_file,  test->storage_service1},
                                             {test->output_file, test->storage_service1}});
 
+      // Get the job type as a string
+      std::string job_type_as_string = job->getTypeAsString();
+      if (job_type_as_string != "Standard") {
+        throw std::runtime_error("Job type as a string should be 'Standard'");
+      }
+
       // Submit the job
       job_manager->submitJob(job, test->compute_service);
 

test/simulation/MultihostMulticoreComputeService/MultihostMulticoreComputeServiceTestPilotJobs.cpp

@@ -233,6 +233,11 @@ class MultihostMulticoreComputeServiceOnePilotJobNoTimeoutWaitForExpirationTestW
       // Create a pilot job that requires 1 host, 1 core per host, 0 bytes of RAM per host, and 1 hour
       wrench::PilotJob *pilot_job = job_manager->createPilotJob(this->workflow, 1, 1, 0, 3600);
 
+      std::string job_type_as_string = pilot_job->getTypeAsString();
+      if (job_type_as_string != "Pilot") {
+        throw std::runtime_error("Job type as string should be 'Pilot'");
+      }
+
       // Submit a pilot job
       try {
         job_manager->submitJob(pilot_job, this->test->compute_service);

test/simulation_message_constructors/MessageConstructorTest.cpp

@@ -12,7 +12,6 @@
 
 #include "wrench/workflow/Workflow.h"
 #include "../../src/wrench/services/file_registry/FileRegistryMessage.h"
-#include "../../src/wrench/services/compute/multihost_multicore/MulticoreComputeServiceMessage.h"
 #include "wrench/services/compute/ComputeServiceMessage.h"
 #include "../../src/wrench/services/storage/StorageServiceMessage.h"
 #include "../../src/wrench/services/compute/cloud/CloudServiceMessage.h"
@@ -161,13 +160,6 @@ TEST_F(MessageConstructorTest, ComputeServiceMessages) {
 
 }
 
-TEST_F(MessageConstructorTest, MulticoreComputeServiceMessages) {
-
-  EXPECT_NO_THROW(new wrench::MulticoreComputeServiceNotEnoughCoresMessage(workflow_job, compute_service, 666));
-  EXPECT_THROW(new wrench::MulticoreComputeServiceNotEnoughCoresMessage(nullptr, compute_service, 666), std::invalid_argument);
-  EXPECT_THROW(new wrench::MulticoreComputeServiceNotEnoughCoresMessage(workflow_job, nullptr, 666), std::invalid_argument);
-}
-
 
 TEST_F(MessageConstructorTest, CloudServiceMessages) {