Skip to content

Commit 8ff7f34

Browse files
omargtnomargtn
committed
test: removed unworking code fixed a lot, mainly efcore inmemory db issues
1 parent fbae0a6 commit 8ff7f34

31 files changed

Lines changed: 151 additions & 381 deletions

‎SharpRepository.Repository/IRepositoryAggregates.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,5 @@ public interface IRepositoryAggregates<T> where T : class
9999
IDictionary<TGroupKey, long> GroupLongCount<TGroupKey>(ISpecification<T> criteria, Expression<Func<T, TGroupKey>> selector);
100100
IDictionary<TGroupKey, long> GroupLongCount<TGroupKey>(Expression<Func<T, bool>> predicate, Expression<Func<T, TGroupKey>> selector);
101101

102-
// I can't get these to work with Expression<Func<T, TResult>> selector so it's throwing an error in EF5 when trying to use the Func<T. TResult> selector
103-
// so for now I'm going to leave these convenience methods out and we can use GroupBy to handle it ourselves
104-
// IDictionary<TGroupKey, TResult> GroupMin<TGroupKey, TResult>(Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
105-
// IDictionary<TGroupKey, TResult> GroupMin<TGroupKey, TResult>(ISpecification<T> criteria, Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
106-
// IDictionary<TGroupKey, TResult> GroupMin<TGroupKey, TResult>(Expression<Func<T, bool>> predicate, Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
107-
//
108-
// IDictionary<TGroupKey, TResult> GroupMax<TGroupKey, TResult>(Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
109-
// IDictionary<TGroupKey, TResult> GroupMax<TGroupKey, TResult>(ISpecification<T> criteria, Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
110-
// IDictionary<TGroupKey, TResult> GroupMax<TGroupKey, TResult>(Expression<Func<T, bool>> predicate, Expression<Func<T, TGroupKey>> groupSelector, Func<T, TResult> selector);
111-
112-
113102
}
114103
}

‎SharpRepository.Tests.Integration/AggregateQueriesTests.cs‎

