From 1c950dd45a33828b3f54402984f64990f51d87e4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Feb 2020 20:06:53 +0000 Subject: [PATCH] --- DataList/DataListFiltering.cs | 188 +++++++++++++++++----------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index a97f038..3fe21e7 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -101,8 +101,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1968, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1968, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1968, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1968, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -110,8 +110,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -137,7 +137,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpEquality; - FilterItem.value = new DateTime(1968, 3, 12, 10, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1968, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -212,8 +212,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -221,8 +221,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -248,7 +248,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpGreaterThan; - FilterItem.value = new DateTime(1970, 3, 12, 9, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1970, 3, 12, 9, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -323,8 +323,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -332,8 +332,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -359,7 +359,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpGreaterThanOrEqualTo; - FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -433,8 +433,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -442,8 +442,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -469,7 +469,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpLessThan; - FilterItem.value = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -537,8 +537,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -546,8 +546,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -573,7 +573,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpLessThanOrEqualTo; - FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -641,8 +641,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -650,8 +650,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); - w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToUniversalTime(); - w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToUniversalTime(); + w.startDate = new DateTime(1970, 4, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(1970, 4, 10, 11, 0, 0).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -677,7 +677,7 @@ same as the server does but in a central location here for all tests to use. dynamic FilterItem = new JObject(); FilterItem.fld = "widgetstartdate"; FilterItem.op = Util.OpNotEqual; - FilterItem.value = new DateTime(1970, 4, 10, 10, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1970, 4, 10, 10, 0, 0).ToOffsetAdjustedUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json @@ -1367,8 +1367,8 @@ same as the server does but in a central location here for all tests to use. w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -1377,8 +1377,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //Put it right at midnight this month to ensure boundaries are respected - w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -1474,8 +1474,8 @@ same as the server does but in a central location here for all tests to use. w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); //Put it right at midnight this month to ensure boundaries are respected - w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -1484,8 +1484,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -2543,8 +2543,8 @@ same as the server does but in a central location here for all tests to use. //################################################################################## var FilterToken = TokenYearToDate; - InclusiveStartDate = new DateTime(DateTime.Now.Year, 1, 1, 00, 5, 00).ToUniversalTime(); - ExclusiveStartDate = new DateTime(DateTime.Now.Year - 1, 4, 1, 00, 5, 00).ToUniversalTime(); + InclusiveStartDate = new DateTime(DateTime.Now.Year, 1, 1, 00, 5, 00).ToOffsetAdjustedUniversalTime(); + ExclusiveStartDate = new DateTime(DateTime.Now.Year - 1, 4, 1, 00, 5, 00).ToOffsetAdjustedUniversalTime(); //################################################################################## @@ -2661,8 +2661,8 @@ same as the server does but in a central location here for all tests to use. //################################################################################## var FilterToken = TokenPast90Days; - InclusiveStartDate = DateTime.UtcNow.AddDays(-90).AddMinutes(5).ToUniversalTime(); - ExclusiveStartDate = DateTime.UtcNow.AddDays(-90).AddMinutes(-5).ToUniversalTime(); + InclusiveStartDate = DateTime.Now.AddDays(-90).AddMinutes(5).ToOffsetAdjustedUniversalTime(); + ExclusiveStartDate = DateTime.Now.AddDays(-90).AddMinutes(-5).ToOffsetAdjustedUniversalTime(); //################################################################################## @@ -2777,8 +2777,8 @@ same as the server does but in a central location here for all tests to use. //################################################################################## var FilterToken = TokenPast30Days; - InclusiveStartDate = DateTime.UtcNow.AddDays(-30).AddMinutes(5).ToUniversalTime(); - ExclusiveStartDate = DateTime.UtcNow.AddDays(-30).AddMinutes(-5).ToUniversalTime(); + InclusiveStartDate = DateTime.Now.AddDays(-30).AddMinutes(5).ToOffsetAdjustedUniversalTime(); + ExclusiveStartDate = DateTime.Now.AddDays(-30).AddMinutes(-5).ToOffsetAdjustedUniversalTime(); //################################################################################## @@ -2894,8 +2894,8 @@ same as the server does but in a central location here for all tests to use. //################################################################################## var FilterToken = TokenPast24Hours; - InclusiveStartDate = DateTime.UtcNow.AddHours(-24).AddMinutes(5).ToUniversalTime(); - ExclusiveStartDate = DateTime.UtcNow.AddHours(-24).AddMinutes(-5).ToUniversalTime(); + InclusiveStartDate = DateTime.Now.AddHours(-24).AddMinutes(5).ToOffsetAdjustedUniversalTime(); + ExclusiveStartDate = DateTime.Now.AddHours(-24).AddMinutes(-5).ToOffsetAdjustedUniversalTime(); //################################################################################## @@ -3014,8 +3014,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3024,8 +3024,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3120,8 +3120,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3130,8 +3130,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3227,8 +3227,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3237,8 +3237,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3335,8 +3335,8 @@ same as the server does but in a central location here for all tests to use. w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); //ToOffsetAdjustedUniversalTime - // w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - // w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + // w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + // w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); @@ -3349,8 +3349,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - // w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - // w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + // w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + // w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); @@ -3449,8 +3449,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3459,8 +3459,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3556,8 +3556,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3566,8 +3566,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3662,8 +3662,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3672,8 +3672,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3769,8 +3769,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3779,8 +3779,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3874,8 +3874,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3884,8 +3884,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -3979,8 +3979,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -3989,8 +3989,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -4085,8 +4085,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -4095,8 +4095,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); @@ -4190,8 +4190,8 @@ same as the server does but in a central location here for all tests to use. w.name = Util.Uniquify(WidgetNameStart); w.notes = "blah"; w.customFields = Util.WidgetRequiredCustomFieldsJsonString(); - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddHours(1).ToOffsetAdjustedUniversalTime(); ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -4200,8 +4200,8 @@ same as the server does but in a central location here for all tests to use. //Excluded widget w.name = Util.Uniquify(WidgetNameStart); //First day of this month minus 2 days equals second to last day of last month - w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToUniversalTime(); - w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime(); + w.startDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).ToOffsetAdjustedUniversalTime(); + w.endDate = new DateTime(DateTime.Today.Year, MonthNumberUnderTest, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToOffsetAdjustedUniversalTime(); a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());