From 99fe7a9635d1edf8678c9ff21f439ce4856da344 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 3 Oct 2021 17:07:22 +0000 Subject: [PATCH] add weekday tests git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1893858 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/ss/formula/functions/TestWeekNumFunc.java | 2 +- .../poi/ss/formula/functions/TestWeekdayFunc.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java index 4e801a657c..399a32eaea 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; /** - * Tests WEEKNUM(date[, return_type]) excep function + * Tests WEEKNUM(date[, return_type]) excel function * https://support.microsoft.com/en-us/office/weeknum-function-e5c43a03-b4ab-426c-b411-b18c13c75340 */ class TestWeekNumFunc { diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java index 56234d6ece..62840bbfdd 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java @@ -18,13 +18,16 @@ package org.apache.poi.ss.formula.functions; import org.apache.poi.ss.formula.eval.*; +import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.util.StringUtil; import org.junit.jupiter.api.Test; +import java.time.LocalDate; + import static org.junit.jupiter.api.Assertions.*; /** - * Tests WEEKDAY(serial_number[, return_type]) excep function + * Tests WEEKDAY(serial_number[, return_type]) excel function * https://support.office.com/en-us/article/WEEKDAY-function-60E44483-2ED1-439F-8BD0-E404C190949A */ class TestWeekdayFunc { @@ -71,6 +74,15 @@ class TestWeekdayFunc { assertEvaluateEquals(3.0, 39448.0, 17.0); } + + @Test + void testMicrosoftExamples() { + double date = DateUtil.getExcelDate(LocalDate.parse("2008-02-14")); + assertEvaluateEquals(5.0, date); + assertEvaluateEquals(4.0, date, 2); + assertEvaluateEquals(3.0, date, 3); + } + // for testing invalid invocations private void assertEvaluateEquals(String message, ErrorEval expected, ValueEval... args) { String formula = "WEEKDAY(" + StringUtil.join(args, ", ") + ")"; -- 2.39.5