chore: migrates to newer TimeOnly and DateOnly APIs

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

test/Microsoft.OpenAPI.OData.Reader.Tests/Vocabulary/Capabilities/CustomParameterTests.cs

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System;
 using System.IO;
 using System.Xml;
 using Microsoft.OData.Edm;
@@ -29,7 +30,7 @@ public void InitializeCustomParameterWithRecordSuccess()
                 new EdmPropertyConstructor("ExampleValues",
                     new EdmCollectionExpression(
                         new EdmRecordExpression(new EdmPropertyConstructor("Value", new EdmStringConstant("html"))),
-                        new EdmRecordExpression(new EdmPropertyConstructor("Value", new EdmTimeOfDayConstant(new TimeOfDay(3, 4, 5, 6)))))));
+                        new EdmRecordExpression(new EdmPropertyConstructor("Value", new EdmTimeOfDayConstant(new TimeOnly(3, 4, 5, 6)))))));
 
             // Act
             CustomParameter parameter = new CustomParameter();
@@ -102,7 +103,7 @@ private static void VerifyCustomParameter(CustomParameter parameter)
             value = parameter.ExampleValues[1];
             Assert.Null(value.Description);
             Assert.NotNull(value.Value);
-            Assert.Equal(new TimeOfDay(3, 4, 5, 6), value.Value.Value);
+            Assert.Equal(new TimeOnly(3, 4, 5, 6).ToString("HH:mm:ss.fffffff"), value.Value.Value.ToString());
         }
 
         private IEdmModel GetEdmModel(string annotation)

test/Microsoft.OpenAPI.OData.Reader.Tests/Vocabulary/Capabilities/RevisionRecordTests.cs

@@ -43,8 +43,8 @@ public void InitializeWithDeprecatedRevisionsTypeRecordSuccess()
     {
         // Arrange
         IEdmRecordExpression record = new EdmRecordExpression(
-            new EdmPropertyConstructor("Date", new EdmDateConstant(new Date(2021, 8, 24))),
-            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new Date(2021, 10, 24))),
+            new EdmPropertyConstructor("Date", new EdmDateConstant(new DateOnly(2021, 8, 24))),
+            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new DateOnly(2021, 10, 24))),
             new EdmPropertyConstructor("Kind", new EdmEnumMemberExpression(deprecatedValue)), 
             new EdmPropertyConstructor("Description", new EdmStringConstant("The identityProvider API is deprecated and will stop returning data on March 2023. Please use the new identityProviderBase API.")),
             new EdmPropertyConstructor("Version", new EdmStringConstant("2021-05/test")));
@@ -71,15 +71,15 @@ public void WorksForAllKinds()
     {
         // Arrange
         IEdmRecordExpression record1 = new EdmRecordExpression(
-            new EdmPropertyConstructor("Date", new EdmDateConstant(new Date(2021, 8, 24))),
-            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new Date(2021, 10, 24))),
+            new EdmPropertyConstructor("Date", new EdmDateConstant(new DateOnly(2021, 8, 24))),
+            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new DateOnly(2021, 10, 24))),
             new EdmPropertyConstructor("Kind", new EdmEnumMemberExpression(addedValue)), 
             new EdmPropertyConstructor("Description", new EdmStringConstant("The identityProvider API is deprecated and will stop returning data on March 2023. Please use the new identityProviderBase API.")),
             new EdmPropertyConstructor("Version", new EdmStringConstant("2021-05/test")));
 
         IEdmRecordExpression record2 = new EdmRecordExpression(
-            new EdmPropertyConstructor("Date", new EdmDateConstant(new Date(2023, 3, 2))),
-            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new Date(2023, 05, 30))),
+            new EdmPropertyConstructor("Date", new EdmDateConstant(new DateOnly(2023, 3, 2))),
+            new EdmPropertyConstructor("RemovalDate", new EdmDateConstant(new DateOnly(2023, 05, 30))),
             new EdmPropertyConstructor("Kind", new EdmEnumMemberExpression(deprecatedValue)),
             new EdmPropertyConstructor("Description", new EdmStringConstant("Private preview test.")),
             new EdmPropertyConstructor("Version", new EdmStringConstant("2023-03/test")));

test/Microsoft.OpenAPI.OData.Reader.Tests/Vocabulary/Core/PrimitiveExampleValueTests.cs

@@ -69,8 +69,8 @@ public void InitializeWithPrimitiveValueRecordSuccess()
                 new object[] { @"Int=""42""", (long)42 },
                 new object[] { @"Bool=""true""", true },
                 new object[] { @"Bool=""false""", false },
-                new object[] { @"TimeOfDay=""15:38:25.1090000""", new TimeOfDay(15, 38, 25, 109) },
-                new object[] { @"Date=""2014-10-13""", new Date(2014, 10, 13) },
+                new object[] { @"TimeOfDay=""15:38:25.1090000""", new TimeOnly(15, 38, 25, 109) },
+                new object[] { @"Date=""2014-10-13""", new DateOnly(2014, 10, 13) },
                 new object[] { @"Duration=""PT0S""", new TimeSpan() },
                 // new object[] { @"Binary=""AQ==""", new byte[] { 1 }, }, has problem in ODL?
                 new object[] { @"Float=""3.14""", 3.14 },
@@ -106,7 +106,18 @@ public void PrimitiveExamplevalueInitializeWorksForPrimitiveData(string data, ob
             Assert.NotNull(value);
             Assert.Equal("Primitive example value", value.Description);
             Assert.NotNull(value.Value);
-            Assert.Equal(except, value.Value.Value);
+            switch (except)
+            {
+              case DateOnly dateOnly:
+                Assert.Equal(dateOnly.ToString("yyyy-MM-dd"), value.Value.Value.ToString());
+                break;
+              case TimeOnly timeOnly:
+                Assert.Equal(timeOnly.ToString("HH:mm:ss.fffffff"), value.Value.Value.ToString());
+                break;
+              default:
+                Assert.Equal(except, value.Value.Value);
+              break;
+            }
         }
 
         private IEdmModel GetEdmModel(string annotation)