Skip to content

Commit 32b015a

Browse files
chswordchsword
committed
Fix Encode & update deps
1 parent cccfbae commit 32b015a

File tree

11 files changed

+50
-26
lines changed

11 files changed

+50
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
4+
<TargetFramework>net7.0</TargetFramework>
5+
<Nullable>annotations</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎Chsword.Excel2Object.Tests/ExcelTest.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Data;
44
using System.IO;
@@ -17,7 +17,10 @@ public void ConvertXlsBytesTest()
1717
{
1818
var models = GetModels();
1919
var bytes = ExcelHelper.ObjectToExcelBytes(models);
20+
Assert.IsNotNull(bytes);
21+
2022
Assert.IsTrue(bytes.Length > 0);
23+
2124
var importer = new ExcelImporter();
2225
var result = importer.ExcelToObject<ReportModel>(bytes).ToList();
2326
models.AreEqual(result);
@@ -29,11 +32,12 @@ public void ConvertXlsFileTest()
2932
{
3033
var models = GetModels();
3134
var bytes = ExcelHelper.ObjectToExcelBytes(models);
35+
Assert.IsNotNull(bytes);
3236
var path = GetFilePath("test.xls");
3337
File.WriteAllBytes(path, bytes);
3438
Assert.IsTrue(File.Exists(path));
3539
var importer = new ExcelImporter();
36-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
40+
var result = importer.ExcelToObject<ReportModel>(path)!.ToList();
3741
Assert.AreEqual(models.Count, result.Count);
3842
models.AreEqual(result);
3943
}
@@ -46,7 +50,7 @@ public void ConvertXlsFileUseObjectToExcelTest()
4650
ExcelHelper.ObjectToExcel(models, path);
4751
Assert.IsTrue(File.Exists(path));
4852
var importer = new ExcelImporter();
49-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
53+
var result = importer.ExcelToObject<ReportModel>(path)!.ToList();
5054
Assert.AreEqual(models.Count, result.Count);
5155
models.AreEqual(result);
5256
}
@@ -62,6 +66,7 @@ public void ConvertXlsFromDataTable()
6266
dr["Age"] = 19;
6367
dt.Rows.Add(dr);
6468
var bytes = ExcelHelper.ObjectToExcelBytes(dt, ExcelType.Xls);
69+
Assert.IsNotNull(bytes);
6570
var path = GetFilePath("test.xls");
6671
File.WriteAllBytes(path, bytes);
6772
Assert.IsTrue(File.Exists(path));
@@ -72,6 +77,7 @@ public void ConvertXlsxBytesTest()
7277
{
7378
var models = GetModels();
7479
var array = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
80+
Assert.IsNotNull(array);
7581
Assert.IsTrue(array.Length != 0);
7682
var excelImporter = new ExcelImporter();
7783
var result = excelImporter.ExcelToObject<ReportModel>(array).ToList();
@@ -83,11 +89,12 @@ public void ConvertXlsxFileTest()
8389
{
8490
var models = GetModels();
8591
var bytes = ExcelHelper.ObjectToExcelBytes(models, ExcelType.Xlsx);
92+
Assert.IsNotNull(bytes);
8693
var path = GetFilePath("test.xlsx");
8794
File.WriteAllBytes(path, bytes);
8895
Assert.IsTrue(File.Exists(path));
8996
var importer = new ExcelImporter();
90-
var result = importer.ExcelToObject<ReportModel>(path).ToList();
97+
var result = importer.ExcelToObject<ReportModel>(path)!.ToList();
9198
Assert.AreEqual(models.Count, result.Count);
9299
models.AreEqual(result);
93100
}
@@ -101,6 +108,7 @@ public void ConvertXlsxWithDictionary()
101108
new() {["姓名"] = "老林", ["Age"] = "50"}
102109
};
103110
var bytes = ExcelHelper.ObjectToExcelBytes(list, ExcelType.Xlsx);
111+
Assert.IsNotNull(bytes);
104112
var path = GetFilePath("test.xlsx");
105113
File.WriteAllBytes(path, bytes);
106114
var result = ExcelHelper.ExcelToObject<Dictionary<string, object>>(bytes).ToList();

‎Chsword.Excel2Object.Tests/Issue16FormulaTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void FormulaColumnExport()
4343
FormulaResultType = typeof(DateTime)
4444
});
4545
});
46+
Assert.IsNotNull(bytes);
4647
var path = GetFilePath("test.xlsx");
4748
File.WriteAllBytes(path, bytes);
4849
var result = ExcelHelper.ExcelToObject<Dictionary<string, object>>(bytes).ToList();
@@ -80,6 +81,7 @@ public void FormulaColumnExportCover()
8081
AfterColumnTitle = "BirthYear"
8182
});
8283
});
84+
Assert.IsNotNull(bytes);
8385
var path = GetFilePath("test.xlsx");
8486
File.WriteAllBytes(path, bytes);
8587
var result = ExcelHelper.ExcelToObject<Dictionary<string, object>>(bytes).ToList();

