Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tidy up eval 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1892322 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-08-14 00:28:37 +00:00
parent bb641dc017
commit a012cfa423
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
View File

@ -305,15 +305,12 @@ public final class LookupUtils {
StringEval se = (StringEval) other; StringEval se = (StringEval) other;
String stringValue = se.getStringValue(); String stringValue = se.getStringValue();
if (_wildCardPattern != null) { if (_wildCardPattern != null && (_isMatchFunction || !_matchExact)) {
Matcher matcher = _wildCardPattern.matcher(stringValue); Matcher matcher = _wildCardPattern.matcher(stringValue);
boolean matches = matcher.matches(); boolean matches = matcher.matches();
if (_isMatchFunction ||
!_matchExact) {
return CompareResult.valueOf(matches); return CompareResult.valueOf(matches);
} }
}
return CompareResult.valueOf(_value.compareToIgnoreCase(stringValue)); return CompareResult.valueOf(_value.compareToIgnoreCase(stringValue));
} }

15
poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
View File

@ -53,6 +53,9 @@ public abstract class BaseTestConditionalFormatting {
protected abstract void assertColor(String hexExpected, Color actual); protected abstract void assertColor(String hexExpected, Color actual);
protected int defaultDataBarMinLength() { return 0; }
protected int defaultDataBarMaxLength() { return 100; }
@Test @Test
void testBasic() throws Throwable { void testBasic() throws Throwable {
try (Workbook wb = _testDataProvider.createWorkbook()) { try (Workbook wb = _testDataProvider.createWorkbook()) {
@ -764,8 +767,8 @@ public abstract class BaseTestConditionalFormatting {
assertNotNull(databar); assertNotNull(databar);
assertFalse(databar.isIconOnly()); assertFalse(databar.isIconOnly());
assertTrue(databar.isLeftToRight()); assertTrue(databar.isLeftToRight());
assertEquals(0, databar.getWidthMin()); assertEquals(defaultDataBarMinLength(), databar.getWidthMin());
assertEquals(100, databar.getWidthMax()); assertEquals(defaultDataBarMaxLength(), databar.getWidthMax());
assertColor(color, databar.getColor()); assertColor(color, databar.getColor());
@ -1177,8 +1180,8 @@ public abstract class BaseTestConditionalFormatting {
assertFalse(dbFmt.isIconOnly()); assertFalse(dbFmt.isIconOnly());
assertTrue(dbFmt.isLeftToRight()); assertTrue(dbFmt.isLeftToRight());
assertEquals(0, dbFmt.getWidthMin()); assertEquals(defaultDataBarMinLength(), dbFmt.getWidthMin());
assertEquals(100, dbFmt.getWidthMax()); assertEquals(defaultDataBarMaxLength(), dbFmt.getWidthMax());
assertColor(colorHex, dbFmt.getColor()); assertColor(colorHex, dbFmt.getColor());
dbFmt.getMinThreshold().setRangeType(RangeType.MIN); dbFmt.getMinThreshold().setRangeType(RangeType.MIN);
@ -1201,8 +1204,8 @@ public abstract class BaseTestConditionalFormatting {
assertFalse(dbFmt.isIconOnly()); assertFalse(dbFmt.isIconOnly());
assertTrue(dbFmt.isLeftToRight()); assertTrue(dbFmt.isLeftToRight());
assertEquals(0, dbFmt.getWidthMin()); assertEquals(defaultDataBarMinLength(), dbFmt.getWidthMin());
assertEquals(100, dbFmt.getWidthMax()); assertEquals(defaultDataBarMaxLength(), dbFmt.getWidthMax());
assertColor(colorHex, dbFmt.getColor()); assertColor(colorHex, dbFmt.getColor());
assertEquals(RangeType.MIN, dbFmt.getMinThreshold().getRangeType()); assertEquals(RangeType.MIN, dbFmt.getMinThreshold().getRangeType());