Skip to content

Commit

Permalink
#14 sheet comparisons now take into account the merged regions (as de…
Browse files Browse the repository at this point in the history
…fined by the MergedRegionsMatcher)
  • Loading branch information
tobyweston committed Oct 28, 2019
1 parent d9b5548 commit a7e1b50
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/bad/robot/excel/matchers/SheetsMatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;

import static bad.robot.excel.matchers.MergedRegionCountMatcher.hasSameNumberOfMergedRegions;
import static bad.robot.excel.matchers.MergedRegionsMatcher.hasSameMergedRegions;
import static bad.robot.excel.matchers.RowNumberMatcher.hasSameNumberOfRowAs;
import static bad.robot.excel.matchers.RowsMatcher.hasSameRowsAs;
import static bad.robot.excel.sheet.SheetIterable.sheetsOf;
Expand All @@ -39,7 +39,7 @@ protected boolean matchesSafely(Workbook actual, Description mismatch) {
for (Sheet expectedSheet : sheetsOf(expected)) {
Sheet actualSheet = actual.getSheet(expectedSheet.getSheetName());

if (!hasSameNumberOfMergedRegions(expectedSheet).matchesSafely(actualSheet, mismatch))
if (!hasSameMergedRegions(expectedSheet).matchesSafely(actualSheet, mismatch))
return false;

if (!hasSameNumberOfRowAs(expectedSheet).matchesSafely(actualSheet, mismatch))
Expand Down

0 comments on commit a7e1b50

Please sign in to comment.