Skip to content

Commit a68e55f

Browse files
committed
Fix oen office test broken by last change
1 parent 6116cfb commit a68e55f

8 files changed

+1073
-2
lines changed

Excel.Tests.4.5/Excel.Tests.4.5.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,12 @@
302302
<Content Include="Resources\Uncalculated.xls">
303303
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
304304
</Content>
305+
<Content Include="Resources\Test_Excel_OpenOffice.xls">
306+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
307+
</Content>
308+
<Content Include="Resources\Test_Excel_OpenOffice.xlsx">
309+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
310+
</Content>
305311
</ItemGroup>
306312
<ItemGroup>
307313
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
Binary file not shown.
Binary file not shown.

Excel.Tests/App.config

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<add key="Test_Issue_11636_BiffStream" value="Test_Issue_11636_BiffStream.xls" />
4545
<add key="Test_Issue_12556_corrupt" value="Test_Issue_12556_corrupt.xls" />
4646
<add key="Test_Issue_11818_OutOfRange" value="Test_Issue_11818_OutOfRange.xls" />
47+
<add key="Test_Excel_OpenOffice" value="Test_Excel_OpenOffice.xls" />
4748

4849
<!--<add key="Test_SSRS" value="Test_SSRS.xls"/>-->
4950
<add key="xTestOpenXml" value="TestOpenXml.xlsx" />
@@ -81,6 +82,7 @@
8182
<add key="bTest10x10" value="Test10x10.xlsb" />
8283
<add key="xTest_googlesourced" value="Test_googlesourced.xlsx" />
8384
<add key="xTest_Issue_12667_GoogleExport_MissingColumns" value="Test_Issue_12667_GoogleExport_MissingColumns.xlsx" />
85+
<add key="xTest_Excel_OpenOffice" value="Test_Excel_OpenOffice.xlsx" />
8486
<!-- To test some unicode conversion -->
8587
<add key="TestUnicodePos2x1" value="éЗ" />
8688
<!-- log4net debugging -->

Excel.Tests/Excel.Tests.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,14 @@
378378
<Link>Resources\Uncalculated.xls</Link>
379379
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
380380
</Content>
381+
<Content Include="..\Excel.Tests.4.5\Resources\Test_Excel_OpenOffice.xls">
382+
<Link>Resources\Test_Excel_OpenOffice.xls</Link>
383+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
384+
</Content>
385+
<Content Include="..\Excel.Tests.4.5\Resources\Test_Excel_OpenOffice.xlsx">
386+
<Link>Resources\Test_Excel_OpenOffice.xlsx</Link>
387+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
388+
</Content>
381389
<None Include="App.config">
382390
<SubType>Designer</SubType>
383391
</None>

Excel.Tests/ExcelBinaryReaderTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public void Test_OpenOffice()
687687
public void Test_OpenOffice_SavedInExcel()
688688
{
689689
IExcelDataReader excelReader =
690-
ExcelReaderFactory.CreateBinaryReader(Helper.GetTestWorkbook("Test_Excel_Dataset"));
690+
ExcelReaderFactory.CreateBinaryReader(Helper.GetTestWorkbook("Test_Excel_OpenOffice"));
691691
excelReader.IsFirstRowAsColumnNames = true;
692692

693693
DoOpenOfficeTest(excelReader);

0 commit comments

Comments
 (0)