Skip to content

Commit f938239

Browse files
authored
Add NUnit analyzers (#3492)
1 parent 5675110 commit f938239

File tree

68 files changed

+310
-304
lines changed

Some content is hidden

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

68 files changed

+310
-304
lines changed

.editorconfig

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ csharp_new_line_before_members_in_object_initializers = true
1515
csharp_new_line_before_members_in_anonymous_types = true
1616
csharp_new_line_between_query_expression_clauses = true
1717

18+
dotnet_diagnostic.NUnit1032.severity = suggestion
19+
dotnet_diagnostic.NUnit1028.severity = none
20+
dotnet_diagnostic.NUnit2045.severity = none
21+
# Consider using the constraint model, Assert.That
22+
dotnet_diagnostic.NUnit2005.severity = suggestion
23+
dotnet_diagnostic.NUnit2006.severity = suggestion
24+
dotnet_diagnostic.NUnit2015.severity = suggestion
25+
dotnet_diagnostic.NUnit2031.severity = suggestion
26+
dotnet_diagnostic.NUnit2049.severity = suggestion
27+
# NUnit 4 no longer supports string.Format specification for Assert
28+
dotnet_diagnostic.NUnit2050.severity = suggestion
29+
# The SameAs constraint always fails on value types as the actual and the expected value cannot be the same reference
30+
dotnet_diagnostic.NUnit2040.severity = suggestion
31+
1832
[*.xsd]
1933
indent_style = tab
2034

@@ -34,9 +48,5 @@ indent_size = 2
3448
indent_style = space
3549
indent_size = 2
3650

37-
[*.cshtml]
38-
indent_style = space
39-
indent_size = 4
40-
4151
[*.g]
4252
indent_style = tab

src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ public async Task MultipleCollectionFetchAsync()
199199
Assert.AreEqual(2, c.Orders.Count);
200200
Assert.IsTrue(NHibernateUtil.IsInitialized(((Order) c.Orders[0]).LineItems));
201201
Assert.IsTrue(NHibernateUtil.IsInitialized(((Order) c.Orders[1]).LineItems));
202-
Assert.AreEqual(((Order) c.Orders[0]).LineItems.Count, 2);
203-
Assert.AreEqual(((Order) c.Orders[1]).LineItems.Count, 2);
202+
Assert.AreEqual(2, ((Order) c.Orders[0]).LineItems.Count);
203+
Assert.AreEqual(2, ((Order) c.Orders[1]).LineItems.Count);
204204
await (t.CommitAsync());
205205
s.Close();
206206

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3093,7 +3093,7 @@ public async Task CanSetLockModeOnDetachedCriteriaAsync()
30933093
var countExec = CriteriaTransformer.TransformToRowCount(ec);
30943094
var countRes = await (countExec.UniqueResultAsync());
30953095

3096-
Assert.AreEqual(countRes, 1);
3096+
Assert.AreEqual(1, countRes);
30973097
}
30983098
}
30993099
}

src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public async Task SelectModeFetchLazyPropertiesForEntityJoinAsync()
347347

348348
Assert.That(NHibernateUtil.IsInitialized(rootChild), Is.True);
349349
Assert.That(NHibernateUtil.IsInitialized(parentJoin), Is.True);
350-
Assert.That(NHibernateUtil.IsPropertyInitialized(parentJoin, nameof(parentJoin.LazyProp)), Is.Not.Null.Or.Empty);
350+
Assert.That(NHibernateUtil.IsPropertyInitialized(parentJoin, nameof(parentJoin.LazyProp)), Is.True);
351351
Assert.That(parentJoin.LazyProp, Is.Not.Null.Or.Empty);
352352

353353
Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");

src/NHibernate.Test/Async/ExpressionTest/Projection/ProjectionSqlFixture.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ public async Task QueryTestWithStrongTypeReturnValueAsync()
7474
.Add(Projections.Min("Pay")));
7575
c.SetResultTransformer(trans);
7676
ProjectionReport report = await (c.UniqueResultAsync<ProjectionReport>());
77-
Assert.AreEqual(report.AvgPay, 2.5);
78-
Assert.AreEqual(report.MaxPay, 4);
79-
Assert.AreEqual(report.MinPay, 1);
77+
Assert.AreEqual(2.5, report.AvgPay);
78+
Assert.AreEqual(4, report.MaxPay);
79+
Assert.AreEqual(1, report.MinPay);
8080
}
8181
}
8282

