Skip to content

Commit 81bcd3c

Browse files
baywetbaywet
authored
Merge pull request #1116 from SimonCropp/verify-string-writer
verify string writer
2 parents 776c156 + 006bcf2 commit 81bcd3c

11 files changed

+49
-97
lines changed

‎test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,9 @@ public async Task SerializeAdvancedCallbackAsV3JsonWorks(bool produceTerseOutput
117117
// Act
118118
AdvancedCallback.SerializeAsV3(writer);
119119
writer.Flush();
120-
var actual = outputStringWriter.GetStringBuilder().ToString();
121120

122121
// Assert
123-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
122+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
124123
}
125124

126125
[Theory]
@@ -135,10 +134,9 @@ public async Task SerializeReferencedCallbackAsV3JsonWorks(bool produceTerseOutp
135134
// Act
136135
ReferencedCallback.SerializeAsV3(writer);
137136
writer.Flush();
138-
var actual = outputStringWriter.GetStringBuilder().ToString();
139137

140138
// Assert
141-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
139+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
142140
}
143141

144142
[Theory]
@@ -153,10 +151,9 @@ public async Task SerializeReferencedCallbackAsV3JsonWithoutReferenceWorks(bool
153151
// Act
154152
ReferencedCallback.SerializeAsV3WithoutReference(writer);
155153
writer.Flush();
156-
var actual = outputStringWriter.GetStringBuilder().ToString();
157154

158155
// Assert
159-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
156+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
160157
}
161158
}
162159
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -999,10 +999,9 @@ public async Task SerializeAdvancedDocumentAsV3JsonWorks(bool produceTerseOutput
999999
// Act
10001000
AdvancedDocument.SerializeAsV3(writer);
10011001
writer.Flush();
1002-
var actual = outputStringWriter.GetStringBuilder().ToString();
10031002

10041003
// Assert
1005-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1004+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10061005
}
10071006

10081007
[Theory]
@@ -1017,10 +1016,9 @@ public async Task SerializeAdvancedDocumentWithReferenceAsV3JsonWorks(bool produ
10171016
// Act
10181017
AdvancedDocumentWithReference.SerializeAsV3(writer);
10191018
writer.Flush();
1020-
var actual = outputStringWriter.GetStringBuilder().ToString();
10211019

10221020
// Assert
1023-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1021+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10241022
}
10251023

10261024
[Theory]
@@ -1035,10 +1033,9 @@ public async Task SerializeAdvancedDocumentAsV2JsonWorks(bool produceTerseOutput
10351033
// Act
10361034
AdvancedDocument.SerializeAsV2(writer);
10371035
writer.Flush();
1038-
var actual = outputStringWriter.GetStringBuilder().ToString();
10391036

10401037
// Assert
1041-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1038+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10421039
}
10431040

10441041
[Theory]
@@ -1053,10 +1050,9 @@ public async Task SerializeDuplicateExtensionsAsV3JsonWorks(bool produceTerseOut
10531050
// Act
10541051
DuplicateExtensions.SerializeAsV3(writer);
10551052
writer.Flush();
1056-
var actual = outputStringWriter.GetStringBuilder().ToString();
10571053

10581054
// Assert
1059-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1055+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10601056
}
10611057

10621058
[Theory]
@@ -1071,10 +1067,9 @@ public async Task SerializeDuplicateExtensionsAsV2JsonWorks(bool produceTerseOut
10711067
// Act
10721068
DuplicateExtensions.SerializeAsV2(writer);
10731069
writer.Flush();
1074-
var actual = outputStringWriter.GetStringBuilder().ToString();
10751070

10761071
// Assert
1077-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1072+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10781073
}
10791074

10801075
[Theory]
@@ -1089,10 +1084,9 @@ public async Task SerializeAdvancedDocumentWithReferenceAsV2JsonWorks(bool produ
10891084
// Act
10901085
AdvancedDocumentWithReference.SerializeAsV2(writer);
10911086
writer.Flush();
1092-
var actual = outputStringWriter.GetStringBuilder().ToString();
10931087

10941088
// Assert
1095-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
1089+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
10961090
}
10971091

10981092
[Fact]

‎test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@ public async Task SerializeAdvancedExampleAsV3JsonWorks(bool produceTerseOutput)
120120
// Act
121121
AdvancedExample.SerializeAsV3(writer);
122122
writer.Flush();
123-
var actual = outputStringWriter.GetStringBuilder().ToString();
124123

