Merge branch 'slicer-issue-2712-support-parameter-file-with-empty-value'

* slicer-issue-2712-support-parameter-file-with-empty-value:
  BUG: Support parameter file with empty value

Author: jcfr

ModuleDescriptionParser/ModuleDescription.cxx

@@ -316,11 +316,14 @@ bool ModuleDescription ::ReadParameterFile(const std::string& filename)
 
     std::string::size_type start = line.find_first_not_of(" \t");
     std::string::size_type stop = line.find_first_of("=", start);
-    
+
     key = line.substr(start, stop-start);
     start = line.find_first_not_of(" \t", stop+1);
-    value = line.substr(start, line.length() - start + 1);
-    
+    if (start != std::string::npos)
+      {
+      value = line.substr(start, line.length() - start + 1);
+      }
+
     trimLeadingAndTrailing(key);
     trimLeadingAndTrailing(value);
 

ModuleDescriptionParser/Testing/CMakeLists.txt

@@ -1,18 +1,17 @@
-project(ModuleDescriptionParserTesting)
 
-#-----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8.2)
-#-----------------------------------------------------------------------------
+# --------------------------------------------------------------------------
+set(INPUT ${CMAKE_CURRENT_SOURCE_DIR}/TestData)
+
+# --------------------------------------------------------------------------
+# Build tests
+# --------------------------------------------------------------------------
+set(KIT ${PROJECT_NAME})
+create_test_sourcelist(Tests ${KIT}CxxTests.cxx
+  ModuleDescriptionTest.cxx
+  )
 
-#-----------------------------------------------------------------------------
-# See http://cmake.org/cmake/help/cmake-2-8-docs.html#section_Policies for details
-#-----------------------------------------------------------------------------
-if(POLICY CMP0016)
-  cmake_policy(SET CMP0016 NEW)
-endif()
-if(POLICY CMP0017)
-  cmake_policy(SET CMP0017 OLD)
-endif()
+add_executable(${KIT}CxxTests ${Tests})
+target_link_libraries(${KIT}CxxTests ${KIT})
 
 # --------------------------------------------------------------------------
 # Build Parser1Test executable
@@ -45,6 +44,11 @@ add_test(
   NAME Parser1Test2
   COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:Parser1Test> ${TEST_DATA}/ParserTest2.xml)
 
+add_test(
+  NAME ModuleDescriptionTest
+  COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ModuleDescriptionTest ${INPUT}
+  )
+
 #add_test(
 #  NAME ModuleFactoryTest
 #  COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:ModuleFactoryTest>

ModuleDescriptionParser/Testing/ModuleDescriptionTest.cxx

@@ -0,0 +1,101 @@
+
+// ModuleDescriptionParser includes
+#include "ModuleDescription.h"
+
+// STD includes
+#include <cstdlib>
+#include <string>
+
+//---------------------------------------------------------------------------
+bool TestReadParameterFileWithMissingValue();
+
+//---------------------------------------------------------------------------
+namespace
+{
+  std::string INPUT_DIR;
+}
+
+//---------------------------------------------------------------------------
+int ModuleDescriptionTest(int argc, char * argv[])
+{
+  if (argc < 2)
+    {
+    std::cout << "Usage: " << argv[0] << " /path/to/inputs" << std::endl;
+    return EXIT_FAILURE;
+    }
+
+  INPUT_DIR = std::string(argv[1]);
+
+  if (!TestReadParameterFileWithMissingValue())
+    {
+    return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}
+
+//---------------------------------------------------------------------------
+bool TestReadParameterFileWithMissingValue()
+{
+  std::string input = INPUT_DIR
+      + "/parameter-file-with-missing-value-slicer-issue2712.params";
+
+  ModuleParameterGroup group;
+
+  {
+    ModuleParameter parameter;
+    parameter.SetName("OutputLabel");
+    group.AddParameter(parameter);
+  }
+
+  {
+    ModuleParameter parameter;
+    parameter.SetName("SUVMean");
+    group.AddParameter(parameter);
+  }
+
+  ModuleDescription desc;
+  desc.AddParameterGroup(group);
+
+  if (!desc.HasParameter("OutputLabel") || !desc.HasParameter("SUVMean"))
+    {
+    std::cerr << "Line " << __LINE__
+              << " - Parameters are expected."
+              << std::endl;
+    return false;
+    }
+
+  if (!desc.ReadParameterFile(input))
+    {
+    std::cerr << "Line " << __LINE__
+              << " - 'SUVMean' set to a new value. Modification are expected."
+              << std::endl;
+    return false;
+    }
+
+  if (!desc.HasParameter("OutputLabel") || !desc.HasParameter("SUVMean"))
+    {
+    std::cerr << "Line " << __LINE__
+              << " - Problem reading parameters - Parameters are expected."
+              << std::endl;
+    return false;
+    }
+
+  if (desc.GetParameterDefaultValue("OutputLabel") != "")
+    {
+    std::cerr << "Line " << __LINE__
+              << " - Problem reading parameters - Value is expected to be empty."
+              << std::endl;
+    return false;
+    }
+
+  if (desc.GetParameterDefaultValue("SUVMean") != "2")
+    {
+    std::cerr << "Line " << __LINE__
+              << " - Problem reading parameters - Value is expected to be '2'."
+              << std::endl;
+    return false;
+    }
+
+  return true;
+}

ModuleDescriptionParser/Testing/TestData/parameter-file-with-missing-value-slicer-issue2712.params

@@ -0,0 +1,2 @@
+OutputLabel = 
+SUVMean = 2