Fixes OData#534: Add test cases to verify the Error messages for Data…

…TimeOffset validation
uffelauesen · Jan 2, 2025 · b06ccb3 · b06ccb3
1 parent 843ac15
commit b06ccb3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AssertExtensions.cs b/test/FunctionalTests/Microsoft.OData.Core.Tests/AssertExtensions.cs
@@ -33,10 +33,11 @@ public static void DoesNotThrow(this Action testCode)
         /// <typeparam name="T">The type of the exception expected to be thrown</typeparam>
         /// <param name="testCode">A delegate to the code to be tested</param>
         /// <param name="errorMessage">The expected error message.</param>
-        public static void Throws<T>(this Action testCode, string errorMessage) where T : Exception
+        public static T Throws<T>(this Action testCode, string errorMessage) where T : Exception
         {
             T exception = Assert.Throws<T>(testCode);
             Assert.Equal(errorMessage, exception.Message);
+            return exception;
         }
 
         /// <summary>
@@ -45,10 +46,11 @@ public static void Throws<T>(this Action testCode, string errorMessage) where T
         /// <typeparam name="T">The type of the exception expected to be thrown</typeparam>
         /// <param name="testCode">An async delegate to the code to be tested</param>
         /// <param name="errorMessage">The expected error message.</param>
-        public static async Task ThrowsAsync<T>(this Func<Task> testCode, string errorMessage) where T : Exception
+        public static async Task<T> ThrowsAsync<T>(this Func<Task> testCode, string errorMessage) where T : Exception
         {
             T exception = await Assert.ThrowsAsync<T>(testCode);
             Assert.Equal(errorMessage, exception.Message);
+            return exception;
         }
 
         /// <summary>

diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs b/test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs
@@ -221,11 +221,13 @@ public void TestDateTimeOffsetConvertFromUriLiteral()
         {
             // Date is not in right format
             Action action = () => ODataUriUtils.ConvertFromUriLiteral("1997-07-1T12:12:12-11:00", ODataVersion.V4);
-            action.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-1T12:12:12-11:00"));
+            ODataException exception = action.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-1T12:12:12-11:00"));
+            Assert.Equal("The string '1997-07-1T12:12:12-11:00' is not a valid AllXsd value.", exception.InnerException.Message);
 
             // Time is not in right format
             Action action2 = () => ODataUriUtils.ConvertFromUriLiteral("1997-07-01T12:12:2-11:00", ODataVersion.V4);
-            action2.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:2-11:00"));
+            exception = action2.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:2-11:00"));
+            Assert.Equal("The string '1997-07-01T12:12:2-11:00' is not a valid AllXsd value.", exception.InnerException.Message);
 
             // Date and Time separator is incorrect
             // Call from DataUriUtils, it will parse till blank space which is a correct Date
@@ -247,11 +249,13 @@ public void TestDateTimeOffsetConvertFromUriLiteral()
 
             // Timezone is not within limit
             Action action7 = () => ODataUriUtils.ConvertFromUriLiteral("1997-07-01T12:12:02-15:00", ODataVersion.V4);
-            action7.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:02-15:00"));
+            exception = action7.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:02-15:00"));
+            Assert.Equal("Offset must be within plus or minus 14 hours. (Parameter 'offset')", exception.InnerException.Message);
 
             // Timezone is not specified
             Action action8 = () => ODataUriUtils.ConvertFromUriLiteral("1997-07-01T12:12:02", ODataVersion.V4);
-            action8.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:02"));
+            exception = action8.Throws<ODataException>(Error.Format(SRResources.UriUtils_DateTimeOffsetInvalidFormat, "1997-07-01T12:12:02"));
+            Assert.Equal("The time zone information is missing on the DateTimeOffset value '1997-07-01T12:12:02'. A DateTimeOffset value must contain the time zone information.", exception.InnerException.Message);
         }
 
         [Fact]