Skip to content

Commit d76696f

Browse files
delete block rpc calls
1 parent 9f109ae commit d76696f

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

src/Ydb.Sdk/tests/Ado/YdbCommandTests.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace Ydb.Sdk.Tests.Ado;
1010

11-
[Collection("YdbCommandTests")]
12-
[CollectionDefinition("YdbCommandTests isolation test", DisableParallelization = true)]
1311
public class YdbCommandTests : YdbAdoNetFixture
1412
{
1513
public YdbCommandTests(YdbFactoryFixture fixture) : base(fixture)
@@ -18,9 +16,9 @@ public YdbCommandTests(YdbFactoryFixture fixture) : base(fixture)
1816

1917
[Theory]
2018
[ClassData(typeof(YdbParameterTests.TestDataGenerator))]
21-
public void ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbParameterTests.Data<T> data)
19+
public async Task ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbParameterTests.Data<T> data)
2220
{
23-
using var connection = CreateOpenConnection();
21+
await using var connection = await CreateOpenConnectionAsync();
2422
var dbCommand = connection.CreateCommand();
2523
dbCommand.CommandText = "SELECT @var as var;";
2624

@@ -34,7 +32,7 @@ public void ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbParamet
3432

3533
dbCommand.Parameters.Add(dbParameter);
3634

37-
Assert.Equal(data.Expected, dbCommand.ExecuteScalar());
35+
Assert.Equal(data.Expected, await dbCommand.ExecuteScalarAsync());
3836
var ydbDataReader = dbCommand.ExecuteReader();
3937
Assert.Equal(1, ydbDataReader.FieldCount);
4038
Assert.Equal("var", ydbDataReader.GetName(0));
@@ -43,7 +41,7 @@ public void ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbParamet
4341
Assert.Equal(typeof(T), ydbDataReader.GetFieldType(0));
4442
}
4543

46-
while (ydbDataReader.Read())
44+
while (await ydbDataReader.NextResultAsync())
4745
{
4846
}
4947
}
@@ -70,14 +68,14 @@ public void ExecuteScalarAsync_WhenSetYdbParameterThenPrepare_ReturnThisValue<T>
7068

7169
[Theory]
7270
[ClassData(typeof(YdbParameterTests.TestDataGenerator))]
73-
public void ExecuteScalarAsync_WhenDbTypeIsObject_ReturnThisValue<T>(YdbParameterTests.Data<T> data)
71+
public async Task ExecuteScalarAsync_WhenDbTypeIsObject_ReturnThisValue<T>(YdbParameterTests.Data<T> data)
7472
{
7573
if (data.IsNullable)
7674
{
7775
return;
7876
}
7977

80-
using var connection = CreateOpenConnection();
78+
await using var connection = await CreateOpenConnectionAsync();
8179
var dbCommand = connection.CreateCommand();
8280
dbCommand.CommandText = "SELECT @var;";
8381

@@ -89,11 +87,11 @@ public void ExecuteScalarAsync_WhenDbTypeIsObject_ReturnThisValue<T>(YdbParamete
8987
};
9088
dbCommand.Parameters.Add(dbParameter);
9189

92-
Assert.Equal(data.Expected, dbCommand.ExecuteScalar());
90+
Assert.Equal(data.Expected, await dbCommand.ExecuteScalarAsync());
9391
}
9492

9593
[Fact]
96-
public void ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
94+
public async Task ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
9795
{
9896
const string simpleJson = @"{""a"":""b""}";
9997

@@ -110,7 +108,7 @@ public void ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
110108
Encoding.ASCII.GetBytes("{type=\"yson\"}"))
111109
};
112110

113-
using var connection = CreateOpenConnection();
111+
await using var connection = await CreateOpenConnectionAsync();
114112
var dbCommand = connection.CreateCommand();
115113
dbCommand.CommandText = "SELECT @var;";
116114

@@ -122,7 +120,7 @@ public void ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
122120
ParameterName = "@var",
123121
Value = arg.YdbValue
124122
});
125-
Assert.Equal(arg.Expected, dbCommand.ExecuteScalar());
123+
Assert.Equal(arg.Expected, await dbCommand.ExecuteScalarAsync());
126124
}
127125
}
128126

src/Ydb.Sdk/tests/Ado/YdbDataSourceTests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
namespace Ydb.Sdk.Tests.Ado;
88

9-
[Collection("YdbDataSourceTests")]
10-
[CollectionDefinition("YdbDataSourceTests isolation test", DisableParallelization = true)]
119
public class YdbDataSourceTests : YdbAdoNetFixture
1210
{
1311
private const int SelectedCount = 100;
@@ -16,11 +14,11 @@ public class YdbDataSourceTests : YdbAdoNetFixture
1614

1715
public YdbDataSourceTests(YdbFactoryFixture fixture) : base(fixture)
1816
{
19-
_dataSource = new YdbDataSource($"{Fixture.ConnectionString};MaxSessionPool=10");
17+
_dataSource = new YdbDataSource(Fixture.ConnectionString);
2018
}
2119

2220
[Fact]
23-
public void OpenConnectionAsync_WhenMaxSessionPool10_ReturnOpenConnection()
21+
public async Task OpenConnectionAsync_WhenMaxSessionPool10_ReturnOpenConnection()
2422
{
2523
var tasks = new Task[SelectedCount];
2624
for (var i = 0; i < SelectedCount; i++)
@@ -33,9 +31,7 @@ public void OpenConnectionAsync_WhenMaxSessionPool10_ReturnOpenConnection()
3331
});
3432
}
3533

36-
#pragma warning disable xUnit1031
37-
Task.WaitAll(tasks);
38-
#pragma warning restore xUnit1031
34+
await Task.WhenAll(tasks);
3935
}
4036

4137
[Fact]

0 commit comments

Comments
 (0)