Skip to content

Commit 3867bbb

Browse files
authored
Change expected newline char when parsing crypto test baseline file. (#3690)
* Change expected newline char when parsing file. * Always run tests. Expected newline is os specific. Switch baselines back to CRLF.
1 parent 2d05980 commit 3867bbb

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CoreCryptoTests.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99

1010
namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
1111
{
12-
public class CoreCryptoTests : IClassFixture<SQLSetupStrategyCertStoreProvider>
12+
public class CoreCryptoTests
1313
{
14-
// Synapse: Always Encrypted not supported in Azure Synapse.
15-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
14+
[Fact]
1615
public void TestAeadCryptoWithNativeBaseline()
1716
{
1817
// Initialize the reader for resource text file which has the native code generated baseline.
@@ -45,8 +44,7 @@ public void TestAeadCryptoWithNativeBaseline()
4544
}
4645
}
4746

48-
// Synapse: Always Encrypted not supported in Azure Synapse.
49-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
47+
[Fact]
5048
public void TestRsaCryptoWithNativeBaseline()
5149
{
5250
// Initialize the reader for resource text file which has the native code generated baseline.

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CryptoNativeBaselineReader.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Linq;
66
using System.Text;
77
using System.Text.RegularExpressions;
8-
using System.Threading.Tasks;
98

109
namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup
1110
{
@@ -174,7 +173,7 @@ internal class CryptoNativeBaselineReader
174173
/// <summary>
175174
/// Parameter Data End identifier, to search inside resource text file.
176175
/// </summary>
177-
private static readonly Regex regexEndParameterIdentifier = new Regex(@"\r");
176+
private static readonly Regex regexEndParameterIdentifier = new Regex(Environment.NewLine);
178177

179178
private readonly IList<CryptoVector> m_CryptoVectors;
180179

0 commit comments

Comments
 (0)