Merge branch 'disambiguate-json' into 'master'

Disambiguate conversion from JSON to string values.

See merge request !109

smtk/simulation/ace3p/testing/cxx/TestAddJob.cxx

@@ -156,30 +156,42 @@ int TestAddJob(int, char*[])
 
   // read the Job Record and check that it matches
   {
-    smtkTest(job["job_id"] == project->jobData(0, "job_id"), "job_id wrong value");
-    smtkTest(job["job_name"] == project->jobData(0, "job_name"), "job_name wrong value");
-    smtkTest(job["machine"] == project->jobData(0, "machine"), "machine wrong value");
-    smtkTest(job["analysis_id"] == project->jobData(0, "analysis_id"), "analysis_id wrong value");
-    smtkTest(job["analysis"] == project->jobData(0, "analysis"), "analysis wrong value");
-    smtkTest(job["nodes"] == project->jobData(0, "nodes"), "nodes wrong value");
-    smtkTest(job["processes"] == project->jobData(0, "processes"), "processes wrong value");
     smtkTest(
-      job["elapsed_time"] == project->jobData(0, "elapsed_time"), "elapsed_time wrong value");
+      job["job_id"].get<std::string>() == project->jobData(0, "job_id"), "job_id wrong value");
     smtkTest(
-      job["submission_time"] == project->jobData(0, "submission_time"),
+      job["job_name"].get<std::string>() == project->jobData(0, "job_name"),
+      "job_name wrong value");
+    smtkTest(
+      job["machine"].get<std::string>() == project->jobData(0, "machine"), "machine wrong value");
+    smtkTest(
+      job["analysis_id"].get<std::string>() == project->jobData(0, "analysis_id"),
+      "analysis_id wrong value");
+    smtkTest(
+      job["analysis"].get<std::string>() == project->jobData(0, "analysis"),
+      "analysis wrong value");
+    smtkTest(job["nodes"].get<std::string>() == project->jobData(0, "nodes"), "nodes wrong value");
+    smtkTest(
+      job["processes"].get<std::string>() == project->jobData(0, "processes"),
+      "processes wrong value");
+    smtkTest(
+      job["elapsed_time"].get<std::string>() == project->jobData(0, "elapsed_time"),
+      "elapsed_time wrong value");
+    smtkTest(
+      job["submission_time"].get<std::string>() == project->jobData(0, "submission_time"),
       "submission_time wrong value");
-    smtkTest(job["notes"] == project->jobData(0, "notes"), "notes wrong value");
+    smtkTest(job["notes"].get<std::string>() == project->jobData(0, "notes"), "notes wrong value");
     smtkTest(
-      job["runtime_job_folder"] == project->jobData(0, "runtime_job_folder"),
+      job["runtime_job_folder"].get<std::string>() == project->jobData(0, "runtime_job_folder"),
       "runtime_job_folder wrong value");
     smtkTest(
-      job["runtime_input_folder"] == project->jobData(0, "runtime_input_folder"),
+      job["runtime_input_folder"].get<std::string>() == project->jobData(0, "runtime_input_folder"),
       "runtime_input_folder wrong value");
     smtkTest(
-      job["runtime_mesh_filename"] == project->jobData(0, "runtime_mesh_filename"),
+      job["runtime_mesh_filename"].get<std::string>() ==
+        project->jobData(0, "runtime_mesh_filename"),
       "runtime_mesh_filename wrong value");
     smtkTest(
-      job["results_subfolder"] == project->jobData(0, "results_subfolder"),
+      job["results_subfolder"].get<std::string>() == project->jobData(0, "results_subfolder"),
       "results_subfolder wrong value");
   }