Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conversion of dates from C# to V8 #76

Merged
merged 1 commit into from
Mar 20, 2019
Merged

Fix conversion of dates from C# to V8 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions Source/Noesis.Javascript/JavascriptInterop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,6 @@ double GetDateComponent(Isolate* isolate, Handle<Date> date, const char* compone
return componentValue->NumberValue(isolate->GetCurrentContext()).ToChecked();
}

void SetDateComponent(Isolate* isolate, Handle<Date> date, const char* component, double value)
{
auto getComponent = date->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, component)).ToLocalChecked().As<Function>();
Handle<Value> parameters[] = { JavascriptInterop::ConvertToV8(value) };
getComponent->Call(date, 1, parameters);
}

System::DateTime^ JavascriptInterop::ConvertDateFromV8(Handle<Date> date)
{
auto isolate = JavascriptContext::GetCurrentIsolate();
Expand All @@ -412,18 +405,22 @@ Handle<Date> JavascriptInterop::ConvertDateTimeToV8(System::DateTime^ dateTime)
auto isolate = JavascriptContext::GetCurrentIsolate();
EscapableHandleScope handleScope(isolate);

auto date = v8::Date::New(isolate->GetCurrentContext(), SystemInterop::ConvertFromSystemDateTime(dateTime)).ToLocalChecked().As<Date>();
if (dateTime->Kind == System::DateTimeKind::Utc)
return handleScope.Escape(date);

SetDateComponent(isolate, date, "setFullYear", dateTime->Year);
SetDateComponent(isolate, date, "setMonth", dateTime->Month - 1);
SetDateComponent(isolate, date, "setDate", dateTime->Day);
SetDateComponent(isolate, date, "setHours", dateTime->Hour);
SetDateComponent(isolate, date, "setMinutes", dateTime->Minute);
SetDateComponent(isolate, date, "setSeconds", dateTime->Second);
SetDateComponent(isolate, date, "setMilliseconds", dateTime->Millisecond);
return handleScope.Escape(date);
return handleScope.Escape(v8::Date::New(isolate->GetCurrentContext(), SystemInterop::ConvertFromSystemDateTime(dateTime)).ToLocalChecked().As<Date>());

auto year = JavascriptInterop::ConvertToV8(dateTime->Year);
auto month = JavascriptInterop::ConvertToV8(dateTime->Month - 1);
auto day = JavascriptInterop::ConvertToV8(dateTime->Day);
auto hour = JavascriptInterop::ConvertToV8(dateTime->Hour);
auto minute = JavascriptInterop::ConvertToV8(dateTime->Minute);
auto second = JavascriptInterop::ConvertToV8(dateTime->Second);
auto millisecond = JavascriptInterop::ConvertToV8(dateTime->Millisecond);

auto globalObj = isolate->GetCurrentContext()->Global();
auto dateConstructor = Local<Function>::Cast(globalObj->Get(String::NewFromUtf8(isolate, "Date")));
Handle<Value> parameters[] = { year, month, day, hour, minute, second, millisecond };

return handleScope.Escape(dateConstructor->NewInstance(isolate->GetCurrentContext(), 7, parameters).ToLocalChecked().As<Date>());
}

////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
83 changes: 81 additions & 2 deletions Tests/Noesis.Javascript.Tests/DateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ο»Ώusing System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using FluentAssertions;
using System.Collections.Generic;
using System.Linq;

namespace Noesis.Javascript.Tests
{
Expand Down Expand Up @@ -115,8 +117,7 @@ public void SetDateTimeLocal_DateWhereTimezoneDatabaseIsImportant()
_context.Run("val.getSeconds()").Should().BeOfType<int>().Which.Should().Be(0);
}

[TestMethod]
[Ignore]
//[TestMethod]
public void SetAndReadDateTimeUtc_DateWhereTimezoneDatabaseIsImportant()
{
var dateTime = new DateTime(1978, 6, 15, 0, 0, 0, DateTimeKind.Utc);
Expand All @@ -126,6 +127,26 @@ public void SetAndReadDateTimeUtc_DateWhereTimezoneDatabaseIsImportant()
dateFromV8.ToUniversalTime().Should().Be(dateTime); // this cannot work without an external dependency like NodaTime
}

//[TestMethod]
public void SetAndReadDateTimeUtc_EdgeCaseOfAMonthWith30Days()
{
var dateTime = new DateTime(1967, 4, 1, 0, 0, 0, DateTimeKind.Utc);
_context.SetParameter("val", dateTime);

var dateFromV8 = (DateTime) _context.Run("val");
dateFromV8.ToUniversalTime().Should().Be(dateTime); // this cannot work without an external dependency like NodaTime
}

//[TestMethod]
public void SetAndReadDateTimeUtc_LeapYear()
{
var dateTime = new DateTime(1972, 2, 29, 0, 0, 0, DateTimeKind.Utc);
_context.SetParameter("val", dateTime);

var dateFromV8 = (DateTime) _context.Run("val");
dateFromV8.ToUniversalTime().Should().Be(dateTime); // this cannot work without an external dependency like NodaTime
}

[TestMethod]
public void SetAndReadDateTimeLocal_DateWhereTimezoneDatabaseIsImportant()
{
Expand All @@ -135,6 +156,24 @@ public void SetAndReadDateTimeLocal_DateWhereTimezoneDatabaseIsImportant()
_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void SetAndReadDateTimeLocal_EdgeCaseOfAMonthWith30Days()
{
var dateTime = new DateTime(1967, 4, 1, 0, 0, 0, DateTimeKind.Local);
_context.SetParameter("val", dateTime);

_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void SetAndReadDateTimeLocal_LeapYear()
{
var dateTime = new DateTime(1972, 2, 29, 0, 0, 0, DateTimeKind.Local);
_context.SetParameter("val", dateTime);

_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void SetAndReadDateTimeUnspecified_DateWhereTimezoneDatabaseIsImportant()
{
Expand All @@ -144,11 +183,51 @@ public void SetAndReadDateTimeUnspecified_DateWhereTimezoneDatabaseIsImportant()
_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void SetAndReadDateTimeUnspecified_EdgeCaseOfAMonthWith30Days()
{
var dateTime = new DateTime(1967, 4, 1);
_context.SetParameter("val", dateTime);

_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void SetAndReadDateTimeUnspecified_LeapYear()
{
var dateTime = new DateTime(1972, 2, 29);
_context.SetParameter("val", dateTime);

_context.Run("val").Should().Be(dateTime);
}

[TestMethod]
public void CreateFixedDateInJavaScript_DateWhereTimezoneDatabaseIsImportant()
{
DateTime dateAsReportedByV8 = (DateTime) _context.Run("new Date(1978, 5, 15)");
dateAsReportedByV8.Should().Be(new DateTime(1978, 6, 15));
}

[TestMethod]
public void SetAndReadDateTimeLocal_DateRange()
{
var startDate = new DateTime(1900, 1, 1, 0, 0, 0, DateTimeKind.Local);
var endDate = new DateTime(2100, 1, 1, 0, 0, 0, DateTimeKind.Local);
var totalDays = (endDate - startDate).TotalDays;

var errorDates = new List<string>();

for (var i = 0; i < totalDays; i++)
{
var date = startDate.AddDays(i);
_context.SetParameter("val", date);
var result = (DateTime) _context.Run("val");
if (result != date)
errorDates.Add($"Expected {date}, but got {result}");
}

if (errorDates.Any())
Assert.Fail(string.Join("\n", errorDates));
}
}
}