Skip to content

Commit 78a54e1

Browse files
committed
fix Extensions.ApiDescription.Client tests
* The enumeration of dictionary is undefined according to msdocs. * Sort the values of the expected and the actual in the test cases.
1 parent 870eec2 commit 78a54e1

File tree

2 files changed

+32
-11
lines changed

2 files changed

+32
-11
lines changed

src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ public void Execute_AddsExpectedMetadata()
6060
orderedMetadata.Add(key, metadata[key]);
6161
}
6262

63-
Assert.Equal(expectedMetadata, orderedMetadata);
63+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
64+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
65+
Assert.Equal(expectedMetadata, orderedMetadata);
6466
}
6567

6668
[Fact]
@@ -118,7 +120,9 @@ public void Execute_DoesNotOverrideClassName()
118120
orderedMetadata.Add(key, metadata[key]);
119121
}
120122

121-
Assert.Equal(expectedMetadata, orderedMetadata);
123+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
124+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
125+
Assert.Equal(expectedMetadata, orderedMetadata);
122126
}
123127

124128
[Fact]
@@ -176,7 +180,9 @@ public void Execute_DoesNotOverrideNamespace()
176180
orderedMetadata.Add(key, metadata[key]);
177181
}
178182

179-
Assert.Equal(expectedMetadata, orderedMetadata);
183+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
184+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
185+
Assert.Equal(expectedMetadata, orderedMetadata);
180186
}
181187

182188
[Fact]
@@ -233,8 +239,11 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
233239
{
234240
orderedMetadata.Add(key, metadata[key]);
235241
}
242+
// sort the values, since order is undefined for Dictionary
243+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
244+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
236245

237-
Assert.Equal(expectedMetadata, orderedMetadata);
246+
Assert.Equal<SortedDictionary<string, string>>(expectedMetadata, orderedMetadata);
238247
}
239248

240249
[Fact]
@@ -384,7 +393,9 @@ public void Execute_SetsClassName_BasedOnOutputPath()
384393
orderedMetadata.Add(key, metadata[key]);
385394
}
386395

387-
Assert.Equal(expectedMetadata, orderedMetadata);
396+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
397+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
398+
Assert.Equal(expectedMetadata, orderedMetadata);
388399
}
389400

390401
[Theory]
@@ -446,8 +457,9 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
446457
{
447458
orderedMetadata.Add(key, metadata[key]);
448459
}
449-
450-
Assert.Equal(expectedMetadata, orderedMetadata);
460+
expectedMetadata["SerializedMetadata"] = string.Join("|", expectedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
461+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
462+
Assert.Equal(expectedMetadata, orderedMetadata);
451463
}
452464

453465
[Fact]
@@ -545,7 +557,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
545557
orderedMetadata.Add(key, metadata[key]);
546558
}
547559

548-
Assert.Equal(expectedMetadata1, orderedMetadata);
560+
expectedMetadata1["SerializedMetadata"] = string.Join("|", expectedMetadata1["SerializedMetadata"].Split('|').OrderBy(s => s));
561+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
562+
Assert.Equal(expectedMetadata1, orderedMetadata);
549563
},
550564
output =>
551565
{
@@ -557,7 +571,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
557571
orderedMetadata.Add(key, metadata[key]);
558572
}
559573

560-
Assert.Equal(expectedMetadata2, orderedMetadata);
574+
expectedMetadata2["SerializedMetadata"] = string.Join("|", expectedMetadata2["SerializedMetadata"].Split('|').OrderBy(s => s));
575+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
576+
Assert.Equal(expectedMetadata2, orderedMetadata);
561577
},
562578
output =>
563579
{
@@ -569,7 +585,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
569585
orderedMetadata.Add(key, metadata[key]);
570586
}
571587

572-
Assert.Equal(expectedMetadata3, orderedMetadata);
588+
expectedMetadata3["SerializedMetadata"] = string.Join("|", expectedMetadata3["SerializedMetadata"].Split('|').OrderBy(s => s));
589+
orderedMetadata["SerializedMetadata"] = string.Join("|", orderedMetadata["SerializedMetadata"].Split('|').OrderBy(s => s));
590+
Assert.Equal(expectedMetadata3, orderedMetadata);
573591
});
574592
}
575593
}

src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ public void SerializeMetadata_ReturnsExpectedString()
193193
// Act
194194
var result = MetadataSerializer.SerializeMetadata(input);
195195

196-
// Assert
196+
// sort the values, since order is undefined for Dictionary
197+
expectedResult = string.Join("|", expectedResult.Split('|').OrderBy(s => s));
198+
result = string.Join("|", result.Split('|').OrderBy(s => s));
199+
// Assert
197200
Assert.Equal(expectedResult, result);
198201
}
199202

0 commit comments

Comments
 (0)