重整程式碼

maxzh1999tw · Jan 15, 2024 · 2f78379 · 2f78379
1 parent d1f22f5
commit 2f78379
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 61 deletions.
diff --git a/Excely.ClosedXML.UnitTests/Models/SimpleClass.cs b/Excely.ClosedXML.UnitTests/Models/SimpleClass.cs
@@ -1,10 +1,10 @@
 namespace Excely.ClosedXML.UnitTests.Models
 {
-	internal class SimpleClass
-	{
-		public int IntValue { get; set; }
-		public string StrigValue { get; set; } = "";
-		public DateTime DateTimeValue { get; set; }
-		public SampleEnum EnumValue { get; set; }
-	}
+    internal class SimpleClass
+    {
+        public int IntValue { get; set; }
+        public string StrigValue { get; set; } = "";
+        public DateTime DateTimeValue { get; set; }
+        public SampleEnum EnumValue { get; set; }
+    }
 }
diff --git a/Excely.ClosedXML.UnitTests/XlsxTableConverterTests.cs b/Excely.ClosedXML.UnitTests/XlsxTableConverterTests.cs
@@ -3,31 +3,31 @@
 
 namespace Excely.ClosedXML.UnitTests
 {
-	[TestClass]
-	public class XlsxTableConverterTests
-	{
-		/// <summary>
-		/// 確保 ClosedXML 在處理字串時不會自動轉型為數字
-		/// </summary>
-		[TestMethod]
-		public void ConvertPaddingStartWith0Data_ShouldReturnExcelWithCurrectData()
-		{
-			// Arrange
-			using var workbook = new XLWorkbook();
-			var worksheet = workbook.AddWorksheet("sheet1");
+    [TestClass]
+    public class XlsxTableConverterTests
+    {
+        /// <summary>
+        /// 確保 ClosedXML 在處理字串時不會自動轉型為數字
+        /// </summary>
+        [TestMethod]
+        public void ConvertPaddingStartWith0Data_ShouldReturnExcelWithCurrectData()
+        {
+            // Arrange
+            using var workbook = new XLWorkbook();
+            var worksheet = workbook.AddWorksheet("sheet1");
 
-			var converter = new XlsxTableConverter(worksheet);
-			var table = new ExcelyTable(new List<IList<object?>>
-			{
-				new List<object?> { "Name", "No" },
-				new List<object?> { "John", "01" },
-			});
+            var converter = new XlsxTableConverter(worksheet);
+            var table = new ExcelyTable(new List<IList<object?>>
+            {
+                new List<object?> { "Name", "No" },
+                new List<object?> { "John", "01" },
+            });
 
-			// Act
-			converter.ConvertFrom(table);
+            // Act
+            converter.ConvertFrom(table);
 
-			// Assert
-			Assert.AreEqual("01", worksheet.Cell(2,2).Value.ToString());
-		}
-	}
+            // Assert
+            Assert.AreEqual("01", worksheet.Cell(2, 2).Value.ToString());
+        }
+    }
 }