125124
// Assert
126-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
125+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
127126
}
128127

129128
[Theory]
@@ -138,10 +137,9 @@ public async Task SerializeReferencedExampleAsV3JsonWorks(bool produceTerseOutpu
138137
// Act
139138
ReferencedExample.SerializeAsV3(writer);
140139
writer.Flush();
141-
var actual = outputStringWriter.GetStringBuilder().ToString();
142140

143141
// Assert
144-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
142+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
145143
}
146144

147145
[Theory]
@@ -156,10 +154,9 @@ public async Task SerializeReferencedExampleAsV3JsonWithoutReferenceWorks(bool p
156154
// Act
157155
ReferencedExample.SerializeAsV3WithoutReference(writer);
158156
writer.Flush();
159-
var actual = outputStringWriter.GetStringBuilder().ToString();
160157

161158
// Assert
162-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
159+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
163160
}
164161
}
165162
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ public async Task SerializeAdvancedHeaderAsV3JsonWorks(bool produceTerseOutput)
6060
// Act
6161
AdvancedHeader.SerializeAsV3(writer);
6262
writer.Flush();
63-
var actual = outputStringWriter.GetStringBuilder().ToString();
6463

6564
// Assert
66-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
65+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
6766
}
6867

6968
[Theory]
@@ -78,10 +77,9 @@ public async Task SerializeReferencedHeaderAsV3JsonWorks(bool produceTerseOutput
7877
// Act
7978
ReferencedHeader.SerializeAsV3(writer);
8079
writer.Flush();
81-
var actual = outputStringWriter.GetStringBuilder().ToString();
8280

8381
// Assert
84-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
82+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
8583
}
8684

8785
[Theory]
@@ -99,7 +97,7 @@ public async Task SerializeReferencedHeaderAsV3JsonWithoutReferenceWorks(bool pr
9997
var actual = outputStringWriter.GetStringBuilder().ToString();
10098

10199
// Assert
102-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
100+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
103101
}
104102

105103
[Theory]
@@ -114,10 +112,9 @@ public async Task SerializeAdvancedHeaderAsV2JsonWorks(bool produceTerseOutput)
114112
// Act
115113
AdvancedHeader.SerializeAsV2(writer);
116114
writer.Flush();
117-
var actual = outputStringWriter.GetStringBuilder().ToString();
118115

119116
// Assert
120-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
117+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
121118
}
122119

123120
[Theory]
@@ -132,10 +129,9 @@ public async Task SerializeReferencedHeaderAsV2JsonWorks(bool produceTerseOutput
132129
// Act
133130
ReferencedHeader.SerializeAsV2(writer);
134131
writer.Flush();
135-
var actual = outputStringWriter.GetStringBuilder().ToString();
136132

137133
// Assert
138-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
134+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
139135
}
140136

141137
[Theory]
@@ -150,10 +146,9 @@ public async Task SerializeReferencedHeaderAsV2JsonWithoutReferenceWorks(bool pr
150146
// Act
151147
ReferencedHeader.SerializeAsV2WithoutReference(writer);
152148
writer.Flush();
153-
var actual = outputStringWriter.GetStringBuilder().ToString();
154149

155150
// Assert
156-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
151+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
157152
}
158153
}
159154
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ public async Task SerializeAdvancedLinkAsV3JsonWorksAsync(bool produceTerseOutpu
9090
// Act
9191
AdvancedLink.SerializeAsV3(writer);
9292
writer.Flush();
93-
var actual = outputStringWriter.GetStringBuilder().ToString();
9493

9594
// Assert
96-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
95+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
9796
}
9897

9998
[Theory]
@@ -108,10 +107,9 @@ public async Task SerializeReferencedLinkAsV3JsonWorksAsync(bool produceTerseOut
108107
// Act
109108
ReferencedLink.SerializeAsV3(writer);
110109
writer.Flush();
111-
var actual = outputStringWriter.GetStringBuilder().ToString();
112110

113111
// Assert
114-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
112+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
115113
}
116114

