Fixes #1949 data importer parsing unit should be case insensitive

SolutionInfo.cs

@@ -1,6 +1,7 @@
-using System.Runtime.CompilerServices;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+
 [assembly: AssemblyCompany("Open Systems Pharmacology Community")]
 [assembly: AssemblyProduct("OSPSuite.Core")]
 [assembly: AssemblyCopyright("Copyright � 2017 - present - Open Systems Pharmacology Community")]
@@ -9,4 +10,4 @@
 [assembly: InternalsVisibleTo("OSPSuite.UI.Tests")]
 [assembly: InternalsVisibleTo("OSPSuite.Presentation.Tests")]
 [assembly: InternalsVisibleTo("OSPSuite.R.Tests")]
-[assembly: InternalsVisibleTo("OSPSuite.Core.IntegrationTests")]
+[assembly: InternalsVisibleTo("OSPSuite.Core.IntegrationTests")]

src/OSPSuite.Core/Import/ImporterConfiguration.cs

@@ -1,6 +1,6 @@
-using OSPSuite.Core.Domain;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using OSPSuite.Core.Domain;
 
 namespace OSPSuite.Core.Import
 {
@@ -15,7 +15,12 @@ public void CloneParametersFrom(IReadOnlyList<DataFormatParameter> parameters)
       {
          _parameters = new List<DataFormatParameter>(parameters);
       }
-      public void AddParameter(DataFormatParameter parameter) { _parameters.Add(parameter); }
+
+      public void AddParameter(DataFormatParameter parameter)
+      {
+         _parameters.Add(parameter);
+      }
+
       public IReadOnlyList<string> LoadedSheets => _loadedSheets.ToList();
       public string FileName { get; set; }
       public string NamingConventions { get; set; }
@@ -31,4 +36,4 @@ public void RemoveParameter(DataFormatParameter element)
          _parameters.Remove(element);
       }
    }
-}
+}

src/OSPSuite.Infrastructure.Import/Core/BaseGridColumnNotFoundException.cs

@@ -8,4 +8,4 @@ public BaseGridColumnNotFoundException(string columnName) : base(Error.BaseGridC
       {
       }
    }
-}
+}

src/OSPSuite.Infrastructure.Import/Core/ColumnNotFoundException.cs

@@ -8,4 +8,4 @@ public ColumnNotFoundException(string columnName) : base(Error.ColumnNotFound(co
       {
       }
    }
-}
+}

src/OSPSuite.Infrastructure.Import/Core/DataFormat/AbstractColumnsDataFormat.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.UnitSystem;
@@ -76,7 +75,7 @@ private void setDimensionsForMappings(ColumnInfoCache columnInfos)
             else
             {
                var supportedDimensions = concreteColumnInfo.SupportedDimensions;
-               var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.HasUnit(mappedColumn.Unit.SelectedUnit));
+               var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.SupportsUnit(mappedColumn.Unit.SelectedUnit, ignoreCase: true));
 
                if (dimensionForUnit == null)
                   mappedColumn.Unit = new UnitDescription(UnitDescription.InvalidUnit);
