Fix issues with timestamp in AppNotificationBuilder

dev/AppNotifications/AppNotificationBuilder/AppNotificationBuilder.cpp

@@ -38,13 +38,16 @@ namespace winrt::Microsoft::Windows::AppNotifications::Builder::implementation
     winrt::Microsoft::Windows::AppNotifications::Builder::AppNotificationBuilder AppNotificationBuilder::SetTimeStamp(winrt::Windows::Foundation::DateTime const& value)
     {
         auto seconds{ winrt::clock::to_time_t(value) };
-        struct tm buf{};
-        gmtime_s(&buf, &seconds);
+        struct tm buf {};
+        localtime_s(&buf, &seconds);
 
         std::wstringstream buffer;
-        buffer << std::put_time(&buf, L"%FT%T");
+        buffer << std::put_time(&buf, L"%FT%T%z");
+
+        std::wstring timestamp{ buffer.str() };
+        timestamp.insert(timestamp.size() - c_offsetIndexValue, L":");
+        m_timeStamp = wil::str_printf<std::wstring>(L" displayTimestamp='%ls'", timestamp.c_str());
 
-        m_timeStamp = wil::str_printf<std::wstring>(L" displayTimestamp='%lsZ'", buffer.str().c_str());
         return *this;
     }
 

dev/AppNotifications/AppNotificationBuilder/AppNotificationBuilderUtility.h

@@ -14,6 +14,7 @@ constexpr uint8_t c_maxButtonElements{ 5 };
 constexpr size_t c_maxEncodingSize{ 3 };
 constexpr uint8_t c_maxTextInputElements{ 5 };
 constexpr uint8_t c_maxSelectionElements{ 5 };
+constexpr uint8_t c_offsetIndexValue{ 2 };
 
 namespace AppNotificationBuilder
 {

test/AppNotificationBuilderTests/APITests.cpp

@@ -57,16 +57,19 @@ namespace Test::AppNotification::Builder
 
         TEST_METHOD(AppNotificationBuilderSetTimeStamp)
         {
-            std::wstring dateTimeFormat{ L"%d/%m/%Y %H:%M:%S" };
-            std::wistringstream ss(L"22/12/2016 01:12:10");
+            auto time{ winrt::Windows::Foundation::DateTime::clock::now() };
+            auto builder{ winrt::AppNotificationBuilder().SetTimeStamp(time) };
 
             struct tm dateTime {};
-            ss >> std::get_time(&dateTime, dateTimeFormat.c_str());
-            std::time_t time{ mktime(&dateTime) };
-            auto timeStamp{ winrt::clock::from_time_t(time) };
+            auto timeAsTimeT{ winrt::clock::to_time_t(time) };
+            localtime_s(&dateTime, &timeAsTimeT);
 
-            auto builder{ winrt::AppNotificationBuilder().SetTimeStamp(timeStamp) };
-            auto expected{ L"<toast displayTimestamp='2016-12-22T09:12:10Z'><visual><binding template='ToastGeneric'></binding></visual></toast>" };
+            std::wstringstream buffer;
+            buffer << std::put_time(&dateTime, L"%FT%T%z");
+
+            std::wstring expectedTimestamp{ buffer.str() };
+            expectedTimestamp.insert(expectedTimestamp.size() - c_offsetIndexValue, L":");
+            std::wstring expected{ wil::str_printf<std::wstring>(L"<toast displayTimestamp='%ls'><visual><binding template='ToastGeneric'></binding></visual></toast>", expectedTimestamp.c_str()) };
 
             VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
         }

test/AppNotificationBuilderTests/pch.h

@@ -11,14 +11,17 @@
 #include <sddl.h>
 #include <appmodel.h>
 
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <wil/resource.h>
+#include <wil/stl.h>
 #include <wil/result.h>
 #include <wil/cppwinrt.h>
 #include <wil/token_helpers.h>
-#include <wil/resource.h>
 #include <wrl.h>
 #include <WexTestClass.h>
 
-#include <string>
 #include <sstream>
 #include <iomanip>