Function & Formula support Dynamic

Chsword.Excel2Object.Tests/ExcelTest.cs → Chsword.Excel2Object.Tests/ExcelConvertTest.cs

@@ -10,7 +10,7 @@
 namespace Chsword.Excel2Object.Tests
 {
     [TestClass]
-    public class ExcelTest : BaseExcelTest
+    public class ExcelConvertTest : BaseExcelTest
     {
         [TestMethod]
         public void ConvertXlsBytesTest()

Chsword.Excel2Object.Tests/ExcelIssue12Test.cs

@@ -19,7 +19,7 @@ public void EmptyFirstProperty()
             var importer = new ExcelImporter();
             var result = importer.ExcelToObject<ReportModel>(bytes).ToList();
             Console.WriteLine(result.FirstOrDefault());
-            Assert.AreEqual(models.Count, result.Count());
+            Assert.AreEqual(models.Count, result.Count);
             models.AreEqual(result);
         }
 

Chsword.Excel2Object.Tests/ExcelIssue16Test.cs

@@ -10,6 +10,7 @@ namespace Chsword.Excel2Object.Tests
 {
     /// <summary>
     /// for config and formula
+    /// https://github.com/chsword/Excel2Object/issues/16
     /// </summary>
     [TestClass]
     public class ExcelIssue16Test : BaseExcelTest

Chsword.Excel2Object.Tests/ExpressionConvertMathFunctionsTest.cs → Chsword.Excel2Object.Tests/Formula/ExpressionConvertMathFunctionsTest.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Chsword.Excel2Object.Tests
+namespace Chsword.Excel2Object.Tests.Formula
 {
     [TestClass]
     public class ExpressionConvertMathFunctionsTests : BaseFunctionTest

Chsword.Excel2Object.Tests/ExpressionConvertReferenceTests.cs → Chsword.Excel2Object.Tests/Formula/ExpressionConvertReferenceTests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Chsword.Excel2Object.Tests
+namespace Chsword.Excel2Object.Tests.Formula
 {
     [TestClass]
     public class ExpressionConvertReferenceTests : BaseFunctionTest

Chsword.Excel2Object.Tests/ExpressionConvertStatisticsTests.cs → Chsword.Excel2Object.Tests/Formula/ExpressionConvertStatisticsTests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Chsword.Excel2Object.Tests
+namespace Chsword.Excel2Object.Tests.Formula
 {
     [TestClass]
     public class ExpressionConvertStatisticsTests : BaseFunctionTest

Chsword.Excel2Object.Tests/ExpressionConvertSymbolTests.cs → Chsword.Excel2Object.Tests/Formula/ExpressionConvertSymbolTests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Chsword.Excel2Object.Tests
+namespace Chsword.Excel2Object.Tests.Formula
 {
     [TestClass]
     public class ExpressionConvertSymbolTests : BaseFunctionTest

Chsword.Excel2Object/ExcelImporter.cs

@@ -125,7 +125,7 @@ internal static IEnumerable<Dictionary<string, object>> InternalExcelToDictionar
             return list;
         }
 
-        internal static IEnumerable<TModel> InternalExcelToObject<TModel>(IEnumerator result)
+        private static IEnumerable<TModel> InternalExcelToObject<TModel>(IEnumerator result)
             where TModel : class, new()
         {
             var dict = ExcelUtil.GetPropertiesAttributesDict<TModel>();

Chsword.Excel2Object/Functions/ColumnCellDictionary.cs

@@ -11,5 +11,7 @@ public ColumnMatrix Matrix(string keyA, int rowA, string keyB, int rowB)
         {
             throw new NotImplementedException();
         }
+
+        public dynamic Model => throw new NotImplementedException();
     }
 }