Skip to content

Commit bf9afd2

Browse files
Fix test conflicts
1 parent b1c3b86 commit bf9afd2

File tree

1 file changed

+6
-7
lines changed
  • src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest

1 file changed

+6
-7
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Data;
77
using System.Data.SqlTypes;
88
using System.Text;
9-
using Microsoft.SqlServer.Server;
109
using Xunit;
1110

1211
namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -569,18 +568,18 @@ public void TestSchemaTable()
569568
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUdtTestDatabasePresent), nameof(DataTestUtility.AreConnStringsSetup))]
570569
public void TestSqlUserDefinedAggregateAttributeMaxByteSize()
571570
{
572-
Func<int, SqlUserDefinedAggregateAttribute> create
573-
= (size) => new SqlUserDefinedAggregateAttribute(Format.UserDefined) { MaxByteSize = size };
571+
Func<int, SqlServer.Server.SqlUserDefinedAggregateAttribute> create
572+
= (size) => new(SqlServer.Server.Format.UserDefined) { MaxByteSize = size };
574573

575-
SqlUserDefinedAggregateAttribute attribute1 = create(-1);
576-
SqlUserDefinedAggregateAttribute attribute2 = create(0);
577-
SqlUserDefinedAggregateAttribute attribute3 = create(SqlUserDefinedAggregateAttribute.MaxByteSizeValue);
574+
SqlServer.Server.SqlUserDefinedAggregateAttribute attribute1 = create(-1);
575+
SqlServer.Server.SqlUserDefinedAggregateAttribute attribute2 = create(0);
576+
SqlServer.Server.SqlUserDefinedAggregateAttribute attribute3 = create(SqlServer.Server.SqlUserDefinedAggregateAttribute.MaxByteSizeValue);
578577

579578
string udtError = SystemDataResourceManager.Instance.SQLUDT_MaxByteSizeValue;
580579
string errorMessage = (new ArgumentOutOfRangeException("MaxByteSize", 8001, udtError)).Message;
581580

582581
DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(
583-
() => create(SqlUserDefinedAggregateAttribute.MaxByteSizeValue + 1),
582+
() => create(SqlServer.Server.SqlUserDefinedAggregateAttribute.MaxByteSizeValue + 1),
584583
errorMessage);
585584

586585
errorMessage = (new ArgumentOutOfRangeException("MaxByteSize", -2, udtError)).Message;

0 commit comments

Comments
 (0)