Clean up code and refactor failing tests

MaggieKimani1 · MaggieKimani1 · commit c17a87e8d90e · 2023-05-04T15:57:50.000+03:00
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs
@@ -81,7 +81,7 @@ public static JsonNode GetSpecificOpenApiAny(JsonNode jsonNode, OpenApiSchema sc
                 return jsonNode;
             }
 
-            var value = jsonValue.ToJsonString();
+            var value = jsonValue.GetScalarValue();
             var type = schema?.Type;
             var format = schema?.Format;
 
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs
@@ -1,6 +1,8 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System.Globalization;
+using System;
 using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Readers.Exceptions;
 
@@ -22,7 +24,7 @@ public ValueNode(ParsingContext context, JsonNode node) : base(
 
         public override string GetScalarValue()
         {
-            return _node.GetScalarValue();
+            return Convert.ToString(_node.GetValue<object>(), CultureInfo.InvariantCulture);
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi.Readers/YamlHelper.cs b/src/Microsoft.OpenApi.Readers/YamlHelper.cs
@@ -1,9 +1,12 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System.Globalization;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text.Json.Nodes;
+using System.Xml.Linq;
 using SharpYaml.Serialization;
 
 namespace Microsoft.OpenApi.Readers
@@ -19,7 +22,7 @@ public static string GetScalarValue(this JsonNode node)
                 //throw new OpenApiException($"Expected scalar at line {node.Start.Line}");
             } 
 
-            return scalarNode?.GetScalarValue();
+            return Convert.ToString(scalarNode?.GetValue<object>(), CultureInfo.InvariantCulture);
         }
         
         public static JsonNode ParseJsonString(string yamlString)
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using FluentAssertions;
 using Microsoft.OpenApi.Models;
@@ -72,20 +73,20 @@ public void ParseObjectAsAnyShouldSucceed()
             };
 
             anyMap = OpenApiAnyConverter.GetSpecificOpenApiAny(anyMap, schema);
-
+            var expected = new JsonObject
+            {
+                ["aString"] = "fooBar",
+                ["aInteger"] = 10,
+                ["aDouble"] = 2.34,
+                ["aDateTime"] = DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture),
+                ["aDate"] = DateTimeOffset.Parse("2017-01-02", CultureInfo.InvariantCulture).Date
+            };
+            
             diagnostic.Errors.Should().BeEmpty();
-            anyMap.Should().BeEquivalentTo(
-                new JsonObject
-                {
-                    ["aString"] = "fooBar",
-                    ["aInteger"] = 10,
-                    ["aDouble"] = 2.34,
-                    ["aDateTime"] = DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture),
-                    ["aDate"] = DateTimeOffset.Parse("2017-01-02", CultureInfo.InvariantCulture).Date
-                });
+            anyMap.Should().BeEquivalentTo(expected, options => options.IgnoringCyclicReferences());
         }
 
-
+        
         [Fact]
         public void ParseNestedObjectAsAnyShouldSucceed()
         {
@@ -261,7 +262,7 @@ public void ParseNestedObjectAsAnyShouldSucceed()
                     },
                     ["aDouble"] = 2.34,
                     ["aDateTime"] = DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture)
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
 
@@ -416,7 +417,7 @@ public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed()
                     },
                     ["aDouble"] = 2.34,
                     ["aDateTime"] = DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture)
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -508,7 +509,7 @@ public void ParseNestedObjectAsAnyWithoutUsingSchemaShouldSucceed()
                     },
                     ["aDouble"] = 2.34,
                     ["aDateTime"] = DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture)
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs
@@ -38,7 +38,7 @@ public void ParseHeaderWithDefaultShouldSucceed()
                         Format = "float",
                         Default = 5
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -69,7 +69,7 @@ public void ParseHeaderWithEnumShouldSucceed()
                             9
                         }
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs
@@ -371,8 +371,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed()
                             }
                         }}
                     }
