Skip to content

Commit 4fccb63

Browse files
[s390x] Fix Extensions.ApiDescription.Client tests on s390x (#58235)
* The enumeration of dictionary is undefined according to msdocs. * Sort the values of the expected and the actual in the test cases. --------- Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 3a94c1f commit 4fccb63

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ namespace Microsoft.Extensions.ApiDescription.Client;
1111

1212
public class GetOpenApiReferenceMetadataTest
1313
{
14+
string SortMetadata(string metadata)
15+
{
16+
return string.Join("|", metadata.Split('|').OrderBy(s => s));
17+
}
18+
1419
[Fact]
1520
public void Execute_AddsExpectedMetadata()
1621
{
@@ -60,6 +65,8 @@ public void Execute_AddsExpectedMetadata()
6065
orderedMetadata.Add(key, metadata[key]);
6166
}
6267

68+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
69+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
6370
Assert.Equal(expectedMetadata, orderedMetadata);
6471
}
6572

@@ -118,6 +125,8 @@ public void Execute_DoesNotOverrideClassName()
118125
orderedMetadata.Add(key, metadata[key]);
119126
}
120127

128+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
129+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
121130
Assert.Equal(expectedMetadata, orderedMetadata);
122131
}
123132

@@ -176,6 +185,8 @@ public void Execute_DoesNotOverrideNamespace()
176185
orderedMetadata.Add(key, metadata[key]);
177186
}
178187

188+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
189+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
179190
Assert.Equal(expectedMetadata, orderedMetadata);
180191
}
181192

@@ -234,6 +245,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
234245
orderedMetadata.Add(key, metadata[key]);
235246
}
236247

248+
// sort the values, since order is undefined for Dictionary
249+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
250+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
237251
Assert.Equal(expectedMetadata, orderedMetadata);
238252
}
239253

@@ -383,7 +397,8 @@ public void Execute_SetsClassName_BasedOnOutputPath()
383397
{
384398
orderedMetadata.Add(key, metadata[key]);
385399
}
386-
400+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
401+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
387402
Assert.Equal(expectedMetadata, orderedMetadata);
388403
}
389404

@@ -446,7 +461,8 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
446461
{
447462
orderedMetadata.Add(key, metadata[key]);
448463
}
449-
464+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
465+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
450466
Assert.Equal(expectedMetadata, orderedMetadata);
451467
}
452468

@@ -545,6 +561,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
545561
orderedMetadata.Add(key, metadata[key]);
546562
}
547563

564+
expectedMetadata1["SerializedMetadata"] = SortMetadata(expectedMetadata1["SerializedMetadata"]);
565+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
548566
Assert.Equal(expectedMetadata1, orderedMetadata);
549567
},
550568
output =>
@@ -556,7 +574,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
556574
{
557575
orderedMetadata.Add(key, metadata[key]);
558576
}
559-
577+
expectedMetadata2["SerializedMetadata"] = SortMetadata(expectedMetadata2["SerializedMetadata"]);
578+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
560579
Assert.Equal(expectedMetadata2, orderedMetadata);
561580
},
562581
output =>
@@ -569,6 +588,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
569588
orderedMetadata.Add(key, metadata[key]);
570589
}
571590

591+
expectedMetadata3["SerializedMetadata"] = SortMetadata(expectedMetadata3["SerializedMetadata"]);
592+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
572593
Assert.Equal(expectedMetadata3, orderedMetadata);
573594
});
574595
}

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)