Lines changed: 23 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace SharpRepository.Tests.Integration
1111
[TestFixture]
1212
public class AggregateQueriesTests
1313
{
14-
[ExecuteForAllRepositoriesExcept(RepositoryType.CouchDb, RepositoryType.MongoDb, RepositoryType.RavenDb, Reason = "GroupBy Not Supported")]
14+
[ExecuteForAllRepositoriesExcept("GroupCount_Should_Return_Proper_Counts", RepositoryType.MongoDb, Reason = "GroupBy Not Supported")]
1515
public void GroupCount_Should_Return_Proper_Counts(IRepository<Contact, string> repository)
1616
{
1717
for (var i = 1; i <= 3; i++)
@@ -32,7 +32,7 @@ public void GroupCount_Should_Return_Proper_Counts(IRepository<Contact, string>
3232
groups[2].ShouldBe(4);
3333
}
3434

35-
[ExecuteForAllRepositoriesExcept(RepositoryType.CouchDb, RepositoryType.MongoDb, RepositoryType.RavenDb, Reason = "GroupBy Not Supported")]
35+
[ExecuteForAllRepositoriesExcept("GroupLongCount_Should_Return_Proper_Counts", RepositoryType.MongoDb, Reason = "GroupBy Not Supported")]
3636
public void GroupLongCount_Should_Return_Proper_Counts(IRepository<Contact, string> repository)
3737
{
3838
for (var i = 1; i <= 3; i++)
@@ -56,7 +56,7 @@ public void GroupLongCount_Should_Return_Proper_Counts(IRepository<Contact, stri
5656
groups[2].ShouldBe(expected2);
5757
}
5858

59-
[ExecuteForAllRepositoriesExcept(RepositoryType.CouchDb, RepositoryType.MongoDb, RepositoryType.RavenDb, Reason = "GroupBy Not Supported")]
59+
[ExecuteForAllRepositoriesExcept("Group_Should_Return_Proper_Items", RepositoryType.MongoDb, Reason = "GroupBy Not Supported")]
6060
public void Group_Should_Return_Proper_Items(IRepository<Contact, string> repository)
6161
{
6262
for (var i = 1; i <= 3; i++)
@@ -82,7 +82,7 @@ public void Group_Should_Return_Proper_Items(IRepository<Contact, string> reposi
8282
groups.Last().Average.ShouldBe(2.0);
8383
}
8484

85-
[ExecuteForAllRepositories]
85+
[ExecuteForAllRepositories("Count_Should_Return_All_Count")]
8686
public void Count_Should_Return_All_Count(IRepository<Contact, string> repository)
8787
{
8888
for (var i = 1; i <= 3; i++)
@@ -99,7 +99,7 @@ public void Count_Should_Return_All_Count(IRepository<Contact, string> repositor
9999
repository.Count().ShouldBe(7);
100100
}
101101

102-
[ExecuteForAllRepositories]
102+
[ExecuteForAllRepositories("LongCount_Should_Return_All_Count")]
103103
public void LongCount_Should_Return_All_Count(IRepository<Contact, string> repository)
104104
{
105105
for (var i = 1; i <= 3; i++)
@@ -117,7 +117,7 @@ public void LongCount_Should_Return_All_Count(IRepository<Contact, string> repos
117117
repository.LongCount().ShouldBe(expected);
118118
}
119119

120-
[ExecuteForAllRepositories]
120+
[ExecuteForAllRepositories("Count_With_Predicate_Should_Return_Count")]
121121
public void Count_With_Predicate_Should_Return_Count(IRepository<Contact, string> repository)
122122
{
123123
for (var i = 1; i <= 3; i++)
@@ -134,7 +134,7 @@ public void Count_With_Predicate_Should_Return_Count(IRepository<Contact, string
134134
repository.Count(x => x.ContactTypeId == 2).ShouldBe(4);
135135
}
136136

137-
[ExecuteForAllRepositories]
137+
[ExecuteForAllRepositories("LongCount_With_Predicate_Should_Return_Count")]
138138
public void LongCount_With_Predicate_Should_Return_Count(IRepository<Contact, string> repository)
139139
{
140140
for (var i = 1; i <= 3; i++)
@@ -152,7 +152,7 @@ public void LongCount_With_Predicate_Should_Return_Count(IRepository<Contact, st
152152
repository.LongCount(x => x.ContactTypeId == 2).ShouldBe(expected);
153153
}
154154

155-
[ExecuteForAllRepositories]
155+
[ExecuteForAllRepositories("Sum_All_Should_Return_Sum")]
156156
public void Sum_All_Should_Return_Sum(IRepository<Contact, string> repository)
157157
{
158158
for (var i = 1; i <= 3; i++)
@@ -164,7 +164,7 @@ public void Sum_All_Should_Return_Sum(IRepository<Contact, string> repository)
164164
repository.Sum(x => x.ContactTypeId).ShouldBe(6);
165165
}
166166

167-
[ExecuteForAllRepositories]
167+
[ExecuteForAllRepositories("Sum_With_Predicate_Should_Return_Sum")]
168168
public void Sum_With_Predicate_Should_Return_Sum(IRepository<Contact, string> repository)
169169
{
170170
for (var i = 1; i <= 3; i++)
@@ -176,7 +176,7 @@ public void Sum_With_Predicate_Should_Return_Sum(IRepository<Contact, string> re
176176
repository.Sum(x => x.ContactTypeId > 1, x => x.ContactTypeId).ShouldBe(5);
177177
}
178178

179-
[ExecuteForAllRepositories]
179+
[ExecuteForAllRepositories("Sum_With_Specification_Should_Return_Sum")]
180180
public void Sum_With_Specification_Should_Return_Sum(IRepository<Contact, string> repository)
181181
{
182182
for (var i = 1; i <= 3; i++)
@@ -188,7 +188,7 @@ public void Sum_With_Specification_Should_Return_Sum(IRepository<Contact, string
188188
repository.Sum(new Specification<Contact>(x => x.ContactTypeId > 1), x => x.ContactTypeId).ShouldBe(5);
189189
}
190190

191-
[ExecuteForAllRepositories]
191+
[ExecuteForAllRepositories("Sum_Decimal_All_Should_Return_Sum")]
192192
public void Sum_Decimal_All_Should_Return_Sum(IRepository<Contact, string> repository)
193193
{
194194
for (var i = 1; i <= 3; i++)
@@ -200,7 +200,7 @@ public void Sum_Decimal_All_Should_Return_Sum(IRepository<Contact, string> repos
200200
repository.Sum(x => x.SumDecimal).ShouldBe(7.5m);
201201
}
202202

203-
[ExecuteForAllRepositories]
203+
[ExecuteForAllRepositories("Sum_Decimal_With_Predicate_Should_Return_Sum")]
204204
public void Sum_Decimal_With_Predicate_Should_Return_Sum(IRepository<Contact, string> repository)
205205
{
206206
for (var i = 1; i <= 3; i++)
@@ -212,7 +212,7 @@ public void Sum_Decimal_With_Predicate_Should_Return_Sum(IRepository<Contact, st
212212
repository.Sum(x => x.ContactTypeId > 1, x => x.SumDecimal).ShouldBe(6m);
213213
}
214214

215-
[ExecuteForAllRepositories]
215+
[ExecuteForAllRepositories("Average_All_Should_Return_Average")]
216216
public void Average_All_Should_Return_Average(IRepository<Contact, string> repository)
217217
{
218218
for (var i = 1; i <= 3; i++)
@@ -224,7 +224,7 @@ public void Average_All_Should_Return_Average(IRepository<Contact, string> repos
224224
repository.Average(x => x.ContactTypeId).ShouldBe(2.0);
225225
}
226226

227-
[ExecuteForAllRepositories]
227+
[ExecuteForAllRepositories("Average_With_Predicate_Should_Return_Average")]
228228
public void Average_With_Predicate_Should_Return_Average(IRepository<Contact, string> repository)
229229
{
230230
for (var i = 1; i <= 3; i++)
@@ -236,7 +236,7 @@ public void Average_With_Predicate_Should_Return_Average(IRepository<Contact, st
236236
repository.Average(x => x.ContactTypeId > 1, x => x.ContactTypeId).ShouldBe(2.5);
237237
}
238238

239-
[ExecuteForAllRepositories]
239+
[ExecuteForAllRepositories("Average_With_Specification_Should_Return_Average")]
240240
public void Average_With_Specification_Should_Return_Average(IRepository<Contact, string> repository)
241241
{
242242
for (var i = 1; i <= 3; i++)
@@ -248,7 +248,7 @@ public void Average_With_Specification_Should_Return_Average(IRepository<Contact
248248
repository.Average(new Specification<Contact>(x => x.ContactTypeId > 1), x => x.ContactTypeId).ShouldBe(2.5);
249249
}
250250

251-
[ExecuteForAllRepositories]
251+
[ExecuteForAllRepositories("Average_Decimal_All_Should_Return_Average")]
252252
public void Average_Decimal_All_Should_Return_Average(IRepository<Contact, string> repository)
253253
{
254254
for (var i = 1; i <= 3; i++)
@@ -260,7 +260,7 @@ public void Average_Decimal_All_Should_Return_Average(IRepository<Contact, strin
260260
repository.Average(x => x.SumDecimal).ShouldBe(2.5m);
261261
}
262262

263-
[ExecuteForAllRepositories]
263+
[ExecuteForAllRepositories("Average_Decimal_With_Predicate_Should_Return_Average")]
264264
public void Average_Decimal_With_Predicate_Should_Return_Average(IRepository<Contact, string> repository)
265265
{
266266
for (var i = 1; i <= 3; i++)
@@ -272,7 +272,7 @@ public void Average_Decimal_With_Predicate_Should_Return_Average(IRepository<Con
272272
repository.Average(x => x.ContactTypeId > 1, x => x.SumDecimal).ShouldBe(3m);
273273
}
274274

275-
[ExecuteForAllRepositories]
275+
[ExecuteForAllRepositories("Min_All_Should_Return_One")]
276276
public void Min_All_Should_Return_One(IRepository<Contact, string> repository)
277277
{
278278
for (var i = 1; i <= 3; i++)
@@ -284,7 +284,7 @@ public void Min_All_Should_Return_One(IRepository<Contact, string> repository)
284284
repository.Min(x => x.ContactTypeId).ShouldBe(1);
285285
}
286286

287-
[ExecuteForAllRepositories]
287+
[ExecuteForAllRepositories("Min_With_Predicate_Should_Return_Min")]
288288
public void Min_With_Predicate_Should_Return_Min(IRepository<Contact, string> repository)
289289
{
290290
for (var i = 1; i <= 3; i++)
@@ -296,7 +296,7 @@ public void Min_With_Predicate_Should_Return_Min(IRepository<Contact, string> re
296296
repository.Min(x => x.ContactTypeId > 1, x => x.ContactTypeId).ShouldBe(2);
297297
}
298298

299-
[ExecuteForAllRepositories]
299+
[ExecuteForAllRepositories("Min_Decimal_All_Should_Return_Min")]
300300
public void Min_Decimal_All_Should_Return_Min(IRepository<Contact, string> repository)
301301
{
302302
for (var i = 1; i <= 3; i++)
@@ -308,7 +308,7 @@ public void Min_Decimal_All_Should_Return_Min(IRepository<Contact, string> repos
308308
repository.Min(x => x.SumDecimal).ShouldBe(1.5m);
309309
}
310310

311-
[ExecuteForAllRepositories]
311+
[ExecuteForAllRepositories("Min_Decimal_With_Predicate_Should_Return_Min")]
312312
public void Min_Decimal_With_Predicate_Should_Return_Min(IRepository<Contact, string> repository)
313313
{
314314
for (var i = 1; i <= 3; i++)
@@ -320,7 +320,7 @@ public void Min_Decimal_With_Predicate_Should_Return_Min(IRepository<Contact, st
320320
repository.Min(x => x.ContactTypeId > 1, x => x.SumDecimal).ShouldBe(2.5m);
321321
}
322322

323-
[ExecuteForAllRepositories]
323+
[ExecuteForAllRepositories("Max_All_Should_Return_Max")]
324324
public void Max_All_Should_Return_Max(IRepository<Contact, string> repository)
325325
{
326326
for (var i = 1; i <= 3; i++)
@@ -332,7 +332,7 @@ public void Max_All_Should_Return_Max(IRepository<Contact, string> repository)
332332
repository.Max(x => x.ContactTypeId).ShouldBe(3);
333333
}
334334

335-
[ExecuteForAllRepositories]
335+
[ExecuteForAllRepositories("Max_With_Predicate_Should_Return_Max")]
336336
public void Max_With_Predicate_Should_Return_Max(IRepository<Contact, string> repository)
337337
{
338338
for (var i = 1; i <= 3; i++)
@@ -343,57 +343,5 @@ public void Max_With_Predicate_Should_Return_Max(IRepository<Contact, string> re
343343

344344
repository.Max(x => x.ContactTypeId < 3, x => x.ContactTypeId).ShouldBe(2);
345345
}
346-
347-
//[ExecuteForAllRepositoriesExcept(RepositoryType.CouchDb, RepositoryType.MongoDb, RepositoryType.RavenDb, Reason = "GroupBy Not Supported")]
348-
//public void GroupMin_Should_Return_Proper_Counts(IRepository<Contact, string> repository)
349-
//{
350-
// for (var i = 1; i <= 3; i++)
351-
// {
352-
// var contact = new Contact { Name = "Test User " + i, ContactTypeId = 1, SumDecimal = 0.5m + i };
353-
// repository.Add(contact);
354-
// }
355-
// for (var i = 4; i <= 7; i++)
356-
// {
357-
// var contact = new Contact { Name = "Test User " + i, ContactTypeId = 2, SumDecimal = 0.5m + i };
358-
// repository.Add(contact);
359-
// }
360-
361-
// var groups = repository.GroupMin(x => x.ContactTypeId, x => x.SumDecimal);
362-
363-
// groups.Count().ShouldBe(2);
364-
365-
366-
// groups[1].ShouldBe(1.5m);
367-
// groups[2].ShouldBe(4.5m);
368-
//}
369-
370-
//[ExecuteForAllRepositoriesExcept(RepositoryType.CouchDb, RepositoryType.MongoDb, RepositoryType.RavenDb, Reason = "GroupBy Not Supported")]
371-
//public void GroupMax_Should_Return_Proper_Counts(IRepository<Contact, string> repository)
372-
//{
373-
// for (var i = 1; i <= 3; i++)
374-
// {
375-
// var contact = new Contact { Name = "Test User " + i, ContactTypeId = 1, SumDecimal = 0.5m + i };
376-
// repository.Add(contact);
377-
// }
378-
// for (var i = 4; i <= 7; i++)
379-
// {
380-
// var contact = new Contact { Name = "Test User " + i, ContactTypeId = 2, SumDecimal = 0.5m + i };
381-
// repository.Add(contact);
382-
// }
383-
384-
// var groups = repository.GroupBy(x => x.ContactTypeId,
385-
// x => new { Key = x.Key, Max = x.Max(o => o.SumDecimal) });
386-
387-
// var groups = repository.GroupMax(x => x.ContactTypeId, x => x.SumDecimal);
388-
389-
// groups.Count().ShouldBe(2);
390-
// groups.First().Key.ShouldBe(1);
391-
// groups.First().Max.ShouldBe(3.5m);
392-
// groups.Last().Key.ShouldBe(2);
393-
// groups.Last().Max.ShouldBe(7.5m);
394-
// groups[1].ShouldBe(3.5m);
395-
// groups[2].ShouldBe(7.5m);
396-
//}
397-
398346
}
399347
}

‎SharpRepository.Tests.Integration/App.config‎

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

‎SharpRepository.Tests.Integration/CompoundKeyRepositoryAddTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace SharpRepository.Tests.Integration
1111
[TestFixture]
1212
public class CompoundKeyRepositoryAddTests : TestBase
1313
{
14-
[ExecuteForAllCompoundKeyRepositories]
14+
[ExecuteForAllCompoundKeyRepositories("Add_Should_Result_In_Proper_Total_Items")]
1515
public void Add_Should_Result_In_Proper_Total_Items(ICompoundKeyRepository<User, string, int> repository)
1616
{
1717
repository.Add(new User { Username = "Test User", Age = 11, FullName = "Test User - 11"});
@@ -20,7 +20,7 @@ public void Add_Should_Result_In_Proper_Total_Items(ICompoundKeyRepository<User,
2020
result.Count().ShouldBe(1);
2121
}
2222

23-
[ExecuteForAllCompoundKeyRepositories]
23+
[ExecuteForAllCompoundKeyRepositories("Add_InBatchMode_Should_Delay_The_Action")]
2424
public void Add_InBatchMode_Should_Delay_The_Action(ICompoundKeyRepository<User, string, int> repository)
2525
{
2626
using (var batch = repository.BeginBatch())
@@ -39,7 +39,7 @@ public void Add_InBatchMode_Should_Delay_The_Action(ICompoundKeyRepository<User,
3939
repository.GetAll().Count().ShouldBe(2);
4040
}
4141

42-
[ExecuteForCompoundKeyRepositories(RepositoryType.Ef)]
42+
[ExecuteForCompoundKeyRepositories("Using_TransactionScope_Without_Complete_Should_Not_Add", RepositoryType.Ef)]
4343
public void Using_TransactionScope_Without_Complete_Should_Not_Add(ICompoundKeyRepository<User, string, int> repository)
4444
{
4545
repository.Get("test", 1); // used to create the SqlCe database before being inside the transaction scope since that throws an error
@@ -52,7 +52,7 @@ public void Using_TransactionScope_Without_Complete_Should_Not_Add(ICompoundKeyR
5252
repository.GetAll().Count().ShouldBe(0);
5353
}
5454

55-
[ExecuteForCompoundKeyRepositories(RepositoryType.Ef)]
55+
[ExecuteForCompoundKeyRepositories("Using_TransactionScope_With_Complete_Should_Add", RepositoryType.Ef)]
5656
public void Using_TransactionScope_With_Complete_Should_Add(ICompoundKeyRepository<User, string, int> repository)
5757
{
5858
repository.Get("test", 1); // used to create the SqlCe database before being inside the transaction scope since that throws an error

0 commit comments

Comments
 (0)