-                }
-            );
+                }, options => options.IgnoringCyclicReferences());
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs
@@ -166,7 +166,7 @@ public void ParseHeaderParameterShouldSucceed()
                             new JsonArray() { 3, 4 }
                         }
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -209,7 +209,7 @@ public void ParseHeaderParameterWithIncorrectDataTypeShouldSucceed()
                             new JsonArray() { "3", "4" }
                         }
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -345,9 +345,9 @@ public void ParseParameterWithDefaultShouldSucceed()
                     {
                         Type = "number",
                         Format = "float",
-                        Default = 5.0
+                        Default = 5
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -375,9 +375,9 @@ public void ParseParameterWithEnumShouldSucceed()
                     {
                         Type = "number",
                         Format = "float",
-                        Enum = {7.0, 8.0, 9.0 }
+                        Enum = {7, 8, 9 }
                     }
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs
@@ -34,8 +34,8 @@ public void ParseSchemaWithDefaultShouldSucceed()
                 {
                     Type = "number",
                     Format = "float",
-                    Default = 5.0
-                });
+                    Default = 5
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -57,8 +57,8 @@ public void ParseSchemaWithExampleShouldSucceed()
                 {
                     Type = "number",
                     Format = "float",
-                    Example = 5.0
-                });
+                    Example = 5
+                }, options => options.IgnoringCyclicReferences());
         }
 
         [Fact]
@@ -81,7 +81,7 @@ public void ParseSchemaWithEnumShouldSucceed()
                     Type = "number",
                     Format = "float",
                     Enum = {7, 8, 9}                    
-                });
+                }, options => options.IgnoringCyclicReferences());
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -1311,7 +1311,7 @@ public void HeaderParameterShouldAllowExample()
                             Type = ReferenceType.Header,
                             Id = "example-header"
                         }
-                    });
+                    }, options => options.IgnoringCyclicReferences());
 
                 var examplesHeader = openApiDoc.Components?.Headers?["examples-header"];
                 Assert.NotNull(examplesHeader);
@@ -1348,7 +1348,7 @@ public void HeaderParameterShouldAllowExample()
                             Type = ReferenceType.Header,
                             Id = "examples-header"
                         }
-                    });
+                    }, options => options.IgnoringCyclicReferences());
             }
         }
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
@@ -73,7 +73,7 @@ public void ParseAdvancedExampleShouldSucceed()
                                 }
                             }
                         }
-                    });
+                    }, options => options.IgnoringCyclicReferences());
             }
         }
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public static JsonNode GetSpecificOpenApiAny(JsonNode jsonNode, OpenApiSchema sc`
`81`	`81`	`return jsonNode;`
`82`	`82`	`}`
`83`	`83`
`84`		`- var value = jsonValue.ToJsonString();`
	`84`	`+ var value = jsonValue.GetScalarValue();`
`85`	`85`	`var type = schema?.Type;`
`86`	`86`	`var format = schema?.Format;`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
	`4`	`+using System.Globalization;`
	`5`	`+using System;`
`4`	`6`	`using System.Text.Json.Nodes;`
`5`	`7`	`using Microsoft.OpenApi.Readers.Exceptions;`
`6`	`8`
`@@ -22,7 +24,7 @@ public ValueNode(ParsingContext context, JsonNode node) : base(`
`22`	`24`
`23`	`25`	`public override string GetScalarValue()`
`24`	`26`	`{`
`25`		`- return _node.GetScalarValue();`
	`27`	`+ return Convert.ToString(_node.GetValue<object>(), CultureInfo.InvariantCulture);`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void ParseHeaderWithDefaultShouldSucceed()`
`38`	`38`	`Format = "float",`
`39`	`39`	`Default = 5`
`40`	`40`	`}`
`41`		`- });`
	`41`	`+ }, options => options.IgnoringCyclicReferences());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact]`
`@@ -69,7 +69,7 @@ public void ParseHeaderWithEnumShouldSucceed()`
`69`	`69`	`9`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`- });`
	`72`	`+ }, options => options.IgnoringCyclicReferences());`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -371,8 +371,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed()`
`371`	`371`	`}`
`372`	`372`	`}}`
`373`	`373`	`}`
`374`		`- }`
`375`		`- );`
	`374`	`+ }, options => options.IgnoringCyclicReferences());`
`376`	`375`	`}`
`377`	`376`	`}`
`378`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public void ParseHeaderParameterShouldSucceed()`
`166`	`166`	`new JsonArray() { 3, 4 }`
`167`	`167`	`}`
`168`	`168`	`}`
`169`		`- });`
	`169`	`+ }, options => options.IgnoringCyclicReferences());`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`[Fact]`
