Skip to content

Commit cccfbae

Browse files
chswordchsword
committed
refactor: 💡 only refactor
1 parent 255fc76 commit cccfbae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2145
-2324
lines changed

‎Chsword.Excel2Object.Tests/BaseExcelTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
using System;
22
using System.IO;
33

4-
namespace Chsword.Excel2Object.Tests
4+
namespace Chsword.Excel2Object.Tests;
5+
6+
public class BaseExcelTest
57
{
6-
public class BaseExcelTest
8+
protected string GetFilePath(string file)
9+
{
10+
return Path.Combine(Environment.CurrentDirectory, file);
11+
}
12+
13+
protected string GetLocalFilePath(string file)
714
{
8-
protected string GetFilePath(string file)
9-
{
10-
return Path.Combine(Environment.CurrentDirectory, file);
11-
}
12-
protected string GetLocalFilePath(string file)
13-
{
14-
return Path.Combine(Environment.CurrentDirectory, "ExcelDir", file);
15-
}
15+
return Path.Combine(Environment.CurrentDirectory, "ExcelDir", file);
1616
}
1717
}

‎Chsword.Excel2Object.Tests/BaseFunctionTest.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
using Chsword.Excel2Object.Internal;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
66

7-
namespace Chsword.Excel2Object.Tests
7+
namespace Chsword.Excel2Object.Tests;
8+
9+
public class BaseFunctionTest
810
{
9-
public class BaseFunctionTest
11+
protected void TestFunction(Expression<Func<ColumnCellDictionary, object>> exp, string expected)
1012
{
11-
protected void TestFunction(Expression<Func<ColumnCellDictionary, object>> exp, string expected)
12-
{
13-
var convert = new ExpressionConvert(new[] {"One", "Two", "Three", "Four", "Five", "Six"}, 3);
14-
var ret = convert.Convert(exp);
15-
Assert.AreEqual(expected, ret);
16-
}
13+
var convert = new ExpressionConvert(new[] {"One", "Two", "Three", "Four", "Five", "Six"}, 3);
14+
var ret = convert.Convert(exp);
15+
Assert.AreEqual(expected, ret);
1716
}
1817
}

‎Chsword.Excel2Object.Tests/Chsword.Excel2Object.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
16-
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
15+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
16+
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1717
<PackageReference Include="coverlet.collector" Version="3.1.2">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Chsword.Excel2Object.Tests/ExcelColumnNameParserTests.cs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
using Chsword.Excel2Object.Internal;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
33

4-
namespace Chsword.Excel2Object.Tests
4+
namespace Chsword.Excel2Object.Tests;
5+
6+
[TestClass]
7+
public class ExcelColumnNameParserTests
58
{
6-
[TestClass]
7-
public class ExcelColumnNameParserTests
9+
[TestMethod]
10+
public void Parse()
811
{
9-
[TestMethod]
10-
public void Parse()
11-
{
12-
AssertHelper("A", 0);
13-
AssertHelper("B", 1);
14-
AssertHelper("Z", 25);
15-
AssertHelper("AA", 26);
16-
AssertHelper("DL", 115);
17-
AssertHelper("ACM", 766);
18-
}
12+
AssertHelper("A", 0);
13+
AssertHelper("B", 1);
14+
AssertHelper("Z", 25);
15+
AssertHelper("AA", 26);
16+
AssertHelper("DL", 115);
17+
AssertHelper("ACM", 766);
18+
}
1919

20-
private void AssertHelper(string v1, int v2)
21-
{
22-
var ret = ExcelColumnNameParser.Parse(v2);
23-
Assert.AreEqual(v1, ret);
24-
}
20+
private void AssertHelper(string v1, int v2)
21+
{
22+
var ret = ExcelColumnNameParser.Parse(v2);
23+
Assert.AreEqual(v1, ret);
2524
}
2625
}

‎Chsword.Excel2Object.Tests/ExcelTest.cs‎

Lines changed: 107 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -7,126 +7,125 @@
77
using Microsoft.VisualStudio.TestTools.UnitTesting;
88
using Newtonsoft.Json;
99

