|
2 | 2 | // The .NET Foundation licenses this file to you under the MIT license. |
3 | 3 | // See the LICENSE file in the project root for more information. |
4 | 4 |
|
| 5 | +using System; |
5 | 6 | using System.Collections.Concurrent; |
6 | 7 | using Xunit; |
7 | 8 |
|
@@ -60,25 +61,14 @@ public void ExecuteNonQuery() |
60 | 61 |
|
61 | 62 | // ExecuteNonQuery will drain every result set, info message and exception, collating these into a single exception. |
62 | 63 | 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); |
82 | 72 | Assert.Empty(messages); |
83 | 73 | } |
84 | 74 |
|
|
0 commit comments