`@@ -209,7 +209,7 @@ public void ParseHeaderParameterWithIncorrectDataTypeShouldSucceed()`
`209`	`209`	`new JsonArray() { "3", "4" }`
`210`	`210`	`}`
`211`	`211`	`}`
`212`		`- });`
	`212`	`+ }, options => options.IgnoringCyclicReferences());`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`[Fact]`
`@@ -345,9 +345,9 @@ public void ParseParameterWithDefaultShouldSucceed()`
`345`	`345`	`{`
`346`	`346`	`Type = "number",`
`347`	`347`	`Format = "float",`
`348`		`- Default = 5.0`
	`348`	`+ Default = 5`
`349`	`349`	`}`
`350`		`- });`
	`350`	`+ }, options => options.IgnoringCyclicReferences());`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`[Fact]`
`@@ -375,9 +375,9 @@ public void ParseParameterWithEnumShouldSucceed()`
`375`	`375`	`{`
`376`	`376`	`Type = "number",`
`377`	`377`	`Format = "float",`
`378`		`- Enum = {7.0, 8.0, 9.0 }`
	`378`	`+ Enum = {7, 8, 9 }`
`379`	`379`	`}`
`380`		`- });`
	`380`	`+ }, options => options.IgnoringCyclicReferences());`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public void ParseSchemaWithDefaultShouldSucceed()`
`34`	`34`	`{`
`35`	`35`	`Type = "number",`
`36`	`36`	`Format = "float",`
`37`		`- Default = 5.0`
`38`		`- });`
	`37`	`+ Default = 5`
	`38`	`+ }, options => options.IgnoringCyclicReferences());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`[Fact]`
`@@ -57,8 +57,8 @@ public void ParseSchemaWithExampleShouldSucceed()`
`57`	`57`	`{`
`58`	`58`	`Type = "number",`
`59`	`59`	`Format = "float",`
`60`		`- Example = 5.0`
`61`		`- });`
	`60`	`+ Example = 5`
	`61`	`+ }, options => options.IgnoringCyclicReferences());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`[Fact]`
`@@ -81,7 +81,7 @@ public void ParseSchemaWithEnumShouldSucceed()`
`81`	`81`	`Type = "number",`
`82`	`82`	`Format = "float",`
`83`	`83`	`Enum = {7, 8, 9}`
`84`		`- });`
	`84`	`+ }, options => options.IgnoringCyclicReferences());`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1311,7 +1311,7 @@ public void HeaderParameterShouldAllowExample()`
`1311`	`1311`	`Type = ReferenceType.Header,`
`1312`	`1312`	`Id = "example-header"`
`1313`	`1313`	`}`
`1314`		`- });`
	`1314`	`+ }, options => options.IgnoringCyclicReferences());`
`1315`	`1315`
`1316`	`1316`	`var examplesHeader = openApiDoc.Components?.Headers?["examples-header"];`
`1317`	`1317`	`Assert.NotNull(examplesHeader);`
`@@ -1348,7 +1348,7 @@ public void HeaderParameterShouldAllowExample()`
`1348`	`1348`	`Type = ReferenceType.Header,`
`1349`	`1349`	`Id = "examples-header"`
`1350`	`1350`	`}`
`1351`		`- });`
	`1351`	`+ }, options => options.IgnoringCyclicReferences());`
`1352`	`1352`	`}`
`1353`	`1353`	`}`
`1354`	`1354`