‎Chsword.Excel2Object.Tests/Issue31SuperClass.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ public class Issue31SuperClass
1414
[TestMethod]
1515
public void CheckModelA()
1616
{
17-
var excel = TypeConvert.ConvertObjectToExcelModel(GetExcel<SubClassA>(),
17+
var excel = TypeConvert.ConvertObjectToExcelModel(GetExcel<SubClassA>()!,
1818
new ExcelExporterOptions());
19+
1920
Assert.IsNotNull(excel);
20-
Assert.AreEqual(1, excel.Sheets.Count);
21+
22+
Assert.AreEqual(1, excel.Sheets?.Count);
23+
Assert.IsNotNull(excel.Sheets);
2124
Assert.AreEqual("SuperClass", excel.Sheets[0].Title);
2225
Console.WriteLine(JsonConvert.SerializeObject(excel));
2326

@@ -32,6 +35,7 @@ public void CheckModelB()
3235
GetExcel<SubClassB>(),
3336
new ExcelExporterOptions());
3437
Assert.IsNotNull(excel);
38+
Assert.IsNotNull(excel.Sheets);
3539
Assert.AreEqual(1, excel.Sheets.Count);
3640
Assert.AreEqual("SubClassB", excel.Sheets[0].Title);
3741
Console.WriteLine(JsonConvert.SerializeObject(excel));
@@ -48,7 +52,9 @@ public void SuperClassTest()
4852
var export = new ExcelExporter();
4953
var bytes = export.ObjectToExcelBytes(GetExcel<SubClassA>());
5054
var importer = new ExcelImporter();
51-
55+
Assert.IsNotNull(bytes);
56+
Console.WriteLine(bytes.Length);
57+
Assert.IsNotNull(importer);
5258
// var model = ExcelImporter.
5359
}
5460

@@ -61,7 +67,7 @@ private List<T> GetExcel<T>() where T : SuperClass
6167
new() {Id = 1, P = "x"},
6268
new() {Id = 2, P = "x"}
6369
};
64-
return list as List<T>;
70+
return (list as List<T>)!;
6571
}
6672

6773
if (typeof(T).Name == "SubClassB")
@@ -71,17 +77,17 @@ private List<T> GetExcel<T>() where T : SuperClass
7177
new() {Id = 11, P = "x"},
7278
new() {Id = 12, P = "x"}
7379
};
74-
return list as List<T>;
80+
return (list as List<T>)!;
7581
}
76-
77-
return null;
82+
throw new Exception("not support");
7883
}
7984

8085
[ExcelTitle("SuperClass")]
8186
public abstract class SuperClass
8287
{
8388
[ExcelColumn("Id1")] public int Id { get; set; }
8489

90+
// ReSharper disable once NotNullOrRequiredMemberIsNotInitialized
8591
[ExcelColumn("P1")] public string P { get; set; }
8692
}
8793

‎Chsword.Excel2Object.Tests/Issue32SkipLineImport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void SkipLineImport()
1616
var importer = new ExcelImporter();
1717
var result =
1818
importer.ExcelToObject<TestModelPerson>(
19-
path, options => { options.TitleSkipLine = 3; })
19+
path, options => { options.TitleSkipLine = 3; })!
2020
.ToList();
2121
Assert.AreEqual(2, result.Count);
2222
Console.WriteLine(JsonConvert.SerializeObject(result));

‎Chsword.Excel2Object.Tests/Models/Report.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
// ReSharper disable All
23

34
namespace Chsword.Excel2Object.Tests.Models;
45

‎Chsword.Excel2Object.Tests/Models/TestModelPerson.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
// ReSharper disable All
23

34
namespace Chsword.Excel2Object.Tests.Models;
45

‎Chsword.Excel2Object.Tests/Pr20Test.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public void UseExcelColumnAttr()
2424
}
2525
};
2626
var bytes = ExcelHelper.ObjectToExcelBytes(list, ExcelType.Xlsx);
27+
Assert.IsNotNull(bytes);
28+
2729
var path = GetFilePath("test.xlsx");
2830
File.WriteAllBytes(path, bytes);
2931
Console.WriteLine(path);
@@ -33,7 +35,7 @@ public void UseExcelColumnAttr()
3335
public class Pr20Model
3436
{
3537
[ExcelColumn("姓名", CellFontColor = ExcelStyleColor.Red)]
36-
public string Fullname { get; set; }
38+
public string? Fullname { get; set; }
3739

3840
[ExcelColumn("手机",
3941
HeaderFontFamily = "宋体",
@@ -46,6 +48,6 @@ public class Pr20Model
4648
//cell
4749
CellAlignment = HorizontalAlignment.Justify
4850
)]
49-
public string Mobile { get; set; }
51+
public string Mobile { get; set; } = null!;
5052
}
5153
}

