Skip to content

Commit bbcceb9

Browse files
committed
* move the sort logic into a function
1 parent 78a54e1 commit bbcceb9

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

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

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

1212
public class GetOpenApiReferenceMetadataTest
1313
{
14+
public string SortMetadata(string Metadata)
15+
{
16+
return string.Join("|", Metadata.Split('|').OrderBy(s => s));
17+
}
1418
[Fact]
1519
public void Execute_AddsExpectedMetadata()
1620
{
@@ -60,9 +64,9 @@ public void Execute_AddsExpectedMetadata()
6064
orderedMetadata.Add(key, metadata[key]);
6165
}
6266

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);
67+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
68+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
69+
Assert.Equal(expectedMetadata, orderedMetadata);
6670
}
6771

6872
[Fact]
@@ -120,9 +124,9 @@ public void Execute_DoesNotOverrideClassName()
120124
orderedMetadata.Add(key, metadata[key]);
121125
}
122126

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);
127+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
128+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
129+
Assert.Equal(expectedMetadata, orderedMetadata);
126130
}
127131

128132
[Fact]
@@ -180,9 +184,9 @@ public void Execute_DoesNotOverrideNamespace()
180184
orderedMetadata.Add(key, metadata[key]);
181185
}
182186

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);
187+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
188+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
189+
Assert.Equal(expectedMetadata, orderedMetadata);
186190
}
187191

188192
[Fact]
@@ -240,9 +244,8 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
240244
orderedMetadata.Add(key, metadata[key]);
241245
}
242246
// 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));
245-
247+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
248+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
246249
Assert.Equal<SortedDictionary<string, string>>(expectedMetadata, orderedMetadata);
247250
}
248251

@@ -392,10 +395,9 @@ public void Execute_SetsClassName_BasedOnOutputPath()
392395
{
393396
orderedMetadata.Add(key, metadata[key]);
394397
}
395-
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);
398+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
399+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
400+
Assert.Equal(expectedMetadata, orderedMetadata);
399401
}
400402

401403
[Theory]
@@ -457,9 +459,9 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
457459
{
458460
orderedMetadata.Add(key, metadata[key]);
459461
}
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);
462+
expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
463+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
464+
Assert.Equal(expectedMetadata, orderedMetadata);
463465
}
464466

465467
[Fact]
@@ -557,9 +559,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
557559
orderedMetadata.Add(key, metadata[key]);
558560
}
559561

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);
562+
expectedMetadata1["SerializedMetadata"] = SortMetadata(expectedMetadata1["SerializedMetadata"]);
563+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
564+
Assert.Equal(expectedMetadata1, orderedMetadata);
563565
},
564566
output =>
565567
{
@@ -570,10 +572,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
570572
{
571573
orderedMetadata.Add(key, metadata[key]);
572574
}
573-
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);
575+
expectedMetadata2["SerializedMetadata"] = SortMetadata(expectedMetadata2["SerializedMetadata"]);
576+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
577+
Assert.Equal(expectedMetadata2, orderedMetadata);
577578
},
578579
output =>
579580
{
@@ -585,9 +586,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
585586
orderedMetadata.Add(key, metadata[key]);
586587
}
587588

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);
589+
expectedMetadata3["SerializedMetadata"] = SortMetadata(expectedMetadata3["SerializedMetadata"]);
590+
orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
591+
Assert.Equal(expectedMetadata3, orderedMetadata);
591592
});
592593
}
593594
}

0 commit comments

Comments
 (0)