Skip to content

Commit 133bce1

Browse files
KirillKurdyukovKirillKurdyukov
committed
fix
1 parent dfef05e commit 133bce1

File tree

7 files changed

+46
-58
lines changed

7 files changed

+46
-58
lines changed

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
88

9-
public class ComplexTypeBulkUpdatesYdbTest(
9+
#pragma warning disable xUnit1000
10+
internal class ComplexTypeBulkUpdatesYdbTest(
11+
#pragma warning restore xUnit1000
1012
ComplexTypeBulkUpdatesYdbTest.ComplexTypeBulkUpdatesYdbFixture fixture,
1113
ITestOutputHelper testOutputHelper
1214
) : ComplexTypeBulkUpdatesRelationalTestBase<ComplexTypeBulkUpdatesYdbTest.ComplexTypeBulkUpdatesYdbFixture>(

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
77

8-
internal class TPCFiltersInheritanceBulkUpdatesYdbTest(
8+
#pragma warning disable xUnit1000
9+
internal class TpcFiltersInheritanceBulkUpdatesYdbTest(
10+
#pragma warning restore xUnit1000
911
TPCFiltersInheritanceBulkUpdatesYdbFixture fixture,
1012
ITestOutputHelper testOutputHelper
1113
) : TPCFiltersInheritanceBulkUpdatesTestBase<TPCFiltersInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
77

8+
#pragma warning disable xUnit1000
89
internal class TpcInheritanceBulkUpdatesYdbTest(
10+
#pragma warning restore xUnit1000
911
TPCInheritanceBulkUpdatesYdbFixture fixture,
1012
ITestOutputHelper testOutputHelper
1113
) : TPCInheritanceBulkUpdatesTestBase<TPCInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
66

77
// TODO: Refactor later
8+
#pragma warning disable xUnit1000
89
internal class TPTFiltersInheritanceBulkUpdatesSqlServerTest(
10+
#pragma warning restore xUnit1000
911
TPTFiltersInheritanceBulkUpdatesYdbFixture fixture,
1012
ITestOutputHelper testOutputHelper
1113
) : TPTFiltersInheritanceBulkUpdatesTestBase<TPTFiltersInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ namespace EfCore.Ydb.FunctionalTests.AllTests.Update;
1313
// Ignore_before_save_property_is_still_generated,
1414
// SaveChanges_processes_all_tracked_entities.
1515
// They're failing, but I cannot ignore them because they're not virtual
16+
#pragma warning disable xUnit1000
1617
internal class UpdatesYdbTest
18+
#pragma warning restore xUnit1000
1719
: UpdatesRelationalTestBase<UpdatesYdbTest.UpdatesYdbFixture>
1820
// , UpdatesTestBase<UpdatesYdbTest.UpdatesYdbFixture>
1921
{

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.1"/>
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
12+
<PackageReference Include="xunit" Version="2.9.3" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.9.3">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1217
</ItemGroup>
1318

1419
<ItemGroup>
@@ -18,5 +23,4 @@
1823
<ItemGroup>
1924
<None Update="Northwind.sql" CopyToOutputDirectory="PreserveNewest"/>
2025
</ItemGroup>
21-
2226
</Project>

‎src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs‎

Lines changed: 29 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,111 +6,107 @@ namespace EfCore.Ydb.FunctionalTests.Migrations;
66

77
public class YdbMigrationsSqlGeneratorTest() : MigrationsSqlGeneratorTestBase(YdbTestHelpers.Instance)
88
{
9-
[ConditionalFact]
109
public override void AddColumnOperation_with_fixed_length_no_model()
1110
{
1211
base.AddColumnOperation_with_fixed_length_no_model();
1312

1413
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
1514
}
1615

17-
[ConditionalFact]
16+
1817
public override void AddColumnOperation_without_column_type()
1918
{
2019
base.AddColumnOperation_without_column_type();
2120

2221
AssertSql("ALTER TABLE `People` ADD `Alias` Text NOT NULL;");
2322
}
2423

25-
[ConditionalFact]
24+
2625
public override void AddColumnOperation_with_unicode_overridden()
2726
{
2827
base.AddColumnOperation_with_unicode_overridden();
2928

3029
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
3130
}
3231

33-
[ConditionalFact]
32+
3433
public override void AddColumnOperation_with_unicode_no_model()
3534
{
3635
base.AddColumnOperation_with_unicode_no_model();
3736

3837
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
3938
}
4039

41-
[ConditionalFact]
40+
4241
public override void AddColumnOperation_with_maxLength_overridden()
4342
{
4443
base.AddColumnOperation_with_maxLength_overridden();
4544

4645
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
4746
}
4847

49-
[ConditionalFact]
48+
5049
public override void AddColumnOperation_with_maxLength_no_model()
5150
{
5251
base.AddColumnOperation_with_maxLength_no_model();
5352

5453
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
5554
}
5655

57-
[ConditionalFact]
56+
5857
public override void AddColumnOperation_with_precision_and_scale_overridden()
5958
{
6059
base.AddColumnOperation_with_precision_and_scale_overridden();
6160

6261
AssertSql("ALTER TABLE `Person` ADD `Pi` Decimal(15, 10) NOT NULL;");
6362
}
6463

65-
[ConditionalFact]
64+
6665
public override void AddColumnOperation_with_precision_and_scale_no_model()
6766
{
6867
base.AddColumnOperation_with_precision_and_scale_no_model();
6968

7069
AssertSql("ALTER TABLE `Person` ADD `Pi` Decimal(20, 7) NOT NULL;");
7170
}
7271

73-
[ConditionalFact]
72+
7473
public override void AddForeignKeyOperation_without_principal_columns()
7574
{
7675
base.AddForeignKeyOperation_without_principal_columns();
7776

7877
AssertSql(""); // Do nothing
7978
}
8079

81-
[ConditionalFact]
80+
8281
public override void AlterColumnOperation_without_column_type() =>
8382
Assert.Throws<NotSupportedException>(() => base.AlterColumnOperation_without_column_type());
8483

85-
[ConditionalFact]
8684
public override void RenameTableOperation_legacy()
8785
{
8886
base.RenameTableOperation_legacy();
8987

9088
AssertSql("ALTER TABLE `dbo/People` RENAME TO `dbo/Person`;");
9189
}
9290

93-
[ConditionalFact]
9491
public override void RenameTableOperation()
9592
{
9693
base.RenameTableOperation();
9794

9895
AssertSql("ALTER TABLE `dbo/People` RENAME TO `dbo/Person`;");
9996
}
10097

101-
[ConditionalFact]
10298
public override void SqlOperation()
10399
{
104100
base.SqlOperation();
105101

106102
AssertSql("-- I <3 DDL");
107103
}
108104

109-
[ConditionalFact]
105+
110106
public override void InsertDataOperation_all_args_spatial() =>
111107
Assert.Throws<NotSupportedException>(() => base.InsertDataOperation_all_args_spatial());
112108

113-
[ConditionalFact]
109+
114110
public override void InsertDataOperation_required_args()
115111
{
116112
base.InsertDataOperation_required_args();
@@ -122,7 +118,7 @@ public override void InsertDataOperation_required_args()
122118
""");
123119
}
124120

125-
[ConditionalFact]
121+
126122
public override void InsertDataOperation_required_args_composite()
127123
{
128124
base.InsertDataOperation_required_args_composite();
@@ -134,7 +130,7 @@ public override void InsertDataOperation_required_args_composite()
134130
""");
135131
}
136132

137-
[ConditionalFact]
133+
138134
public override void InsertDataOperation_required_args_multiple_rows()
139135
{
140136
base.InsertDataOperation_required_args_multiple_rows();
@@ -148,13 +144,13 @@ public override void InsertDataOperation_required_args_multiple_rows()
148144
""");
149145
}
150146

151-
[ConditionalFact(Skip = "TBD")]
147+
152148
public override void InsertDataOperation_throws_for_unsupported_column_types()
153149
{
154150
base.InsertDataOperation_throws_for_unsupported_column_types();
155151
}
156152

157-
[ConditionalFact]
153+
158154
public override void DeleteDataOperation_all_args()
159155
{
160156
base.DeleteDataOperation_all_args();
@@ -174,7 +170,7 @@ DELETE FROM `People`
174170
""");
175171
}
176172

177-
[ConditionalFact]
173+
178174
public override void DeleteDataOperation_all_args_composite()
179175
{
180176
base.DeleteDataOperation_all_args_composite();
@@ -194,7 +190,7 @@ DELETE FROM `People`
194190
""");
195191
}
196192

197-
[ConditionalFact]
193+
198194
public override void DeleteDataOperation_required_args()
199195
{
200196
base.DeleteDataOperation_required_args();
@@ -206,7 +202,7 @@ DELETE FROM `People`
206202
""");
207203
}
208204

209-
[ConditionalFact]
205+
210206
public override void DeleteDataOperation_required_args_composite()
211207
{
212208
base.DeleteDataOperation_required_args_composite();
@@ -218,7 +214,7 @@ DELETE FROM `People`
218214
""");
219215
}
220216

221-
[ConditionalFact]
217+
222218
public override void UpdateDataOperation_all_args()
223219
{
224220
base.UpdateDataOperation_all_args();
@@ -232,7 +228,7 @@ public override void UpdateDataOperation_all_args()
232228
""");
233229
}
234230

235-
[ConditionalFact]
231+
236232
public override void UpdateDataOperation_all_args_composite()
237233
{
238234
base.UpdateDataOperation_all_args_composite();
@@ -246,7 +242,7 @@ public override void UpdateDataOperation_all_args_composite()
246242
""");
247243
}
248244

249-
[ConditionalFact]
245+
250246
public override void UpdateDataOperation_all_args_composite_multi()
251247
{
252248
base.UpdateDataOperation_all_args_composite_multi();
@@ -260,7 +256,7 @@ public override void UpdateDataOperation_all_args_composite_multi()
260256
""");
261257
}
262258

