Browse Source

Stupid mistake #1

Piotr Czajkowski 3 weeks ago
parent
commit
50c83077b6

+ 1 - 1
ExcelORM/ExcelORM/ExcelORM.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>2.0.0</Version>
+        <Version>2.0.1</Version>
         <PackageProjectUrl>https://git.liox.eu/pczajkowski/ExcelORM</PackageProjectUrl>
         <RepositoryUrl>https://github.com/pczajkowski/ExcelORM</RepositoryUrl>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

+ 2 - 2
ExcelORM/ExcelORM/ExcelWriter.cs

@@ -39,15 +39,15 @@ public class ExcelWriter
 
         foreach (var value in enumerable)
         {
-            var cellIndex = 1;
+            var cellIndex = 0;
             var properties = typeof(T).GetProperties();
             foreach (var property in properties)
             {
+                cellIndex++;
                 var valueToSet = property.GetValue(value);
                 if (valueToSet == null) continue;
 
                 worksheet.Cell(rowIndex, cellIndex).Value = XLCellValue.FromObject(valueToSet);
-                cellIndex++;
             }
 
             rowIndex++;

+ 8 - 4
ExcelORM/ExcelORMTests/WriterTests.cs

@@ -6,9 +6,9 @@ public class WriterTests
 {
     private readonly Test[] arrayOfThree = 
     {
-        new Test { Name = "Bilbo", Surname = "Baggins", Job = "Eater"},
-        new Test { Name = "John", Surname = "McCain", Job = "Policeman"},
-        new Test { Name = "Bruce", Surname = "Lee", Job = "Fighter"}
+        new() { Name = "Bilbo", Surname = "Baggins", Job = "Eater"},
+        new() { Name = "John", Job = "Policeman"},
+        new() { Name = "Bruce", Surname = "Lee", Job = "Fighter"}
     };
 
     private readonly List<Test> listOfTwo = new()
@@ -29,7 +29,11 @@ public class WriterTests
         writer.SaveAs(testFile);
 
         var reader = new ExcelReader(testFile);
-        Assert.Equal(3, reader.Read<Test>(worksheetName).Count());
+        var readArray = reader.Read<Test>(worksheetName).ToArray();
+        Assert.Equal(3, readArray.Length);
+
+        for (int i = 0; i < readArray.Length; i++)
+            Assert.Equal(arrayOfThree[i], readArray[i]);
 
         writer.Write(listOfTwo, worksheetName, true);
         writer.SaveAs(testFile);