Skip to content

Commit 56748e3

Browse files
authored
Fix warnings (#3056)
I do not like warnings, because I treat them as potential errors. :) So I fixed all warnings in the project, that could be fixed. Remaining warnings during build are now only those regarding mixing old and new .NET. ## Fixed warnings - `CS0168` The variable 'ex' is declared but never used - `MSTEST0001` Explicitly enable or disable tests parallelization (https://learn.microsoft.com/dotnet/core/testing/mstest-analyzers/mstest0001) - `MSTEST0017` Assertion arguments should be passed in the correct order. 'actual' and 'expected'/'notExpected' arguments have been swapped. - `MSTEST0037` Use proper asertion methods: - Use 'Assert.IsEmpty' instead of 'Assert.AreEqual' - Use 'Assert.HasCount' instead of 'Assert.AreEqual' - Use 'Assert.IsTrue' instead of 'Assert.AreEqual' - Use 'Assert.AreEqual' instead of 'Assert.IsTrue' - `MSTEST0044` 'DataTestMethod' is obsolete. Use 'TestMethod' instead. - `MSTEST0056` Use the 'DisplayName' property instead of passing a string argument to TestMethodAttribute - `NU1504` Duplicate 'PackageReference' items found. Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior. The duplicate 'PackageReference' items are: Newtonsoft.Json , Newtonsoft.Json. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **Tests** * Enabled parallel test execution at class level across test suites. * Updated test assertions for consistency and standardisation. * **Chores** * Removed unused JSON serialisation package dependencies. * Cleaned up imports and improved code formatting throughout tests. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 4a21a9d + 1c149bc commit 56748e3

File tree

15 files changed

+57
-62
lines changed

15 files changed

+57
-62
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]

src/MigrationTools.Clients.TfsObjectModel.Tests/Processors/TfsSharedQueryProcessorTests.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1-
using System.Collections.Generic;
2-
using Microsoft.Extensions.DependencyInjection;
3-
using Microsoft.VisualStudio.TestTools.UnitTesting;
4-
using MigrationTools.Endpoints;
5-
using MigrationTools.Tests;
6-
using MigrationTools.Processors.Infrastructure;
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
72

83
namespace MigrationTools.Processors.Tests
94
{
105
[TestClass()]
116
public class TfsSharedQueryProcessorTests : TfsProcessorTests
127
{
13-
[TestMethod("TfsSharedQueryProcessorTests_Incantate"), TestCategory("L0")]
8+
[TestMethod(DisplayName = "TfsSharedQueryProcessorTests_Incantate"), TestCategory("L0")]
149
public void Incantate()
1510
{
1611
var x = GetTfsSharedQueryProcessor();
1712
Assert.IsNotNull(x);
1813
}
1914

20-
[TestMethod("TfsSharedQueryProcessorTests_BasicConfigure"), TestCategory("L0")]
15+
[TestMethod(DisplayName = "TfsSharedQueryProcessorTests_BasicConfigure"), TestCategory("L0")]
2116
public void BasicConfigure()
2217
{
2318
var y = new TfsSharedQueryProcessorOptions
@@ -33,7 +28,7 @@ public void BasicConfigure()
3328
Assert.AreEqual("fortyTwo", x.Options.RefName);
3429
}
3530

36-
[TestMethod("TfsSharedQueryProcessorTests_BasicRun"), TestCategory("L0")]
31+
[TestMethod(DisplayName = "TfsSharedQueryProcessorTests_BasicRun"), TestCategory("L0")]
3732
public void BasicRun()
3833
{
3934
var y = new TfsSharedQueryProcessorOptions
@@ -48,4 +43,4 @@ public void BasicRun()
4843
Assert.IsNotNull(x);
4944
}
5045
}
51-
}
46+
}

src/MigrationTools.Clients.TfsObjectModel.Tests/Processors/TfsTeamSettingsProcessorTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.Extensions.DependencyInjection;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
32
using MigrationTools.Processors.Infrastructure;
43

54
namespace MigrationTools.Processors.Tests
@@ -28,7 +27,7 @@ public void TfsTeamSettingsProcessorConfigureTest()
2827
};
2928
var x = GetTfsTeamSettingsProcessor(y);
3029
Assert.IsNotNull(x);
31-
Assert.AreEqual(x.Options.SourceName, "TfsTeamSettingsSource");
30+
Assert.AreEqual("TfsTeamSettingsSource", x.Options.SourceName);
3231
Assert.IsNotNull(x.Source);
3332
}
3433

@@ -41,4 +40,4 @@ public void TfsTeamSettingsProcessorNoEnrichersTest()
4140
Assert.AreEqual(ProcessingStatus.Complete, processor.Status);
4241
}
4342
}
44-
}
43+
}

src/MigrationTools.Clients.TfsObjectModel.Tests/Processors/TfsWorkItemMigrationProcessorTests.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using Microsoft.Extensions.Options;
1+
using Microsoft.Extensions.Options;
72
using Microsoft.VisualStudio.TestTools.UnitTesting;
83

