Skip to content

Commit 29a3fa4

Browse files
committed
Checked use of Environment.NewLine
1 parent a896991 commit 29a3fa4

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Collections.Concurrent;
67
using Xunit;
78

@@ -60,25 +61,14 @@ public void ExecuteNonQuery()
6061

6162
// ExecuteNonQuery will drain every result set, info message and exception, collating these into a single exception.
6263
SqlException exNonQuery = Assert.Throws<SqlException>(() => command.ExecuteNonQuery());
63-
string expectedInfoMessages =
64-
$"{ResultSet2_Error}\n" +
65-
$"{ResultSet4_Error}\n" +
66-
$"{ResultSet6_Error}\n" +
67-
$"{ResultSet8_Error}\n" +
68-
$"{ResultSet10_Error}\n" +
69-
$"{ResultSet1_Message}\n" +
70-
$"{ResultSet2_Message}\n" +
71-
$"{ResultSet3_Message}\n" +
72-
$"{ResultSet4_Message}\n" +
73-
$"{ResultSet5_Message}\n" +
74-
$"{ResultSet6_Message}\n" +
75-
$"{ResultSet7_Message}\n" +
76-
$"{ResultSet8_Message}\n" +
77-
$"{ResultSet9_Message}\n" +
78-
$"{ResultSet10_Message}\n" +
79-
$"{ResultSet11_Message}";
80-
81-
Assert.Equal(expectedInfoMessages, exNonQuery.Message.Replace("\r\n", "\n"));
64+
65+
string expectedInfoMessages = string.Join(Environment.NewLine,
66+
ResultSet2_Error, ResultSet4_Error, ResultSet6_Error, ResultSet8_Error, ResultSet10_Error,
67+
ResultSet1_Message, ResultSet2_Message, ResultSet3_Message, ResultSet4_Message, ResultSet5_Message,
68+
ResultSet6_Message, ResultSet7_Message, ResultSet8_Message, ResultSet9_Message, ResultSet10_Message,
69+
ResultSet11_Message);
70+
71+
Assert.Equal(expectedInfoMessages, exNonQuery.Message);
8272
Assert.Empty(messages);
8373
}
8474

0 commit comments

Comments
 (0)