From ee0fb0b917153966bd22a8ada8409d32eacc8a7e Mon Sep 17 00:00:00 2001 From: chsword Date: Mon, 28 Jun 2021 16:01:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=F0=9F=86=95=20clean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chsword.Excel2Object/ExcelImporter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chsword.Excel2Object/ExcelImporter.cs b/Chsword.Excel2Object/ExcelImporter.cs index af8f3b2..42bf66c 100644 --- a/Chsword.Excel2Object/ExcelImporter.cs +++ b/Chsword.Excel2Object/ExcelImporter.cs @@ -125,7 +125,7 @@ internal static IEnumerable> InternalExcelToDictionar return list; } - internal static IEnumerable InternalExcelToObject(IEnumerator result) + private static IEnumerable InternalExcelToObject(IEnumerator result) where TModel : class, new() { var dict = ExcelUtil.GetPropertiesAttributesDict(); From 3bde28ee1041d16a264b932f6fd6dbda7f9e3a9a Mon Sep 17 00:00:00 2001 From: chsword Date: Mon, 28 Jun 2021 16:13:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=F0=9F=86=95=20=E6=95=B4=E7=90=86Te?= =?UTF-8?q?st=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ExcelTest.cs => ExcelConvertTest.cs} | 2 +- Chsword.Excel2Object.Tests/ExcelIssue12Test.cs | 2 +- Chsword.Excel2Object.Tests/ExcelIssue16Test.cs | 1 + Chsword.Excel2Object.Tests/{ => Formula}/BaseFunctionTest.cs | 2 +- .../{ => Formula}/ExpressionConvertConditionTests.cs | 2 +- .../{ => Formula}/ExpressionConvertMathFunctionsTest.cs | 2 +- .../{ => Formula}/ExpressionConvertReferenceTests.cs | 2 +- .../{ => Formula}/ExpressionConvertStatisticsTests.cs | 2 +- .../{ => Formula}/ExpressionConvertSymbolTests.cs | 2 +- .../{ => Formula}/ExpressionConvertTest.cs | 2 +- .../{ => Formula}/ExpressionConvertTextTests.cs | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) rename Chsword.Excel2Object.Tests/{ExcelTest.cs => ExcelConvertTest.cs} (98%) rename Chsword.Excel2Object.Tests/{ => Formula}/BaseFunctionTest.cs (92%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertConditionTests.cs (87%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertMathFunctionsTest.cs (90%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertReferenceTests.cs (97%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertStatisticsTests.cs (91%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertSymbolTests.cs (98%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertTest.cs (98%) rename Chsword.Excel2Object.Tests/{ => Formula}/ExpressionConvertTextTests.cs (90%) diff --git a/Chsword.Excel2Object.Tests/ExcelTest.cs b/Chsword.Excel2Object.Tests/ExcelConvertTest.cs similarity index 98% rename from Chsword.Excel2Object.Tests/ExcelTest.cs rename to Chsword.Excel2Object.Tests/ExcelConvertTest.cs index d355bc7..61005cf 100644 --- a/Chsword.Excel2Object.Tests/ExcelTest.cs +++ b/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() diff --git a/Chsword.Excel2Object.Tests/ExcelIssue12Test.cs b/Chsword.Excel2Object.Tests/ExcelIssue12Test.cs index f6cf1c3..3f5652a 100644 --- a/Chsword.Excel2Object.Tests/ExcelIssue12Test.cs +++ b/Chsword.Excel2Object.Tests/ExcelIssue12Test.cs @@ -19,7 +19,7 @@ public void EmptyFirstProperty() var importer = new ExcelImporter(); var result = importer.ExcelToObject(bytes).ToList(); Console.WriteLine(result.FirstOrDefault()); - Assert.AreEqual(models.Count, result.Count()); + Assert.AreEqual(models.Count, result.Count); models.AreEqual(result); } diff --git a/Chsword.Excel2Object.Tests/ExcelIssue16Test.cs b/Chsword.Excel2Object.Tests/ExcelIssue16Test.cs index c505415..5ff6635 100644 --- a/Chsword.Excel2Object.Tests/ExcelIssue16Test.cs +++ b/Chsword.Excel2Object.Tests/ExcelIssue16Test.cs @@ -10,6 +10,7 @@ namespace Chsword.Excel2Object.Tests { /// /// for config and formula + /// https://github.com/chsword/Excel2Object/issues/16 /// [TestClass] public class ExcelIssue16Test : BaseExcelTest diff --git a/Chsword.Excel2Object.Tests/BaseFunctionTest.cs b/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs similarity index 92% rename from Chsword.Excel2Object.Tests/BaseFunctionTest.cs rename to Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs index b758edc..008420d 100644 --- a/Chsword.Excel2Object.Tests/BaseFunctionTest.cs +++ b/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs @@ -4,7 +4,7 @@ using Chsword.Excel2Object.Internal; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests +namespace Chsword.Excel2Object.Tests.Formula { public class BaseFunctionTest { diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertConditionTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs similarity index 87% rename from Chsword.Excel2Object.Tests/ExpressionConvertConditionTests.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs index 59cd941..c947876 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertConditionTests.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests +namespace Chsword.Excel2Object.Tests.Formula { [TestClass] public class ExpressionConvertConditionTests : BaseFunctionTest diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertMathFunctionsTest.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertMathFunctionsTest.cs similarity index 90% rename from Chsword.Excel2Object.Tests/ExpressionConvertMathFunctionsTest.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertMathFunctionsTest.cs index f7f0a64..813b30a 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertMathFunctionsTest.cs +++ b/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 diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertReferenceTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertReferenceTests.cs similarity index 97% rename from Chsword.Excel2Object.Tests/ExpressionConvertReferenceTests.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertReferenceTests.cs index e892982..a3c03cc 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertReferenceTests.cs +++ b/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 diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertStatisticsTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertStatisticsTests.cs similarity index 91% rename from Chsword.Excel2Object.Tests/ExpressionConvertStatisticsTests.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertStatisticsTests.cs index 347cab9..9dd4e5e 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertStatisticsTests.cs +++ b/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 diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertSymbolTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertSymbolTests.cs similarity index 98% rename from Chsword.Excel2Object.Tests/ExpressionConvertSymbolTests.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertSymbolTests.cs index 09f71ed..77dc43f 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertSymbolTests.cs +++ b/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 diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertTest.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs similarity index 98% rename from Chsword.Excel2Object.Tests/ExpressionConvertTest.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs index a337961..8d4ae74 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertTest.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs @@ -6,7 +6,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using static Chsword.Excel2Object.ExcelFunctions; -namespace Chsword.Excel2Object.Tests +namespace Chsword.Excel2Object.Tests.Formula { [TestClass] public class ExpressionConvertTests : BaseFunctionTest diff --git a/Chsword.Excel2Object.Tests/ExpressionConvertTextTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs similarity index 90% rename from Chsword.Excel2Object.Tests/ExpressionConvertTextTests.cs rename to Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs index ae039fc..c4052d3 100644 --- a/Chsword.Excel2Object.Tests/ExpressionConvertTextTests.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests +namespace Chsword.Excel2Object.Tests.Formula { [TestClass] public class ExpressionConvertTextTests : BaseFunctionTest From 4d75818ac76e701c71a5c1bb9521a68130363aa6 Mon Sep 17 00:00:00 2001 From: chsword Date: Mon, 28 Jun 2021 16:38:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=F0=9F=86=95=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs | 2 +- .../Formula/ExpressionConvertConditionTests.cs | 2 +- Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs | 2 +- .../Formula/ExpressionConvertTextTests.cs | 2 +- Chsword.Excel2Object/Functions/ColumnCellDictionary.cs | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs b/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs index 008420d..b758edc 100644 --- a/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs +++ b/Chsword.Excel2Object.Tests/Formula/BaseFunctionTest.cs @@ -4,7 +4,7 @@ using Chsword.Excel2Object.Internal; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests.Formula +namespace Chsword.Excel2Object.Tests { public class BaseFunctionTest { diff --git a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs index c947876..59cd941 100644 --- a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertConditionTests.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests.Formula +namespace Chsword.Excel2Object.Tests { [TestClass] public class ExpressionConvertConditionTests : BaseFunctionTest diff --git a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs index 8d4ae74..a337961 100644 --- a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTest.cs @@ -6,7 +6,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using static Chsword.Excel2Object.ExcelFunctions; -namespace Chsword.Excel2Object.Tests.Formula +namespace Chsword.Excel2Object.Tests { [TestClass] public class ExpressionConvertTests : BaseFunctionTest diff --git a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs index c4052d3..ae039fc 100644 --- a/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs +++ b/Chsword.Excel2Object.Tests/Formula/ExpressionConvertTextTests.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Chsword.Excel2Object.Tests.Formula +namespace Chsword.Excel2Object.Tests { [TestClass] public class ExpressionConvertTextTests : BaseFunctionTest diff --git a/Chsword.Excel2Object/Functions/ColumnCellDictionary.cs b/Chsword.Excel2Object/Functions/ColumnCellDictionary.cs index 40df676..ca9e3ed 100644 --- a/Chsword.Excel2Object/Functions/ColumnCellDictionary.cs +++ b/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(); } } \ No newline at end of file