Skip to content

Commit 7daee00

Browse files
phongnguyendphongnguyend
committed
Separate Test Projects
1 parent 2099f8a commit 7daee00

File tree

14 files changed

+117
-178
lines changed

14 files changed

+117
-178
lines changed

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionAsyncExtensions/BaseTest.cs‎

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

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionAsyncExtensions/BulkDeleteTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkDeleteAsyncTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
using Microsoft.EntityFrameworkCore;
55
using Xunit.Abstractions;
66

7-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionAsyncExtensions;
7+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionExtensions;
88

99
[Collection("SqlServerCollection")]
10-
public class BulkDeleteTests : BaseTest
10+
public class BulkDeleteAsyncTests : BaseTest
1111
{
1212
private string _schema = "";
1313

14-
public BulkDeleteTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkDelete")
14+
public BulkDeleteAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkDelete")
1515
{
1616
TableMapper.Register(typeof(SingleKeyRow<int>), _schema, "SingleKeyRows");
1717
TableMapper.Register(typeof(CompositeKeyRow<int, int>), _schema, "CompositeKeyRows");
1818

1919
var rows = new List<SingleKeyRow<int>>();
2020
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
2121

22-
for (int i = 0; i < 100; i++)
22+
for (var i = 0; i < 100; i++)
2323
{
2424
rows.Add(new SingleKeyRow<int>
2525
{

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionAsyncExtensions/BulkInsertTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkInsertAsyncTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using Microsoft.EntityFrameworkCore;
44
using Xunit.Abstractions;
55

6-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionAsyncExtensions;
6+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionExtensions;
77

88
[Collection("SqlServerCollection")]
9-
public class BulkInsertTests : BaseTest
9+
public class BulkInsertAsyncTests : BaseTest
1010
{
1111
private string _schema = "";
1212

13-
public BulkInsertTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkInsert")
13+
public BulkInsertAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkInsert")
1414
{
1515
TableMapper.Register(typeof(SingleKeyRow<int>), _schema, "SingleKeyRows");
1616
TableMapper.Register(typeof(CompositeKeyRow<int, int>), _schema, "CompositeKeyRows");
@@ -26,7 +26,7 @@ public async Task Bulk_Insert_Without_Transaction(bool useLinq, bool omitTableNa
2626
var rows = new List<SingleKeyRow<int>>();
2727
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
2828

29-
for (int i = 0; i < 100; i++)
29+
for (var i = 0; i < 100; i++)
3030
{
3131
rows.Add(new SingleKeyRow<int>
3232
{
@@ -127,7 +127,7 @@ await _connection.BulkInsertAsync(compositeKeyRows,
127127
var dbRows = _context.SingleKeyRows.AsNoTracking().ToList();
128128
var dbCompositeKeyRows = _context.CompositeKeyRows.AsNoTracking().ToList();
129129

130-
for (int i = 0; i < 100; i++)
130+
for (var i = 0; i < 100; i++)
131131
{
132132
Assert.Equal(rows[i].Id, dbRows[i].Id);
133133
Assert.Equal(rows[i].Column1, dbRows[i].Column1);

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionAsyncExtensions/BulkUpdateTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkUpdateAsyncTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
using Microsoft.EntityFrameworkCore;
66
using Xunit.Abstractions;
77

8-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionAsyncExtensions;
8+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests.ConnectionExtensions;
99

1010
[Collection("SqlServerCollection")]
11-
public class BulkUpdateTests : BaseTest
11+
public class BulkUpdateAsyncTests : BaseTest
1212
{
1313
private string _schema = "";
1414

15-
public BulkUpdateTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkUpdate")
15+
public BulkUpdateAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkUpdate")
1616
{
1717
TableMapper.Register(typeof(SingleKeyRow<int>), _schema, "SingleKeyRows");
1818
TableMapper.Register(typeof(CompositeKeyRow<int, int>), _schema, "CompositeKeyRows");
@@ -22,7 +22,7 @@ public BulkUpdateTests(ITestOutputHelper output, SqlServerFixture fixture) : bas
2222
var rows = new List<SingleKeyRow<int>>();
2323
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
2424

25-
for (int i = 0; i < 100; i++)
25+
for (var i = 0; i < 100; i++)
2626
{
2727
rows.Add(new SingleKeyRow<int>
2828
{
@@ -282,7 +282,7 @@ await _connection.BulkMergeAsync(compositeKeyRows,
282282
var dbRows = _context.SingleKeyRows.AsNoTracking().ToList();
283283
var dbCompositeKeyRows = _context.CompositeKeyRows.AsNoTracking().ToList();
284284

285-
for (int i = 0; i < 101; i++)
285+
for (var i = 0; i < 101; i++)
286286
{
287287
Assert.Equal(rows[i].Id, dbRows[i].Id);
288288
Assert.Equal(rows[i].Column1, dbRows[i].Column1);

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextAsyncExtensions/BaseTest.cs‎

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

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextAsyncExtensions/BulkDeleteTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkDeleteAsyncTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
using Microsoft.EntityFrameworkCore;
55
using Xunit.Abstractions;
66

7-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextAsyncExtensions;
7+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextExtensions;
88

99
[Collection("SqlServerCollection")]
10-
public class BulkDeleteTests : BaseTest
10+
public class BulkDeleteAsyncTests : BaseTest
1111
{
12-
public BulkDeleteTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkDelete")
12+
public BulkDeleteAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkDelete")
1313
{
1414
var tran = _context.Database.BeginTransaction();
1515

1616
var rows = new List<SingleKeyRow<int>>();
1717
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
1818

19-
for (int i = 0; i < 100; i++)
19+
for (var i = 0; i < 100; i++)
2020
{
2121
rows.Add(new SingleKeyRow<int>
2222
{

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextAsyncExtensions/BulkInsertTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkInsertAsyncTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
using Microsoft.EntityFrameworkCore;
44
using Xunit.Abstractions;
55

6-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextAsyncExtensions;
6+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextExtensions;
77

88
[Collection("SqlServerCollection")]
9-
public class BulkInsertTests : BaseTest
9+
public class BulkInsertAsyncTests : BaseTest
1010
{
11-
public BulkInsertTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkInsert")
11+
public BulkInsertAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkInsert")
1212
{
1313
}
1414

@@ -20,7 +20,7 @@ public async Task Bulk_Insert_Using_Linq_Without_Transaction(int length)
2020
var rows = new List<SingleKeyRow<int>>();
2121
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
2222

23-
for (int i = 0; i < length; i++)
23+
for (var i = 0; i < length; i++)
2424
{
2525
rows.Add(new SingleKeyRow<int>
2626
{
@@ -62,7 +62,7 @@ await _context.BulkInsertAsync(compositeKeyRows,
6262
var dbRows = _context.SingleKeyRows.AsNoTracking().ToList();
6363
var dbCompositeKeyRows = _context.CompositeKeyRows.AsNoTracking().ToList();
6464

65-
for (int i = 0; i < length; i++)
65+
for (var i = 0; i < length; i++)
6666
{
6767
Assert.Equal(rows[i].Id, dbRows[i].Id);
6868
Assert.Equal(rows[i].Column1, dbRows[i].Column1);
@@ -91,7 +91,7 @@ public async Task Bulk_Insert_Using_Linq_With_Transaction_Committed(int length)
9191
var rows = new List<SingleKeyRow<int>>();
9292
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
9393

94-
for (int i = 0; i < length; i++)
94+
for (var i = 0; i < length; i++)
9595
{
9696
rows.Add(new SingleKeyRow<int>
9797
{
@@ -126,7 +126,7 @@ await _context.BulkInsertAsync(compositeKeyRows,
126126
var dbRows = _context.SingleKeyRows.AsNoTracking().ToList();
127127
var dbCompositeKeyRows = _context.CompositeKeyRows.AsNoTracking().ToList();
128128

129-
for (int i = 0; i < length; i++)
129+
for (var i = 0; i < length; i++)
130130
{
131131
Assert.Equal(rows[i].Id, dbRows[i].Id);
132132
Assert.Equal(rows[i].Column1, dbRows[i].Column1);
@@ -155,7 +155,7 @@ public async Task Bulk_Insert_Using_Linq_With_Transaction_RolledBack(int length)
155155
var rows = new List<SingleKeyRow<int>>();
156156
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
157157

158-
for (int i = 0; i < length; i++)
158+
for (var i = 0; i < length; i++)
159159
{
160160
rows.Add(new SingleKeyRow<int>
161161
{
@@ -201,7 +201,7 @@ public async Task Bulk_Insert_KeepIdentity(int length)
201201
{
202202
var configurationEntries = new List<ConfigurationEntry>();
203203

204-
for (int i = 0; i < length; i++)
204+
for (var i = 0; i < length; i++)
205205
{
206206
configurationEntries.Add(new ConfigurationEntry
207207
{
@@ -223,7 +223,7 @@ await _context.BulkInsertAsync(configurationEntries, options =>
223223
configurationEntries = configurationEntries.OrderBy(x => x.Id).ToList();
224224
var configurationEntriesInDb = _context.Set<ConfigurationEntry>().AsNoTracking().ToList().OrderBy(x => x.Id).ToList();
225225

226-
for (int i = 0; i < length; i++)
226+
for (var i = 0; i < length; i++)
227227
{
228228
Assert.Equal(configurationEntries[i].Id, configurationEntriesInDb[i].Id);
229229
Assert.Equal(configurationEntries[i].Key, configurationEntriesInDb[i].Key);
@@ -240,7 +240,7 @@ public async Task Bulk_Insert_Return_DbGeneratedId(int length)
240240
{
241241
var configurationEntries = new List<ConfigurationEntry>();
242242

243-
for (int i = 0; i < length; i++)
243+
for (var i = 0; i < length; i++)
244244
{
245245
configurationEntries.Add(new ConfigurationEntry
246246
{
@@ -260,7 +260,7 @@ await _context.BulkInsertAsync(configurationEntries, options =>
260260
configurationEntries = configurationEntries.OrderBy(x => x.Id).ToList();
261261
var configurationEntriesInDb = _context.Set<ConfigurationEntry>().AsNoTracking().ToList().OrderBy(x => x.Id).ToList();
262262

263-
for (int i = 0; i < length; i++)
263+
for (var i = 0; i < length; i++)
264264
{
265265
Assert.NotEqual(Guid.Empty, configurationEntriesInDb[i].Id);
266266
Assert.Equal(configurationEntries[i].Id, configurationEntriesInDb[i].Id);

‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextAsyncExtensions/BulkMatchTests.cs‎ renamed to ‎src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkMatchAsyncTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
using EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.Database;
44
using Xunit.Abstractions;
55

6-
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextAsyncExtensions;
6+
namespace EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests.DbContextExtensions;
77

88
[Collection("SqlServerCollection")]
9-
public class BulkMatchTests : BaseTest
9+
public class BulkMatchAsyncTests : BaseTest
1010
{
1111
private readonly List<Customer> _customers;
1212
private readonly List<Contact> _contacts;
1313

14-
public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkMatch")
14+
public BulkMatchAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) : base(output, fixture, "EFCoreSimpleBulksTests.BulkMatch")
1515
{
1616
var tran = _context.Database.BeginTransaction();
1717

@@ -20,7 +20,7 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base
2020

2121
_customers = new List<Customer>();
2222

23-
for (int i = 0; i < 100; i++)
23+
for (var i = 0; i < 100; i++)
2424
{
2525
var customer = new Customer
2626
{
@@ -32,7 +32,7 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base
3232

3333
customer.Contacts = new List<Contact>();
3434

35-
for (int j = 0; j < 100; j++)
35+
for (var j = 0; j < 100; j++)
3636
{
3737
customer.Contacts.Add(new Contact
3838
{
@@ -81,7 +81,7 @@ public async Task Bulk_Match_GetCustomersByIds_ReturnAllColumns()
8181

8282
// Assert
8383
Assert.Equal(customers.Count, customersFromDb.Count);
84-
for (int i = 0; i < customers.Count; i++)
84+
for (var i = 0; i < customers.Count; i++)
8585
{
8686
Assert.Equal(customers[i].Id, customersFromDb[i].Id);
8787
Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);
@@ -109,7 +109,7 @@ public async Task Bulk_Match_GetCustomersByIds_ReturnSelectedColumns()
109109

110110
// Assert
111111
Assert.Equal(customers.Count, customersFromDb.Count);
112-
for (int i = 0; i < customers.Count; i++)
112+
for (var i = 0; i < customers.Count; i++)
113113
{
114114
Assert.Equal(customers[i].Id, customersFromDb[i].Id);
115115
Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);
@@ -139,7 +139,7 @@ public async Task Bulk_Match_GetContactsByCustomerIds_ReturnAllColumns()
139139

140140
// Assert
141141
Assert.Equal(contactsInMemory.Count, contactsFromDb.Count);
142-
for (int i = 0; i < contactsInMemory.Count; i++)
142+
for (var i = 0; i < contactsInMemory.Count; i++)
143143
{
144144
Assert.Equal(contactsInMemory[i].Id, contactsFromDb[i].Id);
145145
Assert.Equal(contactsInMemory[i].EmailAddress, contactsFromDb[i].EmailAddress);
@@ -172,7 +172,7 @@ public async Task Bulk_Match_GetContactsByCustomerIds_ReturnSelectedColumns()
172172

173173
// Assert
174174
Assert.Equal(contactsInMemory.Count, contactsFromDb.Count);
175-
for (int i = 0; i < contactsInMemory.Count; i++)
175+
for (var i = 0; i < contactsInMemory.Count; i++)
176176
{
177177
Assert.Equal(contactsInMemory[i].Id, contactsFromDb[i].Id);
178178
Assert.Null(contactsFromDb[i].EmailAddress);
@@ -202,7 +202,7 @@ public async Task Bulk_Match_GetDefaultContactsByCustomerIds_ReturnAllColumns()
202202

203203
// Assert
204204
Assert.Equal(contactsInMemory.Count, contactsFromDb.Count);
205-
for (int i = 0; i < contactsInMemory.Count; i++)
205+
for (var i = 0; i < contactsInMemory.Count; i++)
206206
{
207207
Assert.Equal(contactsInMemory[i].Id, contactsFromDb[i].Id);
208208
Assert.Equal(contactsInMemory[i].EmailAddress, contactsFromDb[i].EmailAddress);
@@ -235,7 +235,7 @@ public async Task Bulk_Match_GetDefaultContactsByCustomerIds_ReturnSelectedColum
235235
// Assert
236236
Assert.Equal(contactsInMemory.Count, contactsFromDb.Count);
237237

238-
for (int i = 0; i < contactsInMemory.Count; i++)
238+
for (var i = 0; i < contactsInMemory.Count; i++)
239239
{
240240
Assert.Equal(contactsInMemory[i].Id, contactsFromDb[i].Id);
241241
Assert.Null(contactsFromDb[i].EmailAddress);

0 commit comments

Comments
 (0)