Skip to content

Commit 7d7fbb9

Browse files
committed
Cleanup.
1 parent 305f8ab commit 7d7fbb9

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Helpers/SkippingAttributes.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919

2020
namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers
2121
{
22-
public class WaitingFor14811FixMergeAttribute : FactAttribute
23-
{
24-
public WaitingFor14811FixMergeAttribute()
25-
{
26-
Skip = "See #14811 on EntityFrameworkCore.";
27-
}
28-
}
29-
3022
public class HasDataInTheSameTransactionAsDDLAttribute : FactAttribute
3123
{
3224
public HasDataInTheSameTransactionAsDDLAttribute()
@@ -51,9 +43,16 @@ public GeneratedNameTooLongTheoryAttribute()
5143
}
5244
}
5345

54-
public class NotSupportedAttribute : FactAttribute
46+
public class NotSupportedOnFirebirdAttribute : FactAttribute
47+
{
48+
public NotSupportedOnFirebirdAttribute()
49+
{
50+
Skip = "Not supported on Firebird.";
51+
}
52+
}
53+
public class NotSupportedOnFirebirdTheoryAttribute : TheoryAttribute
5554
{
56-
public NotSupportedAttribute()
55+
public NotSupportedOnFirebirdTheoryAttribute()
5756
{
5857
Skip = "Not supported on Firebird.";
5958
}

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/MigrationsFbTest.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,43 +47,43 @@ public override void Can_generate_idempotent_down_scripts()
4747
Assert.Throws<NotSupportedException>(base.Can_generate_idempotent_down_scripts);
4848
}
4949

50-
[WaitingFor14811FixMerge]
50+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
5151
public override void Can_apply_all_migrations()
5252
=> base.Can_apply_all_migrations();
5353

54-
[WaitingFor14811FixMerge]
54+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
5555
public override Task Can_apply_all_migrations_async()
5656
=> base.Can_apply_all_migrations_async();
5757

58-
[WaitingFor14811FixMerge]
58+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
5959
public override void Can_revert_one_migrations()
6060
=> base.Can_revert_one_migrations();
6161

62-
[WaitingFor14811FixMerge]
62+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
6363
public override void Can_revert_all_migrations()
6464
=> base.Can_revert_all_migrations();
6565

66-
[WaitingFor14811FixMerge]
66+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
6767
public override void Can_generate_up_scripts()
6868
=> base.Can_generate_up_scripts();
6969

70-
[WaitingFor14811FixMerge]
70+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
7171
public override void Can_generate_up_script_using_names()
7272
=> base.Can_generate_up_script_using_names();
7373

74-
[WaitingFor14811FixMerge]
74+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
7575
public override void Can_generate_one_up_script()
7676
=> base.Can_generate_one_up_script();
7777

78-
[WaitingFor14811FixMerge]
78+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
7979
public override void Can_generate_one_down_script()
8080
=> base.Can_generate_one_down_script();
8181

82-
[WaitingFor14811FixMerge]
82+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
8383
public override void Can_generate_down_scripts()
8484
=> base.Can_generate_down_scripts();
8585

86-
[WaitingFor14811FixMerge]
86+
[Fact(Skip = "See #14811 on EntityFrameworkCore.")]
8787
public override void Can_generate_down_script_using_names()
8888
=> base.Can_generate_down_script_using_names();
8989
}

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/FromSqlQueryFbTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ public FromSqlQueryFbTest(NorthwindQueryFbFixture<NoopModelCustomizer> fixture)
3030
: base(fixture)
3131
{ }
3232

33-
[NotSupported]
33+
[NotSupportedOnFirebird]
3434
public override void Bad_data_error_handling_invalid_cast_key()
3535
{
3636
base.Bad_data_error_handling_invalid_cast_key();
3737
}
3838

39-
[NotSupported]
39+
[NotSupportedOnFirebird]
4040
public override void Bad_data_error_handling_invalid_cast_no_tracking()
4141
{
4242
base.Bad_data_error_handling_invalid_cast_no_tracking();
4343
}
4444

45-
[NotSupported]
45+
[NotSupportedOnFirebird]
4646
public override void Bad_data_error_handling_invalid_cast_projection()
4747
{
4848
base.Bad_data_error_handling_invalid_cast_projection();
4949
}
5050

51-
[NotSupported]
51+
[NotSupportedOnFirebird]
5252
public override void Bad_data_error_handling_invalid_cast()
5353
{
5454
base.Bad_data_error_handling_invalid_cast();

0 commit comments

Comments
 (0)