From 7f57b18f314aa6b82ccf131f71011252935fdf6f Mon Sep 17 00:00:00 2001
From: Avik Sengupta <avik@apache.org>
Date: Thu, 12 Dec 2002 09:02:26 +0000
Subject: [PATCH] PR:15037 - Unit Tests for 1904 date windowing; submitted by
 Dan Sherman

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352937 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hssf/data/1900DateWindowing.xls       | Bin 0 -> 6656 bytes
 .../poi/hssf/data/1904DateWindowing.xls       | Bin 0 -> 6656 bytes
 .../poi/hssf/usermodel/TestHSSFCell.java      |  38 ++++++++++++++++++
 .../poi/hssf/usermodel/TestHSSFDateUtil.java  |  19 +++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 src/testcases/org/apache/poi/hssf/data/1900DateWindowing.xls
 create mode 100644 src/testcases/org/apache/poi/hssf/data/1904DateWindowing.xls

diff --git a/src/testcases/org/apache/poi/hssf/data/1900DateWindowing.xls b/src/testcases/org/apache/poi/hssf/data/1900DateWindowing.xls
new file mode 100644
index 0000000000000000000000000000000000000000..e6d966456e01e6e9ae5aa8dc1c32d3741c4c12e3
GIT binary patch
literal 6656
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

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/data/1904DateWindowing.xls b/src/testcases/org/apache/poi/hssf/data/1904DateWindowing.xls
new file mode 100644
index 0000000000000000000000000000000000000000..142d3148f312d0d03a7e5d709ecabf22a0a6ee26
GIT binary patch
literal 6656
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
Xm<=ZS%&kg}Y?ilb&YsM3JIntI&E)<y

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index 278230b0b1..23a2004a54 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
@@ -77,6 +77,7 @@ import java.util.GregorianCalendar;
  * Tests various functionity having to do with HSSFCell.  For instance support for
  * paticular datatypes, etc.
  * @author Andrew C. Oliver (andy at superlinksoftware dot com)
+ * @author  Dan Sherman (dsherman at isisph.com)
  */
 
 public class TestHSSFCell
@@ -139,6 +140,43 @@ extends TestCase {
             in.close();
     }
 
+    /**
+    * Checks that the recognition of files using 1904 date windowing
+    *  is working properly. Conversion of the date is also an issue,
+    *  but there's a separate unit test for that.
+    */
+    public void testDateWindowing() throws Exception {
+        GregorianCalendar cal = new GregorianCalendar(2000,0,1); // Jan. 1, 2000
+        Date date = cal.getTime();
+        String path = System.getProperty("HSSF.testdata.path");
+
+        // first check a file with 1900 Date Windowing
+        String filename = path + "/1900DateWindowing.xls";
+        FileInputStream stream   = new FileInputStream(filename);
+        POIFSFileSystem fs       = new POIFSFileSystem(stream);
+        HSSFWorkbook    workbook = new HSSFWorkbook(fs);
+        HSSFSheet       sheet    = workbook.getSheetAt(0);
+
+        assertEquals("Date from file using 1900 Date Windowing",
+                        date.getTime(),
+                           sheet.getRow(0).getCell((short)0)
+                              .getDateCellValue().getTime());
+        stream.close();
+        
+        // now check a file with 1904 Date Windowing
+        filename = path + "/1904DateWindowing.xls";
+        stream   = new FileInputStream(filename);
+        fs       = new POIFSFileSystem(stream);
+        workbook = new HSSFWorkbook(fs);
+        sheet    = workbook.getSheetAt(0);
+
+        assertEquals("Date from file using 1904 Date Windowing",
+                        date.getTime(),
+                           sheet.getRow(0).getCell((short)0)
+                              .getDateCellValue().getTime());
+        stream.close();
+    }
+
     public static void main(String [] args) {
         System.out
         .println("Testing org.apache.poi.hssf.usermodel.TestHSSFCell");
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 1528f91bfc..6cd377f8cd 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
@@ -65,6 +65,7 @@ import java.util.GregorianCalendar;
  *
  *
  * @author
+ * @author  Dan Sherman (dsherman at isisph.com)
  * @version %I%, %G%
  */
 
@@ -95,5 +96,23 @@ public class TestHSSFDateUtil
             assertEquals("Checking hour = " + hour, date.getTime().getTime(),
                          HSSFDateUtil.getJavaDate(excelDate).getTime());
         }
+        
+        // check 1900 and 1904 date windowing conversions
+        double excelDate = 36526.0;
+                 // with 1900 windowing, excelDate is Jan. 1, 2000
+                 // with 1904 windowing, excelDate is Jan. 2, 2004
+        GregorianCalendar cal = new GregorianCalendar(2000,0,1); // Jan. 1, 2000
+        Date dateIf1900 = cal.getTime();
+        cal.add(GregorianCalendar.YEAR,4); // now Jan. 1, 2004
+        cal.add(GregorianCalendar.DATE,1); // now Jan. 2, 2004
+        Date dateIf1904 = cal.getTime();
+        // 1900 windowing
+        assertEquals("Checking 1900 Date Windowing",
+                        dateIf1900.getTime(),
+                           HSSFDateUtil.getJavaDate(excelDate,false).getTime());
+        // 1904 windowing
+        assertEquals("Checking 1904 Date Windowing",
+                        dateIf1904.getTime(),
+                           HSSFDateUtil.getJavaDate(excelDate,true).getTime());
     }
 }
-- 
2.39.5