@@ -159,7 +158,12 @@ protected virtual void ExtractQualifiedHeadings(List<string> keys, List<string>
 
       protected string ValidateUnit(string unit, IReadOnlyList<IDimension> supportedDimensions)
       {
-         return supportedDimensions.Any(x => x.HasUnit(unit)) ? unit : UnitDescription.InvalidUnit;
+         var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.SupportsUnit(unit, ignoreCase: true));
+         if (dimensionForUnit == null)
+            return UnitDescription.InvalidUnit;
+
+         //We know it exists here as it was found previously
+         return dimensionForUnit.FindUnit(unit, ignoreCase: true).Name;
       }
 
       protected virtual void ExtractNonQualifiedHeadings(List<string> keys, List<string> missingKeys, Cache<string, ColumnInfo> columnInfos,
@@ -277,7 +281,7 @@ private Dictionary<ExtendedColumn, IList<SimulationPoint>> parseMappings(IEnumer
             if (currentParameter == null) continue;
             Func<MappingDataFormatParameter, DataSheet, UnformattedRow, SimulationPoint> mappingsParser =
                currentParameter.MappedColumn.LloqColumn == null
-                  ? (Func<MappingDataFormatParameter, DataSheet, UnformattedRow, SimulationPoint>)parseMappingOnSameColumn
+                  ? (Func<MappingDataFormatParameter, DataSheet, UnformattedRow, SimulationPoint>) parseMappingOnSameColumn
                   : parseMappingOnSameGivenColumn;
 
             dictionary.Add

src/OSPSuite.Infrastructure.Import/Core/DataSheet.cs

@@ -11,6 +11,7 @@ public class UnformattedRow
    {
       public int Index { get; private set; }
       public IEnumerable<string> Data { get; private set; }
+
       public UnformattedRow(int index, IEnumerable<string> data)
       {
          Index = index;
@@ -21,7 +22,7 @@ public UnformattedRow(int index, IEnumerable<string> data)
    public class DataSheet
    {
       private readonly List<List<string>> _rawDataTable = new List<List<string>>();
-      private List<string> _emptyColumns = new List<string>();
+      private readonly List<string> _emptyColumns = new List<string>();
 
       protected Cache<string, ColumnDescription> _headers =
          new Cache<string, ColumnDescription>(); //we have to ensure headers and RawSheetData sizes match
@@ -33,6 +34,7 @@ public DataSheet(DataSheet reference)
          {
             _headers.Add(header, reference.GetColumnDescription(header));
          }
+
          _rawDataTable = new List<List<string>>();
          SheetName = reference.SheetName;
       }
@@ -57,6 +59,7 @@ public void AddColumn(string columnName, int columnIndex) //it seems to me there
             columnName = Guid.NewGuid().ToString();
             _emptyColumns.Add(columnName);
          }
+
          _headers.Add(columnName, new ColumnDescription(columnIndex));
       }
 
@@ -69,15 +72,16 @@ public void CalculateColumnDescription(List<ColumnDescription.MeasurementLevel>
          });
       }
 
-      public void AddRow( IEnumerable<string> row)
+      public void AddRow(IEnumerable<string> row)
       {
          var rowList = row.ToList();
 
          if (_headers.Count > rowList.Count)
          {
-            for ( var i = rowList.Count; i < _headers.Count; i++  )
+            for (var i = rowList.Count; i < _headers.Count; i++)
                rowList.Add("");
          }
+
          if (rowList.Count > _headers.Count)
          {
             rowList = rowList.GetRange(0, _headers.Count);
@@ -105,7 +109,7 @@ public virtual IEnumerable<UnformattedRow> GetRows(Func<IEnumerable<string>, boo
       public DataTable ToDataTable()
       {
          var resultTable = new DataTable();
-         var indexList = _headers.Select( h => h.Index);
+         var indexList = _headers.Select(h => h.Index);
 
          // Add columns.
          foreach (var header in _headers.Keys)
@@ -163,14 +167,15 @@ public void RemoveEmptyColumns()
             {
                header.DecrementIndex();
             }
+
             _headers.Remove(headerName);
             _rawDataTable.ForEach(row => row.RemoveAt(index));
          }
       }
 
       public void RemoveEmptyRows()
       {
-         for (var i = _rawDataTable.Count -1; i >= 0; i--)
+         for (var i = _rawDataTable.Count - 1; i >= 0; i--)
          {
             if (_rawDataTable[i].All(x => x.IsNullOrEmpty()))
                _rawDataTable.RemoveAt(i);

src/OSPSuite.Infrastructure.Import/Core/DataSheetCollection.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -68,17 +67,19 @@ public DataSheetCollection Filter(string filter)
             {
                ds.AddRow(drv.Row.ItemArray.Select(c => c.ToString()));
             }
+
             filteredDataSheets.AddSheet(ds);
          }
 
          return filteredDataSheets;
       }
 
-      public void CopySheetsFrom (DataSheetCollection dataSheetsToCopy)
+      public void CopySheetsFrom(DataSheetCollection dataSheetsToCopy)
       {
          Clear();
          _dataSheets.AddRange(dataSheetsToCopy._dataSheets);
       }
+
       public Cache<string, IDataSet> GetDataSets(IDataFormat format, ColumnInfoCache columnInfos)
       {
          var dataSets = new Cache<string, IDataSet>();