Skip to content

Commit 00a3548

Browse files
lauxjpnlauxjpn
committed
Fix tests.
1 parent 3386b14 commit 00a3548

File tree

61 files changed

+2157
-4917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2157
-4917
lines changed

‎test/EFCore.Jet.FunctionalTests/DataAnnotationJetTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public override ModelBuilder Non_public_annotations_are_enabled()
5353
{
5454
var modelBuilder = base.Non_public_annotations_are_enabled();
5555

56-
var property = GetProperty<PrivateMemberAnnotationClass>(modelBuilder, "PersonFirstName");
57-
Assert.Equal("dsdsd", property.GetColumnName());
58-
Assert.Equal("nvarchar(128)", property.GetColumnType());
56+
var relational = GetProperty<PrivateMemberAnnotationClass>(modelBuilder, "PersonFirstName");
57+
Assert.Equal("dsdsd", relational.GetColumnBaseName());
58+
Assert.Equal("nvarchar(128)", relational.GetColumnType());
5959

6060
return modelBuilder;
6161
}
@@ -64,9 +64,9 @@ public override ModelBuilder Field_annotations_are_enabled()
6464
{
6565
var modelBuilder = base.Field_annotations_are_enabled();
6666

67-
var property = GetProperty<FieldAnnotationClass>(modelBuilder, "_personFirstName");
68-
Assert.Equal("dsdsd", property.GetColumnName());
69-
Assert.Equal("nvarchar(128)", property.GetColumnType());
67+
var relational = GetProperty<FieldAnnotationClass>(modelBuilder, "_personFirstName");
68+
Assert.Equal("dsdsd", relational.GetColumnBaseName());
69+
Assert.Equal("nvarchar(128)", relational.GetColumnType());
7070

7171
return modelBuilder;
7272
}
@@ -76,7 +76,7 @@ public override ModelBuilder Key_and_column_work_together()
7676
var modelBuilder = base.Key_and_column_work_together();
7777

7878
var relational = GetProperty<ColumnKeyAnnotationClass1>(modelBuilder, "PersonFirstName");
79-
Assert.Equal("dsdsd", relational.GetColumnName());
79+
Assert.Equal("dsdsd", relational.GetColumnBaseName());
8080
Assert.Equal("nvarchar(128)", relational.GetColumnType());
8181

8282
return modelBuilder;

‎test/EFCore.Jet.FunctionalTests/F1JetFixture.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@
22

33
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
44
using Microsoft.EntityFrameworkCore;
5-
using Microsoft.EntityFrameworkCore.Metadata.Conventions;
65
using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel;
76
using Microsoft.EntityFrameworkCore.TestUtilities;
87