‎Chsword.Excel2Object.Tests/Pr24NullableTest.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void ImportExcelNullableType()
1515
{
1616
var path = GetLocalFilePath("test.person.xlsx");
1717
var importer = new ExcelImporter();
18-
var result = importer.ExcelToObject<TestModelPerson>(path).ToList();
18+
var result = importer.ExcelToObject<TestModelPerson>(path)!.ToList();
1919
Assert.AreEqual(2, result.Count);
2020
Console.WriteLine(JsonConvert.SerializeObject(result));
2121
}
@@ -27,7 +27,7 @@ public void ImportExcelUnNullableTypeException()
2727
var importer = new ExcelImporter();
2828
Assert.ThrowsException<FormatException>(() =>
2929
{
30-
var result = importer.ExcelToObject<TestModelStrictPerson>(path).ToList();
30+
var result = importer.ExcelToObject<TestModelStrictPerson>(path)!.ToList();
3131
Console.WriteLine(JsonConvert.SerializeObject(result));
3232
});
3333
}
@@ -37,7 +37,7 @@ public void ImportExcelUnNullableType()
3737
{
3838
var path = GetLocalFilePath("test.person.unnullable.xlsx");
3939
var importer = new ExcelImporter();
40-
var result = importer.ExcelToObject<TestModelStrictPerson>(path).ToList();
40+
var result = importer.ExcelToObject<TestModelStrictPerson>(path)!.ToList();
4141
Assert.AreEqual(2, result.Count);
4242
Console.WriteLine(JsonConvert.SerializeObject(result));
4343
}
@@ -56,6 +56,7 @@ public void ExportExcelNullableType()
5656
{
5757
var personList = GetPersonList();
5858
var bytes = ExcelHelper.ObjectToExcelBytes(personList);
59+
Assert.IsNotNull(bytes);
5960
Assert.IsTrue(bytes.Length > 0);
6061
var importer = new ExcelImporter();
6162
var result = importer.ExcelToObject<TestModelPerson>(bytes).ToList();

‎Chsword.Excel2Object.Tests/Pr28MultipleSheetTest.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public void ImportMultipleSheet()
1616
{
1717
var path = GetLocalFilePath("test-pr28-multiples-heet.xlsx");
1818
var importer = new ExcelImporter();
19-
var resultFlat = importer.ExcelToObject<TestModelPerson>(path, "Flat3Door").ToList();
19+
var resultFlat = importer.ExcelToObject<TestModelPerson>(path, "Flat3Door")!.ToList();
2020
Assert.AreEqual(3, resultFlat.Count);
2121
Assert.AreEqual("陈皮", resultFlat[0].Name);
2222
Console.WriteLine(JsonConvert.SerializeObject(resultFlat));
23-
var resultUp = importer.ExcelToObject<TestModelPerson>(path, "Up3Door").ToList();
23+
var resultUp = importer.ExcelToObject<TestModelPerson>(path, "Up3Door")!.ToList();
2424
Assert.AreEqual(3, resultUp.Count);
2525
Assert.AreEqual("张启山", resultUp[0].Name);
2626
Console.WriteLine(JsonConvert.SerializeObject(resultUp));
@@ -34,7 +34,7 @@ public void ImportMultipleSheetException()
3434
var path = GetLocalFilePath("test-pr28-multiples-heet.xlsx");
3535
var importer = new ExcelImporter();
3636
var sheetName = "xxxxxxxxxxxxxxxxxxxx3Door";
37-
var result = importer.ExcelToObject<TestModelPerson>(path, sheetName).ToList();
37+
var result = importer.ExcelToObject<TestModelPerson>(path, sheetName)!.ToList();
3838
Assert.AreEqual(3, result.Count);
3939
Assert.AreEqual("陈皮", result[0].Name);
4040
});
@@ -48,14 +48,17 @@ public void ExportMultipleSheet()
4848
// read source
4949

5050
var path = GetLocalFilePath("test-pr28-multiples-heet.xlsx");
51-
var flatModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Flat3Door").ToList();
52-
var upModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Up3Door").ToList();
53-
var downModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Down3Door").ToList();
51+
var flatModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Flat3Door")!.ToList();
52+
var upModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Up3Door")!.ToList();
53+
var downModel = ExcelHelper.ExcelToObject<TestModelPerson>(path, "Down3Door")!.ToList();
5454
// write bytes
5555
var bytes = ExcelHelper.ObjectToExcelBytes(upModel, sheetTitle: "Up3Door");
56+
Assert.IsNotNull(bytes);
5657
// append
5758
bytes = ExcelHelper.AppendObjectToExcelBytes(bytes, flatModel, "Flat3Door");
59+
Assert.IsNotNull(bytes);
5860
bytes = ExcelHelper.AppendObjectToExcelBytes(bytes, downModel, "Down3Door");
61+
Assert.IsNotNull(bytes);
5962
// check
6063
var importer = new ExcelImporter();
6164
var resultFlat = importer.ExcelToObject<TestModelPerson>(bytes, "Flat3Door").ToList();

0 commit comments

Comments
 (0)