diff --git a/Excely.ClosedXML/Shaders/TableThemeShader.cs b/Excely.ClosedXML/Shaders/TableThemeShader.cs
@@ -46,7 +46,7 @@ public TableThemeShader(int tableWidth, int tableHeight)
         protected override void ExcuteOnWorksheet(IXLWorksheet worksheet)
         {
             var tableWidth = TableWidth;
-            if(TableWidth == 0)
+            if (TableWidth == 0)
             {
                 tableWidth = worksheet.LastColumnUsed().ColumnNumber();
             }

diff --git a/Excely.ClosedXML/Workflows/XlsxExporterExtension.cs b/Excely.ClosedXML/Workflows/XlsxExporterExtension.cs
@@ -1,6 +1,5 @@
 using ClosedXML.Excel;
 using Excely.ClosedXML.TableConverters;
-using Excely.Workflows;
 
 namespace Excely.Workflows
 {

diff --git a/Excely.ClosedXML/Workflows/XlsxImporter.cs b/Excely.ClosedXML/Workflows/XlsxImporter.cs
@@ -1,6 +1,5 @@
 using ClosedXML.Excel;
 using Excely.ClosedXML.TableFactories;
-using Excely.Workflows;
 
 namespace Excely.Workflows
 {

diff --git a/Excely.UnitTests/CsvStringTableConverterTests.cs b/Excely.UnitTests/CsvStringTableConverterTests.cs
@@ -1,10 +1,5 @@
-using Excely.TableFactories;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Excely.TableConverters;
 using System.Text;
-using System.Threading.Tasks;
-using Excely.TableConverters;
 
 namespace Excely.UnitTests
 {
@@ -28,7 +23,7 @@ public void ConvertFrom_ConvertToStringWithSimpleData_ShouldReturnCorrectCsvStri
 
             // Assert
             Assert.AreEqual(
-                $"Name,Surname,Age{Environment.NewLine}John,Doe,30{Environment.NewLine}Jane,Doe,", 
+                $"Name,Surname,Age{Environment.NewLine}John,Doe,30{Environment.NewLine}Jane,Doe,",
                 csvString);
         }
 

diff --git a/Excely.UnitTests/DictionaryListTableFactoryTests.cs b/Excely.UnitTests/DictionaryListTableFactoryTests.cs
@@ -11,12 +11,12 @@ public void GetTable_WithDefaultOptions_ShouldIncludeAllPropertiesWithSchema()
             // Arrange
             var factory = new DictionaryListTableFactory();
             var testData = new List<Dictionary<string, object?>>
-            { 
-                new Dictionary<string, object?> 
-                { 
-                    { "Id", 1 }, 
-                    { "Name", "Alice" } 
-                } 
+            {
+                new Dictionary<string, object?>
+                {
+                    { "Id", 1 },
+                    { "Name", "Alice" }
+                }
             };
 
             // Act

diff --git a/Excely/TableConverters/ClassListTableConverter.cs b/Excely/TableConverters/ClassListTableConverter.cs
@@ -110,7 +110,7 @@ private IEnumerable<TClass> ImportInternal(ExcelyTable table, Func<PropertyInfo,
                                 {
                                     value = typeConverter.ConvertFrom(value);
                                 }
-                                else if (value is IConvertible && 
+                                else if (value is IConvertible &&
                                     property.PropertyType.GetInterface(nameof(IConvertible)) != null) // 嘗試強制轉型
                                 {
                                     try

diff --git a/Excely/TableConverters/DictionaryListTableConverter.cs b/Excely/TableConverters/DictionaryListTableConverter.cs
@@ -1,7 +1,4 @@
-using System.Formats.Asn1;
-using System.Reflection;
-
-namespace Excely.TableConverters
+namespace Excely.TableConverters
 {
     /// <summary>
     /// 將 Table 轉換為字典列表。

diff --git a/Excely/TableFactories/ClassListTableFactory.cs b/Excely/TableFactories/ClassListTableFactory.cs
@@ -24,7 +24,7 @@ public ClassListTableFactory(ClassListTableFactoryOptions<TClass> options)
 
         public ExcelyTable GetTable(IEnumerable<TClass> sourceData)
         {
-            if(sourceData == null) throw new ArgumentNullException(nameof(sourceData));
+            if (sourceData == null) throw new ArgumentNullException(nameof(sourceData));
 
             // 取得要匯出的 Properties
             var properties = typeof(TClass).GetProperties();

diff --git a/Excely/TableFactories/CsvStringTableFactory.cs b/Excely/TableFactories/CsvStringTableFactory.cs
@@ -75,7 +75,7 @@ public ExcelyTable GetTable(string sourceData)
                             isInQuotes = false;
                         }
                     }
-                    
+
                     // 其餘字元一律視為文字
                     else
                     {
@@ -136,20 +136,21 @@ public ExcelyTable GetTable(string sourceData)
             }
 
             // 刪除空行
-            if(result.Any(row => row.Count > 1))
+            if (result.Any(row => row.Count > 1))
             {
                 result = result.Where(x => x.Count != 1).ToList();
             }
 
             return new ExcelyTable(result.Where(x => x.Any()).ToArray());
         }
 
-        private static void SaveColumn(List<object?> row, StringBuilder colBuilder) {
+        private static void SaveColumn(List<object?> row, StringBuilder colBuilder)
+        {
             row.Add(colBuilder.ToString());
             colBuilder.Clear();
         }
 
-        private static void SaveRow(List<IList<object?>> result, ref List<object?> row) 
+        private static void SaveRow(List<IList<object?>> result, ref List<object?> row)
         {
             result.Add(row);
             row = new List<object?>();

diff --git a/Excely/TableFactories/DictionaryListTableFactory.cs b/Excely/TableFactories/DictionaryListTableFactory.cs
@@ -1,7 +1,4 @@
-using System.Formats.Asn1;
-using System.Reflection;
-
-namespace Excely.TableFactories
+namespace Excely.TableFactories
 {
     /// <summary>
     /// 提供以字典 Key 為欄位，將字典集合傾印至表格的功能。