Merge branch 'master' into gather-unmapped-cells

Author: mrworkman

.gitignore

@@ -8,3 +8,7 @@ LinqToExcel.xml
 *.zip
 *.nupkg
 src/packages/
+*.DotSettings.user
+*.csproj.user
+.vs/
+

README.md

@@ -1,4 +1,5 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/vdbhqae4b2h86k96?svg=true)](https://ci.appveyor.com/project/mrworkman/linqtoexcel)
+[![Open Source Helpers](https://www.codetriage.com/paulyoder/linqtoexcel/badges/users.svg)](https://www.codetriage.com/paulyoder/linqtoexcel)
 
 # Welcome to the LinqToExcel project
 

src/LinqToExcel.Tests/ColumnMappings_IntegrationTests.cs

@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using System.IO;
 using log4net.Core;
-using System.Data.OleDb;
 
 namespace LinqToExcel.Tests
 {
@@ -139,5 +138,19 @@ public void annotated_properties_map_to_columns()
             Assert.AreEqual(new DateTime(1988, 7, 26), rival.StartDate, "StartDate");
             Assert.AreEqual("N", rival.IsActive, "IsActive");
         }
+
+        [Test]
+        public void two_transformations_with_the_same_property_but_in_different_types()
+        {
+            _repo.AddTransformation<Transformation1>(x => x.Value, x => x);
+            _repo.AddTransformation<Transformation2>(x => x.Value, x => x);
+
+            var value1 = _repo.Worksheet<Transformation1>("Transformation1").First().Value;
+            var value2 = _repo.Worksheet<Transformation2>("Transformation2").First().Value;
+
+            Assert.AreEqual(1, value1);
+            Assert.AreEqual("some different value", value2);
+        }
+
     }
 }

src/LinqToExcel.Tests/ConfiguredWorksheetName_IntegrationTests.cs

@@ -50,7 +50,7 @@ public void worksheetIndex_of_2_uses_third_table_name_orderedby_name()
         [Test]
         public void worksheetIndex_too_high_throws_exception()
         {
-            Assert.That(() => from c in ExcelQueryFactory.Worksheet<Company>(8, _excelFileName, new LogManagerFactory())
+            Assert.That(() => from c in ExcelQueryFactory.Worksheet<Company>(100, _excelFileName, new LogManagerFactory())
                               select c,
             Throws.TypeOf<DataException>());
         }

src/LinqToExcel.Tests/ExcelFiles/Companies.xls

@@ -80,8 +80,9 @@ public void GetWorksheetNames_returns_worksheet_names()
 
             var worksheetNames = excel.GetWorksheetNames();
             Assert.AreEqual(
-                "ColumnMappings, IMEX Table, Invalid Cast, More Companies, Null Dates, Range1, Sheet1, TrimSpaces",
-                string.Join(", ", worksheetNames.ToArray()));
+                "ColumnMappings, IMEX Table, Invalid Cast, More Companies, Null Dates, Range1, Sheet1, Transformation1, Transformation2, TrimSpaces",
+                string.Join(", ", worksheetNames.ToArray())
+            );
         }
 
         [Test]

src/LinqToExcel.Tests/ExcelFiles/WorksheetNames.xlsx

@@ -120,7 +120,9 @@
     <Compile Include="Row_IntegrationTests.cs" />
     <Compile Include="Row_SQLStatement_UnitTests.cs" />
     <Compile Include="SQLLogStatements_Helper.cs" />
+    <Compile Include="Transformations.cs" />
     <Compile Include="UnSupportedMethods.cs" />
+    <Compile Include="WorkSheetNameTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LinqToExcel\LinqToExcel.csproj">
@@ -156,6 +158,9 @@
     <None Include="ExcelFiles\NoHeader.xls">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ExcelFiles\WorksheetNames.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="LinqToExcel.Tests.snk" />
     <None Include="packages.config" />
   </ItemGroup>

src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs

@@ -0,0 +1,12 @@
+namespace LinqToExcel.Tests
+{
+    public class Transformation1
+    {
+        public int Value { get; set; }
+    }
+
+    public class Transformation2
+    {
+        public string Value { get; set; }
+    }
+}

src/LinqToExcel.Tests/LinqToExcel.Tests.csproj

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using NUnit.Framework;
+
+namespace LinqToExcel.Tests {
+
+   [Author("Paul Yoder", "paulyoder@gmail.com")]
+   [Category("Integration")]
+   [TestFixture]
+   public class WorkSheetNameTests {
+      private String _filesDirectory;
+
+      [OneTimeSetUp]
+      public void Setup() {
+         var testDirectory = AppDomain.CurrentDomain.BaseDirectory;
+         _filesDirectory = Path.Combine(testDirectory, "ExcelFiles");
+      }
+
+      [Test]
+      public void WorkSheetNamesAreDecodedCorrectly() {
+         var fileName = Path.Combine(_filesDirectory, "WorksheetNames.xlsx");
+
+         var workbook = new ExcelQueryFactory(fileName, new LogManagerFactory());
+         var worksheetNames = workbook.GetWorksheetNames();
+
+         CollectionAssert.AreEqual(
+            new [] {
+               " ' ",
+               "$woot$",
+               "Emb$dded",
+               "Ends with $'\"",
+               "Ends with a $",
+               "Has a $ in it"
+            },
+            worksheetNames
+         );
+      }
+   }
+}