117115
[Theory]
@@ -126,10 +124,9 @@ public async Task SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync(bool
126124
// Act
127125
ReferencedLink.SerializeAsV3WithoutReference(writer);
128126
writer.Flush();
129-
var actual = outputStringWriter.GetStringBuilder().ToString();
130127

131128
// Assert
132-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
129+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
133130
}
134131
}
135132
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,9 @@ public async Task SerializeReferencedParameterAsV3JsonWorksAsync(bool produceTer
299299
// Act
300300
ReferencedParameter.SerializeAsV3(writer);
301301
writer.Flush();
302-
var actual = outputStringWriter.GetStringBuilder().ToString();
303302

304303
// Assert
305-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
304+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
306305
}
307306

308307
[Theory]
@@ -317,10 +316,9 @@ public async Task SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync
317316
// Act
318317
ReferencedParameter.SerializeAsV3WithoutReference(writer);
319318
writer.Flush();
320-
var actual = outputStringWriter.GetStringBuilder().ToString();
321319

322320
// Assert
323-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
321+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
324322
}
325323

326324
[Theory]
@@ -335,10 +333,9 @@ public async Task SerializeReferencedParameterAsV2JsonWorksAsync(bool produceTer
335333
// Act
336334
ReferencedParameter.SerializeAsV2(writer);
337335
writer.Flush();
338-
var actual = outputStringWriter.GetStringBuilder().ToString();
339336

340337
// Assert
341-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
338+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
342339
}
343340

344341
[Theory]
@@ -353,10 +350,9 @@ public async Task SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync
353350
// Act
354351
ReferencedParameter.SerializeAsV2WithoutReference(writer);
355352
writer.Flush();
356-
var actual = outputStringWriter.GetStringBuilder().ToString();
357353

358354
// Assert
359-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
355+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
360356
}
361357

362358
[Theory]
@@ -371,10 +367,9 @@ public async Task SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync(bool p
371367
// Act
372368
AdvancedHeaderParameterWithSchemaReference.SerializeAsV2(writer);
373369
writer.Flush();
374-
var actual = outputStringWriter.GetStringBuilder().ToString();
375370

376371
// Assert
377-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
372+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
378373
}
379374

380375
[Theory]
@@ -389,10 +384,9 @@ public async Task SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync(bool
389384
// Act
390385
AdvancedHeaderParameterWithSchemaTypeObject.SerializeAsV2(writer);
391386
writer.Flush();
392-
var actual = outputStringWriter.GetStringBuilder().ToString();
393387

394388
// Assert
395-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
389+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
396390
}
397391

398392
[Theory]
@@ -407,10 +401,9 @@ public async Task SerializeParameterWithFormStyleAndExplodeFalseWorksAsync(bool
407401
// Act
408402
ParameterWithFormStyleAndExplodeFalse.SerializeAsV3WithoutReference(writer);
409403
writer.Flush();
410-
var actual = outputStringWriter.GetStringBuilder().ToString();
411404

412405
// Assert
413-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
406+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
414407
}
415408

416409
[Theory]
@@ -425,10 +418,9 @@ public async Task SerializeParameterWithFormStyleAndExplodeTrueWorksAsync(bool p
425418
// Act
426419
ParameterWithFormStyleAndExplodeTrue.SerializeAsV3WithoutReference(writer);
427420
writer.Flush();
428-
var actual = outputStringWriter.GetStringBuilder().ToString();
429421

430422
// Assert
431-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
423+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
432424
}
433425
}
434426
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ public async Task SerializeAdvancedRequestBodyAsV3JsonWorksAsync(bool produceTer
7272
// Act
7373
AdvancedRequestBody.SerializeAsV3(writer);
7474
writer.Flush();
75-
var actual = outputStringWriter.GetStringBuilder().ToString();
7675

7776
// Assert
78-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
77+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
7978
}
8079

8180
[Theory]
@@ -90,10 +89,9 @@ public async Task SerializeReferencedRequestBodyAsV3JsonWorksAsync(bool produceT
9089
// Act
9190
ReferencedRequestBody.SerializeAsV3(writer);
9291
writer.Flush();
93-
var actual = outputStringWriter.GetStringBuilder().ToString();
9492

9593
// Assert
96-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
94+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
9795
}
9896

9997
[Theory]
@@ -108,10 +106,9 @@ public async Task SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsy
108106
// Act
109107
ReferencedRequestBody.SerializeAsV3WithoutReference(writer);
110108
writer.Flush();
111-
var actual = outputStringWriter.GetStringBuilder().ToString();
112109

113110
// Assert
114-
await Verifier.Verify(actual).UseParameters(produceTerseOutput);
111+
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
115112
}
116113
}
117114
}

0 commit comments

Comments
 (0)