94
namespace MigrationTools.Processors.Tests
@@ -12,15 +7,15 @@ namespace MigrationTools.Processors.Tests
127
public class TfsWorkItemMigrationProcessorTests
138
{
149

15-
[TestMethod("TfsWorkItemMigrationProcessorTests_OptionsValidator_Empty"), TestCategory("L0")]
10+
[TestMethod(DisplayName = "TfsWorkItemMigrationProcessorTests_OptionsValidator_Empty"), TestCategory("L0")]
1611
public void OptionsValidator_Empty()
1712
{
1813
var validator = new TfsWorkItemMigrationProcessorOptionsValidator();
1914
var x = new TfsWorkItemMigrationProcessorOptions();
2015
Assert.IsTrue(validator.Validate(null, x).Failed);
2116
}
2217

23-
[TestMethod("TfsWorkItemMigrationProcessorTests_OptionsValidator_Valid"), TestCategory("L0")]
18+
[TestMethod(DisplayName = "TfsWorkItemMigrationProcessorTests_OptionsValidator_Valid"), TestCategory("L0")]
2419
public void OptionsValidator_Valid()
2520
{
2621
var validator = new TfsWorkItemMigrationProcessorOptionsValidator();

src/MigrationTools.Clients.TfsObjectModel.Tests/Tools/TfsRevisionManagerTests.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Microsoft.Extensions.DependencyInjection;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
66
using MigrationTools.DataContracts;
7-
using MigrationTools.Tests;
87
using MigrationTools.Tools;
98

109

@@ -38,8 +37,7 @@ public void TfsRevisionManagerToolInSync1()
3837

3938
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
4039

41-
Assert.AreEqual(revs.Count, 0);
42-
40+
Assert.IsEmpty(revs);
4341
}
4442

4543
[TestMethod(), TestCategory("L0")]
@@ -53,8 +51,7 @@ public void TfsRevisionManagerToolInSync10()
5351

5452
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
5553

56-
Assert.AreEqual(0, revs.Count);
57-
54+
Assert.IsEmpty(revs);
5855
}
5956

6057
[TestMethod(), TestCategory("L0")]
@@ -68,7 +65,7 @@ public void TfsRevisionManagerToolSync1()
6865

6966
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
7067

71-
Assert.AreEqual(1, revs.Count);
68+
Assert.HasCount(1, revs);
7269
}
7370

7471
[TestMethod(), TestCategory("L0")]
@@ -82,7 +79,7 @@ public void TfsRevisionManagerToolSync10()
8279

8380
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
8481

85-
Assert.AreEqual(10, revs.Count);
82+
Assert.HasCount(10, revs);
8683
}
8784

8885
[TestMethod(), TestCategory("L0")]
@@ -101,7 +98,7 @@ public void TfsRevisionManagerToolReplayRevisionsOff()
10198

10299
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
103100

104-
Assert.AreEqual(1, revs.Count);
101+
Assert.HasCount(1, revs);
105102
}
106103

107104

@@ -121,7 +118,7 @@ public void TfsRevisionManagerToolMaxRevision51()
121118

122119
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
123120

124-
Assert.AreEqual(0, revs.Count);
121+
Assert.IsEmpty(revs);
125122
}
126123

127124
[TestMethod(), TestCategory("L0")]
@@ -140,7 +137,7 @@ public void TfsRevisionManagerToolMaxRevision56()
140137

141138
var revs = processorEnricher.GetRevisionsToMigrate(source, target);
142139

143-
Assert.AreEqual(5, revs.Count);
140+
Assert.HasCount(5, revs);
144141
}
145142

146143
[TestMethod(), TestCategory("L0")]
@@ -158,7 +155,7 @@ public void TfsRevisionManagerToolMaxRevision59()
158155

159156
var revs = processorEnricher.GetRevisionsToMigrate(source, null);
160157

161-
Assert.AreEqual(5, revs.Count);
158+
Assert.HasCount(5, revs);
162159
}
163160

164161
[TestMethod(), TestCategory("L0")]
@@ -170,7 +167,7 @@ public void TfsRevisionManagerToolDatesMustBeIncreasing()
170167
List<RevisionItem> source = GetWorkItemWithRevisions(currentDateTime, 1, 10, false);
171168

172169
var revs = processorEnricher.GetRevisionsToMigrate(source, null);
173-
Assert.AreEqual(true, CheckDateIncreasing(revs));
170+
Assert.IsTrue(CheckDateIncreasing(revs));
174171
}
175172

176173
private static bool CheckDateIncreasing(List<RevisionItem> revs)

src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ private void PopulateWorkItem(WorkItemData oldWorkItemData, WorkItemData newWork
439439
newWorkItem.Fields["Microsoft.VSTS.Common.ClosedDate"].Value = oldWorkItem.Fields["Microsoft.VSTS.Common.ClosedDate"].Value;
440440
}
441441
}
442-
catch (FieldDefinitionNotExistException ex)
442+
catch (FieldDefinitionNotExistException)
443443
{
444444
// Eat exception coz the TFS API Sucks
445445
}

src/MigrationTools.ConsoleDataGenerator/MigrationTools.ConsoleDataGenerator.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Extensions.Options" />
3030
<PackageReference Include="YamlDotNet" />
31-
<PackageReference Include="Newtonsoft.Json" />
32-
<PackageReference Include="Newtonsoft.Json.Schema" />
3331
</ItemGroup>
3432

3533
<ItemGroup>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]

0 commit comments

Comments
 (0)