98
namespace EntityFrameworkCore.Jet.FunctionalTests
109
{
11-
public class F1JetFixture : F1RelationalFixture
10+
public class F1ULongJetFixture : F1JetFixtureBase<ulong>
1211
{
13-
protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
12+
}
1413

15-
public override ModelBuilder CreateModelBuilder()
16-
=> new ModelBuilder(JetConventionSetBuilder.Build());
14+
public class F1JetFixture : F1JetFixtureBase<byte[]>
15+
{
16+
}
17+
18+
public abstract class F1JetFixtureBase<TRowVersion> : F1RelationalFixture<TRowVersion>
19+
{
20+
protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
21+
22+
public override TestHelpers TestHelpers
23+
=> JetTestHelpers.Instance;
1724

1825
protected override void BuildModelExternal(ModelBuilder modelBuilder)
1926
{

‎test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetTest.cs

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
using System.Linq;
4+
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
5+
using Microsoft.EntityFrameworkCore;
6+
using Microsoft.EntityFrameworkCore.Infrastructure;
7+
using Microsoft.EntityFrameworkCore.Storage;
8+
using Microsoft.EntityFrameworkCore.TestUtilities;
9+
10+
namespace EntityFrameworkCore.Jet.FunctionalTests
11+
{
12+
public class GraphUpdatesJetTest
13+
{
14+
public class ClientCascade : GraphUpdatesJetTestBase<ClientCascade.JetFixture>
15+
{
16+
public ClientCascade(JetFixture fixture)
17+
: base(fixture)
18+
{
19+
}
20+
21+
protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
22+
=> facade.UseTransaction(transaction.GetDbTransaction());
23+
24+
public class JetFixture : GraphUpdatesJetFixtureBase
25+
{
26+
public override bool NoStoreCascades => true;
27+
28+
protected override string StoreName { get; } = "GraphClientCascadeUpdatesTest";
29+
30+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
31+
{
32+
base.OnModelCreating(modelBuilder, context);
33+
34+
foreach (var foreignKey in modelBuilder.Model
35+
.GetEntityTypes()
36+
.SelectMany(e => MutableEntityTypeExtensions.GetDeclaredForeignKeys(e))
37+
.Where(e => e.DeleteBehavior == DeleteBehavior.Cascade))
38+
{
39+
foreignKey.DeleteBehavior = DeleteBehavior.ClientCascade;
40+
}
41+
}
42+
}
43+
}
44+
45+
public class ClientNoAction : GraphUpdatesJetTestBase<ClientNoAction.JetFixture>
46+
{
47+
public ClientNoAction(JetFixture fixture)
48+
: base(fixture)
49+
{
50+
}
51+
52+
protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
53+
=> facade.UseTransaction(transaction.GetDbTransaction());
54+
55+
public class JetFixture : GraphUpdatesJetFixtureBase
56+
{
57+
public override bool ForceClientNoAction => true;
58+
59+
protected override string StoreName { get; } = "GraphClientNoActionUpdatesTest";
60+
61+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
62+
{
63+
base.OnModelCreating(modelBuilder, context);
64+
65+
foreach (var foreignKey in modelBuilder.Model
66+
.GetEntityTypes()
67+
.SelectMany(e => e.GetDeclaredForeignKeys()))
68+
{
69+
foreignKey.DeleteBehavior = DeleteBehavior.ClientNoAction;
70+
}
71+
}
72+
}
73+
}
74+
75+
public class Identity : GraphUpdatesJetTestBase<Identity.JetFixture>
76+
{
77+
public Identity(JetFixture fixture)
78+
: base(fixture)
79+
{
80+
}
81+
82+
protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
83+
=> facade.UseTransaction(transaction.GetDbTransaction());
84+
85+
public class JetFixture : GraphUpdatesJetFixtureBase
86+
{
87+
protected override string StoreName { get; } = "GraphIdentityUpdatesTest";
88+
89+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
90+
{
91+
modelBuilder.UseIdentityColumns();
92+
93+
base.OnModelCreating(modelBuilder, context);
94+
}
95+
}
96+
}
97+
98+
public abstract class GraphUpdatesJetTestBase<TFixture> : GraphUpdatesTestBase<TFixture>
99+
where TFixture : GraphUpdatesJetTestBase<TFixture>.GraphUpdatesJetFixtureBase, new()
100+
{
101+
protected GraphUpdatesJetTestBase(TFixture fixture)
102+
: base(fixture)
103+
{
104+
}
105+
106+
protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
107+
=> facade.UseTransaction(transaction.GetDbTransaction());
108+
109+
public abstract class GraphUpdatesJetFixtureBase : GraphUpdatesFixtureBase
110+
{
111+
public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
112+
protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
113+
}
114+
}
115+
}
116+
}

‎test/EFCore.Jet.FunctionalTests/GraphUpdates/ProxyGraphUpdatesJetTest.cs

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
4+
using Microsoft.EntityFrameworkCore;
5+
using Microsoft.EntityFrameworkCore.Infrastructure;
6+
using Microsoft.EntityFrameworkCore.Storage;
7+
using Microsoft.EntityFrameworkCore.TestUtilities;
8+
using Microsoft.Extensions.DependencyInjection;
9+
10+
namespace EntityFrameworkCore.Jet.FunctionalTests
11+
{
12+
public abstract class ProxyGraphUpdatesJetTest
13+
{
14+
public abstract class ProxyGraphUpdatesJetTestBase<TFixture> : ProxyGraphUpdatesTestBase<TFixture>
15+
where TFixture : ProxyGraphUpdatesJetTestBase<TFixture>.ProxyGraphUpdatesJetFixtureBase, new()
16+
{
17+
protected ProxyGraphUpdatesJetTestBase(TFixture fixture)
18+
: base(fixture)
19+
{
20+
}
21+
22+
protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
23+
=> facade.UseTransaction(transaction.GetDbTransaction());
24+
25+
public abstract class ProxyGraphUpdatesJetFixtureBase : ProxyGraphUpdatesFixtureBase
26+
{
27+
public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
28+
protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
29+
}
30+
}
31+
32+
public class LazyLoading : ProxyGraphUpdatesJetTestBase<LazyLoading.ProxyGraphUpdatesWithLazyLoadingJetFixture>
33+
{
34+
public LazyLoading(ProxyGraphUpdatesWithLazyLoadingJetFixture fixture)
35+
: base(fixture)
36+
{
37+
}
38+
39+
protected override bool DoesLazyLoading => true;
40+
protected override bool DoesChangeTracking => false;
41+
42+
public class ProxyGraphUpdatesWithLazyLoadingJetFixture : ProxyGraphUpdatesJetFixtureBase
43+
{
44+
protected override string StoreName { get; } = "ProxyGraphLazyLoadingUpdatesTest";
45+
46+
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
47+
=> base.AddOptions(builder.UseLazyLoadingProxies());
48+
49+
protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
50+
=> base.AddServices(serviceCollection.AddEntityFrameworkProxies());
51+
52+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
53+
{
54+
modelBuilder.UseIdentityColumns();
55+
56+
base.OnModelCreating(modelBuilder, context);
57+
}
58+
}
59+
}
60+
61+
public class ChangeTracking : ProxyGraphUpdatesJetTestBase<ChangeTracking.ProxyGraphUpdatesWithChangeTrackingJetFixture>
62+
{
63+
public ChangeTracking(ProxyGraphUpdatesWithChangeTrackingJetFixture fixture)
64+
: base(fixture)
65+
{
66+
}
67+
68+
protected override bool DoesLazyLoading => false;
69+
protected override bool DoesChangeTracking => true;
70+
71+
public class ProxyGraphUpdatesWithChangeTrackingJetFixture : ProxyGraphUpdatesJetFixtureBase
72+
{
73+
protected override string StoreName { get; } = "ProxyGraphChangeTrackingUpdatesTest";
74+
75+
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
76+
=> base.AddOptions(builder.UseChangeTrackingProxies());
77+
78+
protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
79+
=> base.AddServices(serviceCollection.AddEntityFrameworkProxies());
80+
81+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
82+
{
83+
modelBuilder.UseIdentityColumns();
84+
85+
base.OnModelCreating(modelBuilder, context);
86+
}
87+
}
88+
}
89+
90+
public class ChangeTrackingAndLazyLoading : ProxyGraphUpdatesJetTestBase<ChangeTrackingAndLazyLoading.ProxyGraphUpdatesWithChangeTrackingAndLazyLoadingJetFixture>
91+
{
92+
public ChangeTrackingAndLazyLoading(ProxyGraphUpdatesWithChangeTrackingAndLazyLoadingJetFixture fixture)
93+
: base(fixture)
94+
{
95+
}
96+
97+
protected override bool DoesLazyLoading => true;
98+
protected override bool DoesChangeTracking => true;
99+
100+
public class ProxyGraphUpdatesWithChangeTrackingAndLazyLoadingJetFixture : ProxyGraphUpdatesJetFixtureBase
101+
{
102+
protected override string StoreName { get; } = "ProxyGraphChangeTrackingAndLazyLoadingUpdatesTest";
103+
104+
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
105+
=> base.AddOptions(builder.UseLazyLoadingProxies().UseChangeTrackingProxies());
106+
107+
protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
108+
=> base.AddServices(serviceCollection.AddEntityFrameworkProxies());
109+
110+
protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
111+
{
112+
modelBuilder.UseIdentityColumns();
113+
114+
base.OnModelCreating(modelBuilder, context);
115+
}
116+
}
117+
}
118+
}
119+
}

‎test/EFCore.Jet.FunctionalTests/GraphUpdatesJetTestClientCascade.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎test/EFCore.Jet.FunctionalTests/GraphUpdatesJetTestClientNoAction.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)