263-
[ConditionalFact]
259+
264260
public override void UpdateDataOperation_all_args_multi()
265261
{
266262
base.UpdateDataOperation_all_args_multi();
@@ -272,7 +268,7 @@ public override void UpdateDataOperation_all_args_multi()
272268
""");
273269
}
274270

275-
[ConditionalFact]
271+
276272
public override void UpdateDataOperation_required_args()
277273
{
278274
base.UpdateDataOperation_required_args();
@@ -284,7 +280,7 @@ public override void UpdateDataOperation_required_args()
284280
""");
285281
}
286282

287-
[ConditionalFact]
283+
288284
public override void UpdateDataOperation_required_args_multiple_rows()
289285
{
290286
base.UpdateDataOperation_required_args_multiple_rows();
@@ -298,7 +294,7 @@ public override void UpdateDataOperation_required_args_multiple_rows()
298294
""");
299295
}
300296

301-
[ConditionalFact]
297+
302298
public override void UpdateDataOperation_required_args_composite()
303299
{
304300
base.UpdateDataOperation_required_args_composite();
@@ -310,7 +306,7 @@ public override void UpdateDataOperation_required_args_composite()
310306
""");
311307
}
312308

313-
[ConditionalFact]
309+
314310
public override void UpdateDataOperation_required_args_composite_multi()
315311
{
316312
base.UpdateDataOperation_required_args_composite_multi();
@@ -322,7 +318,6 @@ public override void UpdateDataOperation_required_args_composite_multi()
322318
""");
323319
}
324320

325-
[ConditionalFact]
326321
public override void UpdateDataOperation_required_args_multi()
327322
{
328323
base.UpdateDataOperation_required_args_multi();
@@ -335,40 +330,19 @@ public override void UpdateDataOperation_required_args_multi()
335330
);
336331
}
337332

338-
[ConditionalTheory(Skip = "YDB does not support default value")]
339333
public override void DefaultValue_with_line_breaks(bool isUnicode)
340334
{
341-
base.DefaultValue_with_line_breaks(isUnicode);
342-
343-
AssertSql("""
344-
CREATE TABLE `dbo/TestLineBreaks` (
345-
`TestDefaultValue` Text NOT NULL
346-
);
347-
""");
335+
// YDB does not support default value
348336
}
349337

350-
[ConditionalTheory(Skip = "YDB does not support default value")]
351338
public override void DefaultValue_with_line_breaks_2(bool isUnicode)
352339
{
353-
base.DefaultValue_with_line_breaks_2(isUnicode);
354-
355-
AssertSql("""
356-
CREATE TABLE `dbo/TestLineBreaks` (
357-
`TestDefaultValue` Text NOT NULL
358-
);
359-
""");
340+
// YDB does not support default value
360341
}
361342

362-
[ConditionalTheory(Skip = "YDB does not support sequences")]
363343
public override void Sequence_restart_operation(long? startsAt)
364344
{
365-
base.Sequence_restart_operation(startsAt);
366-
367-
AssertSql("""
368-
CREATE TABLE `dbo/TestLineBreaks` (
369-
`TestDefaultValue` Text NOT NULL
370-
);
371-
""");
345+
// YDB does not support sequence
372346
}
373347

374348
protected override string GetGeometryCollectionStoreType() => throw new NotSupportedException();

0 commit comments

Comments
 (0)