Make test pass again by removing unused variable obsData and making s…

…ure xml files are valid files
Open-Systems-Pharmacology · Aug 26, 2021 · 9936fd4 · 9936fd4
1 parent c5e514d
commit 9936fd4
Show file tree

Hide file tree

Showing 6 changed files with 265 additions and 266 deletions.
diff --git a/tests/data/dataImporterConfiguration.xml b/tests/data/dataImporterConfiguration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImporterConfiguration fileName="D:\Work\OSPS\Repos\esqlabsR\tests\data\CompiledDataSet.xlsx">
+<ImporterConfiguration fileName="D:\Work\OSPS\Repos\esqlabsR\tests\data\CompiledDataSet.xlsx" version="15">
   <Parameters>
     <MappingDataFormatParameter columnName="Time [h]">
       <MappedColumn name="Time" dimension="Time">

diff --git a/tests/data/dataImporterConfiguration_UnitFromColumn.xml b/tests/data/dataImporterConfiguration_UnitFromColumn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx" namingConventions="{Source}.{Sheet}.{Study Id}.{Organ}.{Compartment}.{Species}.{Gender}.{Molecule}.{Route}.{Molecular Weight}.{Subject Id}.{Dose}.{Group Id}">
+<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx" namingConventions="{Source}.{Sheet}.{Study Id}.{Organ}.{Compartment}.{Species}.{Gender}.{Molecule}.{Route}.{Molecular Weight}.{Subject Id}.{Dose}.{Group Id}" version="15">
   <Parameters>
     <MappingDataFormatParameter columnName="Time [h]">
       <MappedColumn name="Time">

diff --git a/tests/data/dataImporterConfiguration_emptyEntries.xml b/tests/data/dataImporterConfiguration_emptyEntries.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx" namingConventions="{Source}.{Sheet}.{Study Id}.{Organ}.{Compartment}.{Species}.{Gender}.{Molecule}.{Route}.{Molecular Weight}.{Subject Id}.{Dose}.{Group Id}">
+<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx" namingConventions="{Source}.{Sheet}.{Study Id}.{Organ}.{Compartment}.{Species}.{Gender}.{Molecule}.{Route}.{Molecular Weight}.{Subject Id}.{Dose}.{Group Id}" version="15">
   <Parameters>
     <MappingDataFormatParameter columnName="Time [h]">
       <MappedColumn name="Time">

diff --git a/tests/data/dataImporterConfiguration_geoStd.xml b/tests/data/dataImporterConfiguration_geoStd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx">
+<ImporterConfiguration fileName="D:\Work\OSPS\Repos\OSPSuite-R\tests\data\CompiledDataSet.xlsx" version="15">
   <Parameters>
     <MappingDataFormatParameter columnName="Time [h]">
       <MappedColumn name="Time" dimension="Time">

diff --git a/tests/data/dataImporterConfiguration_manual.xml b/tests/data/dataImporterConfiguration_manual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImporterConfiguration fileName="D:\Work\OSPS\Repos\esqlabsR\tests\data\CompiledDataSet.xlsx">
+<ImporterConfiguration fileName="D:\Work\OSPS\Repos\esqlabsR\tests\data\CompiledDataSet.xlsx" version="15">
   <Parameters>
     <MappingDataFormatParameter columnName="Time [h]">
       <MappedColumn name="Time" dimension="Time">