Resolve failed errors

OData · Dec 30, 2024 · ee15ca2 · ee15ca2
1 parent e1450e1
commit ee15ca2
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 26 deletions.
diff --git a/...rosoft.OData.Client.E2E.Tests/Common/Server/PrimitiveKeys/PrimitiveKeyValuesDataSource.cs b/...rosoft.OData.Client.E2E.Tests/Common/Server/PrimitiveKeys/PrimitiveKeyValuesDataSource.cs
@@ -248,15 +248,10 @@ private void PopulateEdmTimes()
 
         private void PopulateEdmDateTimeOffsets()
         {
-            var CachedNow = DateTimeOffset.Now;
-            var CachedUtcNow = DateTimeOffset.UtcNow.AddDays(1);
-
             this.EdmDateTimeOffsets =
             [
                 new EdmDateTimeOffset { Id = DateTimeOffset.MinValue },
                 new EdmDateTimeOffset { Id = DateTimeOffset.MaxValue },
-                new EdmDateTimeOffset { Id = CachedNow },
-                new EdmDateTimeOffset { Id = CachedUtcNow },
             ];
         }
     }

diff --git a/...ft.OData.Client.E2E.Tests/PrimitiveTypesTests/Server/PrimitiveKeyValuesTestsController.cs b/...ft.OData.Client.E2E.Tests/PrimitiveTypesTests/Server/PrimitiveKeyValuesTestsController.cs
@@ -57,6 +57,7 @@ public IActionResult GetEdmBoolean([FromRoute] bool key)
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmInt16Set")]
     public IActionResult GetEdmInt16s()
     {
@@ -77,6 +78,7 @@ public IActionResult GetEdmInt16([FromRoute] short key)
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmInt32Set")]
     public IActionResult GetEdmInt32s()
     {
@@ -105,6 +107,7 @@ public IActionResult GetEdmInt64s()
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmInt64Set/$count")]
     public IActionResult GetEdmInt64sCount()
     {
@@ -133,6 +136,7 @@ public IActionResult GetEdmSingles()
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmSingleSet/$count")]
     public IActionResult GetEdmSinglesCount()
     {
@@ -195,6 +199,7 @@ public IActionResult GetEdmDecimal([FromRoute] decimal key)
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmDateTimeOffsetSet")]
     public IActionResult GetEdmDateTimeOffsets()
     {
@@ -215,6 +220,7 @@ public IActionResult GetEdmDateTimeOffset([FromRoute] DateTimeOffset key)
         return Ok(result);
     }
 
+    [EnableQuery]
     [HttpGet("odata/EdmTimeSet")]
     public IActionResult GetEdmTimes()
     {

diff --git a/...nt/Microsoft.OData.Client.E2E.Tests/PrimitiveTypesTests/Tests/PrimitiveKeysValuesTests.cs b/...nt/Microsoft.OData.Client.E2E.Tests/PrimitiveTypesTests/Tests/PrimitiveKeysValuesTests.cs
@@ -68,7 +68,11 @@ public void BinaryTest()
         {
             foreach (var entry in _context.EdmBinarySet)
             {
-                var queryResult = _context.CreateQuery<EdmBinary>("EdmBinarySet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmBinary>("EdmBinarySet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString()
                 Assert.Single(queryResult);
             }
@@ -79,7 +83,11 @@ public void BooleanTest()
         {
             foreach (var entry in _context.EdmBooleanSet)
             {
-                var queryResult = _context.CreateQuery<EdmBoolean>("EdmBooleanSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmBoolean>("EdmBooleanSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value '{0}', entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -90,19 +98,12 @@ public void DateTimeOffsetTest()
         {
             foreach (var entry in _context.EdmDateTimeOffsetSet)
             {
-                var queryResult = _context.CreateQuery<EdmDateTimeOffset>("EdmDateTimeOffsetSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
-                //Expected a single result for key value {0}, entry.Id.ToString()
-                Assert.Single(queryResult);
-            }
-        }
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmDateTimeOffset>("EdmDateTimeOffsetSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
 
-        [Fact]
-        public void DecimalTest()
-        {
-            foreach (var entry in _context.EdmDecimalSet)
-            {
-                var queryResult = _context.CreateQuery<EdmDecimal>("EdmDecimalSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
-                //Expected a single result for key value {0}, entry.Id.ToString(CultureInfo.InvariantCulture)
+                // Assert
+                //Expected a single result for key value {0}, entry.Id.ToString()
                 Assert.Single(queryResult);
             }
         }
@@ -117,7 +118,11 @@ public void DoubleTest()
                     continue;
                 }
 
-                var queryResult = _context.CreateQuery<EdmDouble>("EdmDoubleSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmDouble>("EdmDoubleSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -128,7 +133,11 @@ public void Int16Test()
         {
             foreach (var entry in _context.EdmInt16Set)
             {
-                var queryResult = _context.CreateQuery<EdmInt16>("EdmInt16Set").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmInt16>("EdmInt16Set").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -139,7 +148,11 @@ public void Int32Test()
         {
             foreach (var entry in _context.EdmInt32Set)
             {
-                var queryResult = _context.CreateQuery<EdmInt32>("EdmInt32Set").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmInt32>("EdmInt32Set").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -150,7 +163,11 @@ public void Int64Test()
         {
             foreach (var entry in _context.EdmInt64Set)
             {
-                var queryResult = _context.CreateQuery<EdmInt64>("EdmInt64Set").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmInt64>("EdmInt64Set").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}", entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -166,7 +183,11 @@ public void SingleTest()
                     continue;
                 }
 
-                var queryResult = _context.CreateQuery<EdmSingle>("EdmSingleSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmSingle>("EdmSingleSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString(CultureInfo.InvariantCulture)
                 Assert.Single(queryResult);
             }
@@ -177,7 +198,11 @@ public void StringTest()
         {
             foreach (var entry in _context.EdmStringSet)
             {
-                var queryResult = _context.CreateQuery<EdmString>("EdmStringSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmString>("EdmStringSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0} entry.Id)
                 Assert.Single(queryResult);
             }
@@ -188,7 +213,11 @@ public void TimeTest()
         {
             foreach (var entry in _context.EdmTimeSet)
             {
-                var queryResult = _context.CreateQuery<EdmTime>("EdmTimeSet").Where(e => e.Id.Equals(entry.Id)).ToArray();
+                // Arrange & Act
+                var query = _context.CreateQuery<EdmTime>("EdmTimeSet").Where(e => e.Id.Equals(entry.Id));
+                var queryResult = query.ToArray();
+
+                // Assert
                 //Expected a single result for key value {0}, entry.Id.ToString()
                 Assert.Single(queryResult);
             }