Skip to content

Commit bf8f488

Browse files
authored
fix tests that involve dates fail when OS culture has 24 hours format (#506)
* fix tests that involve dates fail when OS culture has 24 hours format * update changelog * Update CHANGELOG.md Move merge 'fix tests that involve dates fail when OS culture has 24 hours format' to next unpublished version
1 parent b237a2e commit bf8f488

File tree

11 files changed

+25
-22
lines changed

11 files changed

+25
-22
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## 7.12.0
44

5+
Merged [Pull Request](https://github.com/MethodsAndPractices/vsteam/pull/506) from [Miguel Nieto](https://github.com/mnieto) the following:
6+
- fix tests that involve dates fail when OS culture has 24 hours format
7+
58
Merged [Pull Request](https://github.com/MethodsAndPractices/vsteam/pull/495) from [Seva Alekseyev](https://github.com/sevaa) the following:
69
- Added the command Set-VSTeamVariableGroupVariable, which assigns a value to a single variable in a variable group,
710
creating one if needed. [#423](https://github.com/MethodsAndPractices/vsteam/issues/423)

Tests/library/CommonTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void MoveProperties_StringToDateTime()
3232
Common.MoveProperties(target, source);
3333

3434
// Assert
35-
Assert.AreEqual("8/27/2020 10:37:32 am", target.CreatedOn.ToUniversalTime().ToString("M/d/yyyy h:mm:ss tt").ToLower());
35+
Assert.AreEqual("8/27/2020 10:37:32 am", target.CreatedOn.ToUniversalTime().ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower());
3636
}
3737
}
3838
}

Tests/library/Provider/BuildDefinitionTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void BuildDefinition_Constructor_2017_Git()
3434
Assert.AreEqual("projectCollection", actual.JobAuthorizationScope, "JobAuthorizationScope");
3535
Assert.AreEqual("$(date:yyyyMMdd)$(rev:.r)", actual.BuildNumberFormat, "BuildNumberFormat");
3636

37-
Assert.AreEqual("8/23/2020 3:12:41 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
37+
Assert.AreEqual("8/23/2020 3:12:41 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
3838

3939
Assert.IsNotNull(actual.Options, "Options");
4040
Assert.AreEqual(4, actual.Options.Count, "Options.Count");
@@ -103,7 +103,7 @@ public void BuildDefinition_Constructor_2017_Tfvc()
103103
Assert.IsNull(actual.GitRepository, "GitRepository");
104104
Assert.IsNotNull(actual.RetentionRules, "RetentionRules");
105105

106-
Assert.AreEqual("8/23/2020 10:30:31 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
106+
Assert.AreEqual("8/23/2020 10:30:31 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
107107

108108
Assert.AreEqual(5, actual.JobCancelTimeoutInMinutes, "JobCancelTimeoutInMinutes");
109109
Assert.AreEqual("projectCollection", actual.JobAuthorizationScope, "JobAuthorizationScope");
@@ -145,7 +145,7 @@ public void BuildDefinition_Constructor_2018()
145145
Assert.IsNotNull(actual.GitRepository, "GitRepository");
146146
Assert.IsNotNull(actual.RetentionRules, "RetentionRules");
147147

148-
Assert.AreEqual("8/23/2020 3:16:22 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
148+
Assert.AreEqual("8/23/2020 3:16:22 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
149149

150150
Assert.AreEqual(5, actual.JobCancelTimeoutInMinutes, "JobCancelTimeoutInMinutes");
151151
Assert.AreEqual("projectCollection", actual.JobAuthorizationScope, "JobAuthorizationScope");
@@ -205,7 +205,7 @@ public void BuildDefinition_Constructor_AzD_Classic()
205205

206206
Assert.IsNull(actual.Demands, "Demands");
207207

208-
Assert.AreEqual("9/16/2019 2:34:16 am", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
208+
Assert.AreEqual("9/16/2019 2:34:16 am", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
209209

210210
// Not on this build def
211211
Assert.AreEqual(null, actual.BuildNumberFormat, "BuildNumberFormat");
@@ -266,7 +266,7 @@ public void BuildDefinition_Constructor_AzD_YAML()
266266

267267
Assert.IsNull(actual.Demands, "Demands");
268268

269-
Assert.AreEqual("9/25/2019 8:55:54 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
269+
Assert.AreEqual("9/25/2019 8:55:54 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
270270

271271
// Not on this build def
272272
Assert.AreEqual(0, actual.JobCancelTimeoutInMinutes, "JobCancelTimeoutInMinutes");

Tests/library/Provider/BuildTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void Build_Constructor()
3030
Assert.AreEqual("PTracker-CI", actual.DefinitionName, "DefinitionName");
3131
Assert.AreEqual("Donovan Brown", actual.RequestedByUser, "RequestedByUser");
3232
Assert.AreEqual("Donovan Brown", actual.RequestedForUser, "RequestedForUser");
33-
Assert.AreEqual("11/14/2019 12:49:37 am", actual.StartTime?.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "startTime");
33+
Assert.AreEqual("11/14/2019 12:49:37 am", actual.StartTime?.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "startTime");
3434
Assert.AreEqual("Microsoft.VisualStudio.Services.ReleaseManagement", actual.LastChangedByUser, "LastChangedByUser");
3535

3636
Assert.IsNotNull(actual.TriggerInfo, "TriggerInfo");
@@ -84,7 +84,7 @@ public void Build_Constructor_ById()
8484
Assert.AreEqual("Team Module-CI (1)", actual.DefinitionName, "DefinitionName");
8585
Assert.AreEqual("Donovan Brown", actual.RequestedByUser, "RequestedByUser");
8686
Assert.AreEqual("Donovan Brown", actual.RequestedForUser, "RequestedForUser");
87-
Assert.AreEqual("9/23/2020 3:44:45 pm", actual.StartTime?.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "startTime");
87+
Assert.AreEqual("9/23/2020 3:44:45 pm", actual.StartTime?.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "startTime");
8888
Assert.AreEqual("Microsoft.VisualStudio.Services.TFS", actual.LastChangedByUser, "LastChangedByUser");
8989

9090
Assert.IsNotNull(actual.TriggerInfo, "TriggerInfo");

Tests/library/Provider/ExtensionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void Extension_Constructor()
2727
Assert.AreEqual("none", actual.InstallState.Flags, "InstallState.Flags");
2828
Assert.IsNotNull(actual.InstallState.InternalObject, "InstallState.InternalObject");
2929
Assert.IsTrue(actual.InstallState.ToString().StartsWith("Flags: none, Last Updated: "), "InstallState.ToString()");
30-
Assert.AreEqual("8/10/2020 8:31:07 pm", actual.InstallState.LastUpdated.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "InstallState.LastUpdated");
30+
Assert.AreEqual("8/10/2020 8:31:07 pm", actual.InstallState.LastUpdated.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "InstallState.LastUpdated");
3131
}
3232
}
3333
}

Tests/library/Provider/GitCommitRefTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void GitCommitRefTests_Constructor()
3030
Assert.IsNotNull(target.Committer, "Committer");
3131
Assert.AreEqual("Donovan Brown", target.Committer.Name, "Committer.Name");
3232
Assert.AreEqual("Test@Test.com", target.Committer.Email, "Committer.Email");
33-
Assert.AreEqual("8/8/2019 8:58:58 pm", target.Committer.Date.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "Committer.Date");
33+
Assert.AreEqual("8/8/2019 8:58:58 pm", target.Committer.Date.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "Committer.Date");
3434
}
3535
}
3636
}

Tests/library/Provider/JobRequestTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public void JobRequest_Constructor_Completed()
2727
Assert.AreEqual("PTracker-CD", target.Pipeline, "Pipeline");
2828
Assert.AreEqual("------", target.DisplayMode, "DisplayMode");
2929
Assert.AreEqual(TimeSpan.Parse("00:10:58"), target.Duration, "Duration");
30-
Assert.AreEqual("11/14/2019 12:56:12 am", target.QueueTime.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "QueueTime");
31-
Assert.AreEqual("11/14/2019 12:56:15 am", target.StartTime?.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "StartTime");
32-
Assert.AreEqual("11/14/2019 1:07:13 am", target.FinishTime?.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "FinishTime");
33-
Assert.AreEqual("11/14/2019 12:56:12 am", target.AssignedTime?.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "AssignedTime");
30+
Assert.AreEqual("11/14/2019 12:56:12 am", target.QueueTime.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "QueueTime");
31+
Assert.AreEqual("11/14/2019 12:56:15 am", target.StartTime?.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "StartTime");
32+
Assert.AreEqual("11/14/2019 1:07:13 am", target.FinishTime?.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "FinishTime");
33+
Assert.AreEqual("11/14/2019 12:56:12 am", target.AssignedTime?.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "AssignedTime");
3434
}
3535

3636
[TestMethod]

Tests/library/Provider/PackageVersionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void PackageVersion_Constructor()
2626
Assert.AreEqual("@DonovanBrown", actual.Author, "author");
2727
Assert.AreEqual(expectedDesc, actual.Description, "Description");
2828
Assert.AreEqual("998abe34-23de-0000-9668b73891e2dada", actual.Id, "Id");
29-
Assert.AreEqual("9/7/2018 1:33:39 pm", actual.PublishDate.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "PublishDate");
29+
Assert.AreEqual("9/7/2018 1:33:39 pm", actual.PublishDate.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "PublishDate");
3030
}
3131
}
3232
}

Tests/library/Provider/ReleaseDefinitionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public void ReleaseDefinition_Constructor()
4343
Assert.AreEqual("", actual.ReleaseNameFormat, "ReleaseNameFormat");
4444
Assert.AreEqual("Chuck Reinhart", actual.CreatedByUser, "CreatedByUser");
4545
Assert.AreEqual("ReleaseDefinition", actual.ResourceType, "ResourceType");
46-
Assert.AreEqual("12/11/2018 4:48:42 am", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
47-
Assert.AreEqual("12/11/2018 4:48:42 am", actual.ModifiedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "ModifiedOn");
46+
Assert.AreEqual("12/11/2018 4:48:42 am", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
47+
Assert.AreEqual("12/11/2018 4:48:42 am", actual.ModifiedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "ModifiedOn");
4848
Assert.AreEqual("https://vsrm.dev.azure.com/fabrikam/00000000-0000-0000-0000-000000000000/_apis/Release/definitions/40", actual.Url, "Url");
4949
}
5050

@@ -82,8 +82,8 @@ public void ReleaseDefinition_Constructor_NoEnvs()
8282
Assert.AreEqual(null, actual.Description, "Description");
8383
Assert.AreEqual("Donovan Brown", actual.CreatedByUser, "CreatedByUser");
8484
Assert.AreEqual("Release-$(rev:r)", actual.ReleaseNameFormat, "ReleaseNameFormat");
85-
Assert.AreEqual("3/24/2019 4:46:08 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn");
86-
Assert.AreEqual("9/16/2019 2:32:37 pm", actual.ModifiedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "ModifiedOn");
85+
Assert.AreEqual("3/24/2019 4:46:08 pm", actual.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn");
86+
Assert.AreEqual("9/16/2019 2:32:37 pm", actual.ModifiedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "ModifiedOn");
8787
Assert.AreEqual("https://vsrm.dev.azure.com/Test/00000000-0000-0000-0000-000000000000/_apis/Release/definitions/2", actual.Url, "Url");
8888
}
8989
}

Tests/library/Provider/ReleaseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Release_Constructor()
3737

3838
Assert.AreEqual("Test@Test.com", target.ModifiedBy.UniqueName, "ModifiedBy.UniqueName");
3939
Assert.AreEqual("Donovan Brown", target.CreatedBy.DisplayName, "CreatedBy.DisplayName");
40-
Assert.AreEqual("11/14/2019 12:56:09 am", target.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn.ToString()");
40+
Assert.AreEqual("11/14/2019 12:56:09 am", target.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn.ToString()");
4141

4242
Assert.AreEqual("Donovan Brown", target.CreatedByUser, "CreatedByUser");
4343
Assert.AreEqual("Donovan Brown", target.ModifiedByUser, "ModifiedByUser");
@@ -66,7 +66,7 @@ public void Release_Constructor_Expand_Environments()
6666

6767
Assert.AreEqual("test@test.com", target.ModifiedBy.UniqueName, "ModifiedBy.UniqueName");
6868
Assert.AreEqual("Donovan Brown", target.CreatedBy.DisplayName, "CreatedBy.DisplayName");
69-
Assert.AreEqual("7/13/2019 3:49:31 pm", target.CreatedOn.ToString("M/d/yyyy h:mm:ss tt").ToLower(), "CreatedOn.ToString()");
69+
Assert.AreEqual("7/13/2019 3:49:31 pm", target.CreatedOn.ToString("M/d/yyyy h:mm:ss tt", System.Globalization.CultureInfo.InvariantCulture).ToLower(), "CreatedOn.ToString()");
7070
}
7171

7272
[TestMethod]

0 commit comments

Comments
 (0)