Skip to content

Commit e70a836

Browse files
Fixed some tests (#1488)
* Fixed some tests * DataLabel test fix. Column headers * Added some output to test ReadFixedTextFileList * Changed EOL to \n on test ReadFixedTextFileList --------- Co-authored-by: Ossian Edström <[email protected]>
1 parent 55ac136 commit e70a836

File tree

4 files changed

+22
-37
lines changed

4 files changed

+22
-37
lines changed

src/EPPlusTest/Drawing/Chart/DatalabelTest.cs

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public static void Init(TestContext context)
2222
var range = new ExcelRange(dSheet, "A1:G10");
2323
var table = dSheet.Tables.Add(range, "DataTable");
2424
table.ShowHeader = true;
25+
table.SyncColumnNames(OfficeOpenXml.Table.ApplyDataFrom.ColumnNamesToCells);
26+
2527
dSheet.Cells["A2:G10"].Formula = "ROW() + COLUMN()";
2628
dSheet.Cells["D2:D10"].Value = 0.1;
2729
dSheet.Cells["E2:E10"].Value = 1;

src/EPPlusTest/Issues/WorksheetIssues.cs

-35
Original file line numberDiff line numberDiff line change
@@ -151,41 +151,6 @@ public void s614()
151151
package.Save();
152152
}
153153
}
154-
[TestMethod]
155-
public void s656()
156-
{
157-
using var testPackage = new ExcelPackage();
158-
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-AU");
159-
var testSheet = testPackage.Workbook.Worksheets.Add("Test");
160-
testSheet.Cells["A1"].Value = 2.0;
161-
testSheet.Cells["A2"].Value = 1.0;
162-
testSheet.Cells["A3"].Formula = "A1-A2";
163-
164-
var comments = new List<string>
165-
{
166-
"Some comment",
167-
"more comment",
168-
"more more",
169-
};
170-
171-
var firstComment = testSheet.Cells[1, 1]
172-
.AddComment(string.Join("\n\r", comments), "Fathom");
173-
firstComment.AutoFit = true;
174-
175-
var secondComment = testSheet.Cells[1, 2]
176-
.AddComment(string.Join("\n\r", comments), "Fathom");
177-
secondComment.AutoFit = true;
178-
179-
var namedStyle = testSheet.Workbook.Styles.CreateNamedStyle("new-name-style");
180-
namedStyle.Style.Numberformat.Format = "$#,##0;($#,##0)";
181-
182-
testSheet.Cells["A1"].StyleName = "new-name-style";
183-
testSheet.Cells["A2"].StyleName = "new-name-style";
184-
testSheet.Cells["A3"].StyleName = "new-name-style";
185-
186-
testPackage.Workbook.Calculate();
187-
testPackage.SaveAs(@"c:\temp\s656.xlsx");
188-
}
189154
[TestMethod]
190155
public void s616()
191156
{

src/EPPlusTest/LoadFunctions/LoadFromTextTests.cs

+19-1
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,19 @@ public void ReadFixedTextWidthTrailingMinus()
370370
public void ReadFixedTextFileList()
371371
{
372372
var fileContent = Properties.Resources.GetTextFileContent("FixedWidth_FileList.txt", Encoding.GetEncoding(437));
373+
if (string.IsNullOrEmpty(fileContent))
374+
{
375+
var fi = Properties.Resources.GetTextFileInfo("FixedWidth_FileList.txt");
376+
if(fi.Exists==false)
377+
{
378+
Assert.Fail("File does not exist : " + fi.FullName);
379+
}
380+
else
381+
{
382+
Assert.Fail("File Content is empty for file " + fi.FullName);
383+
}
384+
}
385+
373386
//Do fixed width text stuff
374387
using (var p = new ExcelPackage())
375388
{
@@ -383,8 +396,13 @@ public void ReadFixedTextFileList()
383396
format.Culture = CultureInfo.GetCultureInfo("sv-en");
384397
format.TableStyle = TableStyles.Medium12;
385398
format.SetColumnsNames("Date", "Time", "Type","Size", "Name");
386-
399+
format.EOL = "\n";
387400
var range = ws.Cells["A1"].LoadFromText(fileContent, format);
401+
if(range.Rows<101)
402+
{
403+
Assert.Fail($"Load failed. LoadRange is {range.Address}, {range.Offset(0,0, 1, 1).Value}, {range.Offset(0, 1 ,1, 1).Value}, {range.Offset(0, 2, 1, 1).Value}, {range.Offset(0, 3, 1, 1).Value}, {range.Offset(0, 4).Value}");
404+
}
405+
388406
range.TakeSingleColumn(0).Style.Numberformat.Format = "yyyy-MM-dd";
389407
range.TakeSingleColumn(1).Style.Numberformat.Format = "hh:mm";
390408
range.TakeSingleColumn(2).Style.Numberformat.Format = "#,##0";

src/EPPlusTest/Properties/Resources.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)