1 files changed, 36 insertions, 7 deletions
diff --git a/date_test.go b/date_test.go
index a1bfbf4..709fb00 100644
--- a/date_test.go
+++ b/date_test.go
@@ -13,17 +13,40 @@ type dateTest struct {
 	GoValue    time.Time
 }
 
+var trueExpectedDateList = []dateTest{
+	{0.0000000000000000, time.Date(1899, time.December, 30, 0, 0, 0, 0, time.UTC)},
+	{25569.000000000000, time.Unix(0, 0).UTC()},
+
+	// Expected values extracted from real xlsx file
+	{1.0000000000000000, time.Date(1900, time.January, 1, 0, 0, 0, 0, time.UTC)},
+	{1.0000115740740740, time.Date(1900, time.January, 1, 0, 0, 1, 0, time.UTC)},
+	{1.0006944444444446, time.Date(1900, time.January, 1, 0, 1, 0, 0, time.UTC)},
+	{1.0416666666666667, time.Date(1900, time.January, 1, 1, 0, 0, 0, time.UTC)},
+	{2.0000000000000000, time.Date(1900, time.January, 2, 0, 0, 0, 0, time.UTC)},
+	{43269.000000000000, time.Date(2018, time.June, 18, 0, 0, 0, 0, time.UTC)},
+	{43542.611111111109, time.Date(2019, time.March, 18, 14, 40, 0, 0, time.UTC)},
+	{401769.00000000000, time.Date(3000, time.January, 1, 0, 0, 0, 0, time.UTC)},
+}
+
 func TestTimeToExcelTime(t *testing.T) {
-	trueExpectedInputList := []dateTest{
-		{0.0, time.Date(1899, 12, 30, 0, 0, 0, 0, time.UTC)},
-		{25569.0, time.Unix(0, 0)},
-		{43269.0, time.Date(2018, 6, 18, 0, 0, 0, 0, time.UTC)},
-		{401769.0, time.Date(3000, 1, 1, 0, 0, 0, 0, time.UTC)},
+	for i, test := range trueExpectedDateList {
+		t.Run(fmt.Sprintf("TestData%d", i+1), func(t *testing.T) {
+			assert.Equalf(t, test.ExcelValue, timeToExcelTime(test.GoValue),
+				"Time: %s", test.GoValue.String())
+		})
 	}
+}
 
-	for i, test := range trueExpectedInputList {
+func TestTimeToExcelTime_Timezone(t *testing.T) {
+	msk, err := time.LoadLocation("Europe/Moscow")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	for i, test := range trueExpectedDateList {
 		t.Run(fmt.Sprintf("TestData%d", i+1), func(t *testing.T) {
-			assert.Equal(t, test.ExcelValue, timeToExcelTime(test.GoValue))
+			assert.Panics(t, func() {
+				timeToExcelTime(test.GoValue.In(msk))
+			}, "Time: %s", test.GoValue.String())
 		})
 	}
 }
@@ -43,3 +66,9 @@ func TestTimeFromExcelTime(t *testing.T) {
 		})
 	}
 }
+
+func TestTimeFromExcelTime_1904(t *testing.T) {
+	shiftJulianToNoon(1, -0.6)
+	timeFromExcelTime(61, true)
+	timeFromExcelTime(62, true)
+}