10-
namespace Chsword.Excel2Object.Tests
10+
namespace Chsword.Excel2Object.Tests;
11+
12+
[TestClass]
13+
public class ExcelTest : BaseExcelTest
1114
{
12-
[TestClass]
13-
public class ExcelTest : BaseExcelTest
15+
[TestMethod]
16+
public void ConvertXlsBytesTest()
1417
{
15-
[TestMethod]
16-
public void ConvertXlsBytesTest()
17-
{
18-
var models = GetModels();
19-
var bytes = ExcelHelper.ObjectToExcelBytes(models);
20-
Assert.IsTrue(bytes.Length > 0);
21-
var importer = new ExcelImporter();
22-
var result = importer.ExcelToObject<ReportModel>(bytes).ToList();
23-
models.AreEqual(result);
24-
}
18+
var models = GetModels();
19+
var bytes = ExcelHelper.ObjectToExcelBytes(models);
20+
Assert.IsTrue(bytes.Length > 0);
21+
var importer = new ExcelImporter();
22+
var result = importer.ExcelToObject<ReportModel>(bytes).ToList();
23+
models.AreEqual(result);
24+
}
2525

2626

27-
[TestMethod]
28-
public void ConvertXlsFileTest()
29-
{
30-
var models = GetModels();
31-
var bytes = ExcelHelper.ObjectToExcelBytes(models);
32-
var path = GetFilePath("test.xls");
33-
File.WriteAllBytes(path, bytes);
34-
Assert.IsTrue(File.Exists(path));
35-
var importer = new ExcelImporter();
36-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
37-
Assert.AreEqual(models.Count, result.Count);
38-
models.AreEqual(result);
39-
}
27+
[TestMethod]
28+
public void ConvertXlsFileTest()
29+
{
30+
var models = GetModels();
31+
var bytes = ExcelHelper.ObjectToExcelBytes(models);
32+
var path = GetFilePath("test.xls");
33+
File.WriteAllBytes(path, bytes);
34+
Assert.IsTrue(File.Exists(path));
35+
var importer = new ExcelImporter();
36+
var result = importer.ExcelToObject<ReportModel>(path).ToList();
37+
Assert.AreEqual(models.Count, result.Count);
38+
models.AreEqual(result);
39+
}
4040

41-
[TestMethod]
42-
public void ConvertXlsFileUseObjectToExcelTest()
43-
{
44-
var models = GetModels();
45-
var path = GetFilePath("test.xls");
46-
ExcelHelper.ObjectToExcel(models, path);
47-
Assert.IsTrue(File.Exists(path));
48-
var importer = new ExcelImporter();
49-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
50-
Assert.AreEqual(models.Count, result.Count);
51-
models.AreEqual(result);
52-
}
41+
[TestMethod]
42+
public void ConvertXlsFileUseObjectToExcelTest()
43+
{
44+
var models = GetModels();
45+
var path = GetFilePath("test.xls");
46+
ExcelHelper.ObjectToExcel(models, path);
47+
Assert.IsTrue(File.Exists(path));
48+
var importer = new ExcelImporter();
49+
var result = importer.ExcelToObject<ReportModel>(path).ToList();
50+
Assert.AreEqual(models.Count, result.Count);
51+
models.AreEqual(result);
52+
}
5353

54-
[TestMethod]
55-
public void ConvertXlsFromDataTable()
56-
{
57-
DataTable dt = new DataTable();
58-
dt.Columns.Add(new DataColumn("姓名", typeof(string)));
59-
dt.Columns.Add(new DataColumn("Age", typeof(int)));
60-
DataRow dr = dt.NewRow();
61-
dr["姓名"] = "吴老狗";
62-
dr["Age"] = 19;
63-
dt.Rows.Add(dr);
64-
var bytes = ExcelHelper.ObjectToExcelBytes(dt, ExcelType.Xls);
65-
var path = GetFilePath("test.xls");
66-
File.WriteAllBytes(path, bytes);
67-
Assert.IsTrue(File.Exists(path));
68-
}
54+
[TestMethod]
55+
public void ConvertXlsFromDataTable()
56+
{
57+
var dt = new DataTable();
58+
dt.Columns.Add(new DataColumn("姓名", typeof(string)));
59+
dt.Columns.Add(new DataColumn("Age", typeof(int)));
60+
var dr = dt.NewRow();
61+
dr["姓名"] = "吴老狗";
62+
dr["Age"] = 19;
63+
dt.Rows.Add(dr);
64+
var bytes = ExcelHelper.ObjectToExcelBytes(dt, ExcelType.Xls);
65+
var path = GetFilePath("test.xls");
66+
File.WriteAllBytes(path, bytes);
67+
Assert.IsTrue(File.Exists(path));
68+
}
6969

70-
[TestMethod]
71-
public void ConvertXlsxBytesTest()
72-
{
73-
var models = GetModels();
74-
var array = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
75-
Assert.IsTrue(array.Length != 0);
76-
var excelImporter = new ExcelImporter();
77-
var result = excelImporter.ExcelToObject<ReportModel>(array).ToList();
78-
models.AreEqual(result);
79-
}
70+
[TestMethod]
71+
public void ConvertXlsxBytesTest()
72+
{
73+
var models = GetModels();
74+
var array = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
75+
Assert.IsTrue(array.Length != 0);
76+
var excelImporter = new ExcelImporter();
77+
var result = excelImporter.ExcelToObject<ReportModel>(array).ToList();
78+
models.AreEqual(result);
79+
}
8080

81-
[TestMethod]
82-
public void ConvertXlsxFileTest()
83-
{
84-
var models = GetModels();
85-
var bytes = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
86-
var path = GetFilePath("test.xlsx");
87-
File.WriteAllBytes(path, bytes);
88-
Assert.IsTrue(File.Exists(path));
89-
var importer = new ExcelImporter();
90-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
91-
Assert.AreEqual(models.Count, result.Count);
92-
models.AreEqual(result);
93-
}
81+
[TestMethod]
82+
public void ConvertXlsxFileTest()
83+
{
84+
var models = GetModels();
85+
var bytes = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
86+
var path = GetFilePath("test.xlsx");
87+
File.WriteAllBytes(path, bytes);
88+
Assert.IsTrue(File.Exists(path));
89+
var importer = new ExcelImporter();
90+
var result = importer.ExcelToObject<ReportModel>(path).ToList();
91+
Assert.AreEqual(models.Count, result.Count);
92+
models.AreEqual(result);
93+
}
9494

95-
[TestMethod]
96-
public void ConvertXlsxWithDictionary()
95+
[TestMethod]
96+
public void ConvertXlsxWithDictionary()
97+
{
98+
var list = new List<Dictionary<string, object>>
9799
{
98-
var list = new List<Dictionary<string, object>>
99-
{
100-
new Dictionary<string, object> { ["姓名"] = "吴老狗", ["Age"] = "19" },
101-
new Dictionary<string, object> { ["姓名"] = "老林", ["Age"] = "50" }
102-
};
103-
var bytes = ExcelHelper.ObjectToExcelBytes(list, ExcelType.Xlsx);
104-
var path = GetFilePath("test.xlsx");
105-
File.WriteAllBytes(path, bytes);
106-
var result = ExcelHelper.ExcelToObject<Dictionary<string, object>>(bytes).ToList();
107-
Assert.AreEqual(
108-
JsonConvert.SerializeObject(list),
109-
JsonConvert.SerializeObject(result)
110-
);
111-
}
100+
new() {["姓名"] = "吴老狗", ["Age"] = "19"},
101+
new() {["姓名"] = "老林", ["Age"] = "50"}
102+
};
103+
var bytes = ExcelHelper.ObjectToExcelBytes(list, ExcelType.Xlsx);
104+
var path = GetFilePath("test.xlsx");
105+
File.WriteAllBytes(path, bytes);
106+
var result = ExcelHelper.ExcelToObject<Dictionary<string, object>>(bytes).ToList();
107+
Assert.AreEqual(
108+
JsonConvert.SerializeObject(list),
109+
JsonConvert.SerializeObject(result)
110+
);
111+
}
112112

