Merge pull request #327 from sharwell/use-nameof

Use nameof in a few appropriate places

Author: tonerdo

src/coverlet.core/Instrumentation/Instrumenter.cs

@@ -170,9 +170,9 @@ private void AddCustomModuleTrackerToModule(ModuleDefinition module)
 
                     _customTrackerTypeDef.Fields.Add(fieldClone);
 
-                    if (fieldClone.Name == "HitsArray")
+                    if (fieldClone.Name == nameof(ModuleTrackerTemplate.HitsArray))
                         _customTrackerHitsArray = fieldClone;
-                    else if (fieldClone.Name == "HitsFilePath")
+                    else if (fieldClone.Name == nameof(ModuleTrackerTemplate.HitsFilePath))
                         _customTrackerHitsFilePath = fieldClone;
                 }
 

test/coverlet.core.tests/Symbols/CecilSymbolHelperTests.cs

@@ -28,7 +28,7 @@ public void GetBranchPoints_OneBranch()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSingleDecision"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSingleDecision)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -50,7 +50,7 @@ public void GetBranchPoints_Using_Where_GeneratedBranchesIgnored()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSimpleUsingStatement"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSimpleUsingStatement)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -63,7 +63,7 @@ public void GetBranchPoints_GeneratedBranches_DueToCachedAnonymousMethodDelegate
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSimpleTaskWithLambda"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSimpleTaskWithLambda)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -76,7 +76,7 @@ public void GetBranchPoints_TwoBranch()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasTwoDecisions"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasTwoDecisions)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -95,7 +95,7 @@ public void GetBranchPoints_CompleteIf()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasCompleteIf"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasCompleteIf)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -113,7 +113,7 @@ public void GetBranchPoints_Switch()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSwitch"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSwitch)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -136,7 +136,7 @@ public void GetBranchPoints_SwitchWithDefault()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSwitchWithDefault"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSwitchWithDefault)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -159,7 +159,7 @@ public void GetBranchPoints_SwitchWithBreaks()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSwitchWithBreaks"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSwitchWithBreaks)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -182,7 +182,7 @@ public void GetBranchPoints_SwitchWithMultipleCases()
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::HasSwitchWithMultipleCases"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.HasSwitchWithMultipleCases)}"));
 
             // act
             var points = CecilSymbolHelper.GetBranchPoints(method);
@@ -226,7 +226,7 @@ public void GetBranchPoints_UsingWithException_Issue243_IgnoresBranchInFinallyBl
         {
             // arrange
             var type = _module.Types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
-            var method = type.Methods.First(x => x.FullName.Contains("::UsingWithException_Issue243"));
+            var method = type.Methods.First(x => x.FullName.Contains($"::{nameof(DeclaredConstructorClass.UsingWithException_Issue243)}"));
 
             // check that the method is laid out the way we discovered it to be during the defect
             // @see https://github.com/OpenCover/opencover/issues/243