Skip to content

[s390x] Fix Extensions.ApiDescription.Client tests on s390x #58235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 4, 2025
Merged

[s390x] Fix Extensions.ApiDescription.Client tests on s390x #58235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78a54e1
fix Extensions.ApiDescription.Client tests
saitama951 Oct 4, 2024
bbcceb9
* move the sort logic into a function
saitama951 Jun 4, 2025
848fbd2
Code style fixes
akoeplinger Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ namespace Microsoft.Extensions.ApiDescription.Client;

public class GetOpenApiReferenceMetadataTest
{
string SortMetadata(string metadata)
{
return string.Join("|", metadata.Split('|').OrderBy(s => s));
}

[Fact]
public void Execute_AddsExpectedMetadata()
{
Expand Down Expand Up @@ -60,6 +65,8 @@ public void Execute_AddsExpectedMetadata()
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -118,6 +125,8 @@ public void Execute_DoesNotOverrideClassName()
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -176,6 +185,8 @@ public void Execute_DoesNotOverrideNamespace()
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -234,6 +245,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
orderedMetadata.Add(key, metadata[key]);
}

// sort the values, since order is undefined for Dictionary
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -383,7 +397,8 @@ public void Execute_SetsClassName_BasedOnOutputPath()
{
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -446,7 +461,8 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
{
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata, orderedMetadata);
}

Expand Down Expand Up @@ -545,6 +561,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata1["SerializedMetadata"] = SortMetadata(expectedMetadata1["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata1, orderedMetadata);
},
output =>
Expand All @@ -556,7 +574,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
{
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata2["SerializedMetadata"] = SortMetadata(expectedMetadata2["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata2, orderedMetadata);
},
output =>
Expand All @@ -569,6 +588,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
orderedMetadata.Add(key, metadata[key]);
}

expectedMetadata3["SerializedMetadata"] = SortMetadata(expectedMetadata3["SerializedMetadata"]);
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
Assert.Equal(expectedMetadata3, orderedMetadata);
});
}
Expand Down
5 changes: 4 additions & 1 deletion src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@ public void SerializeMetadata_ReturnsExpectedString()
// Act
var result = MetadataSerializer.SerializeMetadata(input);

// Assert
// sort the values, since order is undefined for Dictionary
expectedResult = string.Join("|", expectedResult.Split('|').OrderBy(s => s));
result = string.Join("|", result.Split('|').OrderBy(s => s));
// Assert
Assert.Equal(expectedResult, result);
}

Expand Down
Loading