@@ -97,10 +97,10 @@ public async Task QueryTest1Async()
9797
Assert.IsTrue(result[0] is object[],
9898
"expected object[] as result, but found " + result[0].GetType().Name);
9999
object[] results = (object[])result[0];
100-
Assert.AreEqual(results.Length, 3);
101-
Assert.AreEqual(results[0], 2.5);
102-
Assert.AreEqual(results[1], 4);
103-
Assert.AreEqual(results[2], 1);
100+
Assert.AreEqual(3, results.Length);
101+
Assert.AreEqual(2.5, results[0]);
102+
Assert.AreEqual(4, results[1]);
103+
Assert.AreEqual(1, results[2]);
104104
}
105105
}
106106

@@ -119,7 +119,7 @@ public async Task SelectSqlProjectionTestAsync()
119119
IList result = await (c.ListAsync()); // c.UniqueResult();
120120
Assert.IsTrue(result.Count == 1);
121121
object results = result[0];
122-
Assert.AreEqual(results, 2.5);
122+
Assert.AreEqual(2.5, results);
123123
}
124124
}
125125
}

src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public async Task CombinedClassAndCollectionFiltersEnabledAsync()
108108
salespersons = await (session.CreateQuery("select s from Salesperson as s left join fetch s.Orders").ListAsync());
109109
Assert.AreEqual(1, salespersons.Count, "Incorrect salesperson count");
110110
sp = (Salesperson) salespersons[0];
111-
Assert.AreEqual(sp.Orders.Count, 1, "Incorrect order count");
111+
Assert.AreEqual(1, sp.Orders.Count, "Incorrect order count");
112112
}
113113
}
114114

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,8 +1078,8 @@ public async Task PropertyRefAsync()
10781078
using (ISession s = OpenSession())
10791079
{
10801080
Holder h = (Holder) await (s.LoadAsync(typeof(Holder), hid));
1081-
Assert.AreEqual(h.Name, "foo");
1082-
Assert.AreEqual(h.OtherHolder.Name, "bar");
1081+
Assert.AreEqual("foo", h.Name);
1082+
Assert.AreEqual("bar", h.OtherHolder.Name);
10831083
object[] res =
10841084
(object[]) (await (s.CreateQuery("from Holder h join h.OtherHolder oh where h.OtherHolder.Name = 'bar'").ListAsync()))[0];
10851085
Assert.AreSame(h, res[0]);
@@ -1430,7 +1430,7 @@ public async Task SortablesAsync()
14301430
// DictionaryEntry key - not the index.
14311431
foreach (Sortable sortable in b.Sortablez)
14321432
{
1433-
Assert.AreEqual(sortable.name, "bar");
1433+
Assert.AreEqual("bar", sortable.name);
14341434
break;
14351435
}
14361436

@@ -1446,7 +1446,7 @@ public async Task SortablesAsync()
14461446
Assert.IsTrue(b.Sortablez.Count == 3);
14471447
foreach (Sortable sortable in b.Sortablez)
14481448
{
1449-
Assert.AreEqual(sortable.name, "bar");
1449+
Assert.AreEqual("bar", sortable.name);
14501450
break;
14511451
}
14521452
await (s.FlushAsync());
@@ -1461,7 +1461,7 @@ public async Task SortablesAsync()
14611461
Assert.IsTrue(b.Sortablez.Count == 3);
14621462
foreach (Sortable sortable in b.Sortablez)
14631463
{
1464-
Assert.AreEqual(sortable.name, "bar");
1464+
Assert.AreEqual("bar", sortable.name);
14651465
break;
14661466
}
14671467
await (s.DeleteAsync(b));

src/NHibernate.Test/Async/Legacy/MasterDetailTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public async Task CopyCascadeAsync()
184184
// Save parent and cascade update detached child
185185
Category persistentParent = await (s.MergeAsync(parent));
186186
Assert.IsTrue(persistentParent.Subcategories.Count == 1);
187-
Assert.AreEqual(((Category) persistentParent.Subcategories[0]).Name, "child2");
187+
Assert.AreEqual("child2", ((Category) persistentParent.Subcategories[0]).Name);
188188
await (s.FlushAsync());
189189
s.Close();
190190

src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ public async Task ComponentNoStarAsync()
481481
IQuery q = session.CreateSQLQuery(sql).AddEntity("comp", typeof(Componentizable));
482482
IList list = await (q.ListAsync(cancellationToken));
483483

484-
Assert.AreEqual(list.Count, 1);
484+
Assert.AreEqual(1, list.Count);
485485

486486
Componentizable co = (Componentizable) list[0];
487487

src/NHibernate.Test/Async/Linq/ByMethod/AverageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task CanGetAverageOfIntegersAsDoubleAsync()
2525
//NH-2429
2626
var average = await (db.Products.AverageAsync(x => x.UnitsOnOrder));
2727

28-
Assert.AreEqual(average, 10.129870d, 0.000001d);
28+
Assert.AreEqual(10.129870d, average, 0.000001d);
2929
}
3030
}
3131
}

0 commit comments

Comments
 (0)