Skip to content

Refactor and improve integration test fixtures. #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardalis merged 9 commits into from
Aug 7, 2023
Merged

Refactor and improve integration test fixtures. #360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce0c43b
Refactored the fixtures for integration tests.
fiseni Aug 5, 2023
2b4044e
Updated connection string for EF6.
fiseni Aug 5, 2023
183824e
Update connection string.
fiseni Aug 5, 2023
cb92d4d
Update connection string.
fiseni Aug 5, 2023
95a85b2
Updated connection retry count.
fiseni Aug 5, 2023
f33f4c7
Few updates.
fiseni Aug 6, 2023
32eebab
Update sqllocaldb script.
fiseni Aug 6, 2023
338b472
Update script.
fiseni Aug 6, 2023
cdac95b
Minor improvements.
fiseni Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Minor improvements.
  • Loading branch information
@fiseni
fiseni committed Aug 6, 2023
commit cdac95b99dde2745b443c7127ee8d307319de1c8
2 changes: 1 addition & 1 deletion .../tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Fixture/DatabaseFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public DatabaseFixture()
using (var localDB = new SqlLocalDbApi())
{
ConnectionString = localDB.IsLocalDBInstalled()
? $"Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog={databaseName};Integrated Security=SSPI;"
? $"Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog={databaseName};Integrated Security=SSPI;MultipleActiveResultSets=True;Connection Timeout=300"
: $"Data Source=databaseEF;Initial Catalog={databaseName};PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!;";
}

Expand Down
4 changes: 2 additions & 2 deletions ...ts/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/EFRepositoryFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public EFRepositoryFactoryTests(DatabaseFixture fixture)
_dbContextOptions = fixture.DbContextOptions;

_serviceProvider = new ServiceCollection()
.AddDbContextFactory<TestDbContext>((builder => builder.UseSqlServer(fixture.ConnectionString)),
ServiceLifetime.Transient).BuildServiceProvider();
.AddDbContextFactory<TestDbContext>((builder => builder.UseSqlServer(fixture.ConnectionString)), ServiceLifetime.Transient)
.BuildServiceProvider();

_contextFactory = _serviceProvider.GetService<IDbContextFactory<TestDbContext>>();
_repositoryFactory = new EFRepositoryFactory<IRepositoryBase<Company>, Repository<Company>, TestDbContext>(_contextFactory);
Expand Down
4 changes: 2 additions & 2 deletions ...sts/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Fixture/DatabaseFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ public DatabaseFixture()
using (var localDB = new SqlLocalDbApi())
{
ConnectionString = localDB.IsLocalDBInstalled()
? $"Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog={databaseName};Integrated Security=SSPI;Encrypt=False;TrustServerCertificate=True;"
? $"Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog={databaseName};Integrated Security=SSPI;MultipleActiveResultSets=True;Connection Timeout=300;Encrypt=False;TrustServerCertificate=True;"
: $"Data Source=databaseEF;Initial Catalog={databaseName};PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!;Encrypt=False;TrustServerCertificate=True;";
}

Console.WriteLine($"Connection string: {ConnectionString}");

DbContextOptions = new DbContextOptionsBuilder<TestDbContext>()
.UseSqlServer(ConnectionString)
.UseSqlServer(ConnectionString, x => x.EnableRetryOnFailure())
.EnableSensitiveDataLogging()
.Options;

Expand Down