Skip to content

Commit cda42c7

Browse files
Make bulk serialization tests less brittle (#6128) (#6129)
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent a6016bf commit cda42c7

16 files changed

+166
-15
lines changed

tests/Tests/Serialization/BulkSerialisationTests.cs

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.IO;
56
using System.Threading.Tasks;
67
using Tests.Core.Xunit;
78
using Tests.Domain;
@@ -28,7 +29,21 @@ public async Task BulkRequest_SerialisationTest()
2829
};
2930

3031
var serialisedJson = await SerializeAndGetJsonStringAsync(request);
31-
await Verifier.Verify(serialisedJson);
32+
33+
var sr = new StringReader(serialisedJson);
34+
var count = 0;
35+
while(true)
36+
{
37+
var line = sr.ReadLine();
38+
if (line is not null)
39+
{
40+
await Verifier.VerifyJson(line).UseMethodName($"{nameof(BulkRequest_SerialisationTest)}_{++count}");
41+
}
42+
else
43+
{
44+
break;
45+
}
46+
}
3247
}
3348

3449
[U]
@@ -39,7 +54,21 @@ public async Task BulkRequest_DescriptorSerialisationTest()
3954
request.Index(FixedProject);
4055

4156
var serialisedJson = await SerializeAndGetJsonStringAsync(request);
42-
await Verifier.Verify(serialisedJson);
57+
58+
var sr = new StringReader(serialisedJson);
59+
var count = 0;
60+
while (true)
61+
{
62+
var line = sr.ReadLine();
63+
if (line is not null)
64+
{
65+
await Verifier.VerifyJson(line).UseMethodName($"{nameof(BulkRequest_DescriptorSerialisationTest)}_{++count}");
66+
}
67+
else
68+
{
69+
break;
70+
}
71+
}
4372
}
4473

4574
[U]
@@ -49,7 +78,21 @@ public async Task BulkRequest_IndexMany_DescriptorSerialisationTest()
4978
request.IndexMany(new [] { FixedProject, FixedProject });
5079

5180
var serialisedJson = await SerializeAndGetJsonStringAsync(request);
52-
await Verifier.Verify(serialisedJson);
81+
82+
var sr = new StringReader(serialisedJson);
83+
var count = 0;
84+
while (true)
85+
{
86+
var line = sr.ReadLine();
87+
if (line is not null)
88+
{
89+
await Verifier.VerifyJson(line).UseMethodName($"{nameof(BulkRequest_IndexMany_DescriptorSerialisationTest)}_{++count}");
90+
}
91+
else
92+
{
93+
break;
94+
}
95+
}
5396
}
5497

5598
private static readonly Project FixedProject = new()

tests/Tests/_VerifySnapshots/BulkSerialisationTests.BulkRequest_DescriptorSerialisationTest.verified.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
index: {
3+
_index: project
4+
}
5+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
join: project,
3+
lastActivity: Date_MinValue,
4+
leadDeveloper: {
5+
firstName: Steve,
6+
gender: Male,
7+
id: 0,
8+
lastName: Gordon
9+
},
10+
numberOfContributors: 0,
11+
startedOn: Date_MinValue,
12+
state: BellyUp,
13+
type: project,
14+
visibility: Public
15+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
index: {
3+
_index: project
4+
}
5+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
join: project,
3+
lastActivity: Date_MinValue,
4+
leadDeveloper: {
5+
firstName: Steve,
6+
gender: Male,
7+
id: 0,
8+
lastName: Gordon
9+
},
10+
numberOfContributors: 0,
11+
startedOn: Date_MinValue,
12+
state: BellyUp,
13+
type: project,
14+
visibility: Public
15+
}

tests/Tests/_VerifySnapshots/BulkSerialisationTests.BulkRequest_IndexMany_DescriptorSerialisationTest.verified.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
index: {
3+
_index: project
4+
}
5+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
join: project,
3+
lastActivity: Date_MinValue,
4+
leadDeveloper: {
5+
firstName: Steve,
6+
gender: Male,
7+
id: 0,
8+
lastName: Gordon
9+
},
10+
numberOfContributors: 0,
11+
startedOn: Date_MinValue,
12+
state: BellyUp,
13+
type: project,
14+
visibility: Public
15+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
index: {
3+
_index: project
4+
}
5+
}

0 commit comments

Comments
 (0)