113-
private ReportModelCollection GetModels()
113+
private ReportModelCollection GetModels()
114+
{
115+
return new ReportModelCollection
114116
{
115-
return new ReportModelCollection
117+
new()
118+
{
119+
Name = "a", Title = "b", Enabled = true
120+
},
121+
new()
122+
{
123+
Name = "c", Title = "d", Enabled = false
124+
},
125+
new()
116126
{
117-
new ReportModel
118-
{
119-
Name = "a", Title = "b", Enabled = true
120-
},
121-
new ReportModel
122-
{
123-
Name = "c", Title = "d", Enabled = false
124-
},
125-
new ReportModel
126-
{
127-
Name = "f", Title = "e", Uri = new Uri("http://chsword.cnblogs.com")
128-
}
129-
};
130-
}
127+
Name = "f", Title = "e", Uri = new Uri("http://chsword.cnblogs.com")
128+
}
129+
};
131130
}
132131
}

‎Chsword.Excel2Object.Tests/ExpressionConvertConditionTests.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using Microsoft.VisualStudio.TestTools.UnitTesting;
22

3-
namespace Chsword.Excel2Object.Tests
3+
namespace Chsword.Excel2Object.Tests;
4+
5+
[TestClass]
6+
public class ExpressionConvertConditionTests : BaseFunctionTest
47
{
5-
[TestClass]
6-
public class ExpressionConvertConditionTests : BaseFunctionTest
8+
[TestMethod]
9+
public void If()
710
{
8-
[TestMethod]
9-
public void If()
10-
{
11-
TestFunction(c => ExcelFunctions.Condition.If(c["One"] == "Yes", 1, 2), "IF(A4=\"Yes\",1,2)");
12-
}
11+
TestFunction(c => ExcelFunctions.Condition.If(c["One"] == "Yes", 1, 2), "IF(A4=\"Yes\",1,2)");
1312
}
1413
}

0 commit comments

Comments
 (0)