[GH-54] - proper way of finding InternalsVisibleTo attribute (#55)

nsubstitute · Nov 22, 2018 · cbeafd3 · cbeafd3
1 parent e0edb93
commit cbeafd3
Show file tree

Hide file tree

Showing 20 changed files with 297 additions and 7 deletions.
diff --git a/src/NSubstitute.Analyzers.Shared/Extensions/ISymbolExtensions.cs b/src/NSubstitute.Analyzers.Shared/Extensions/ISymbolExtensions.cs
@@ -12,13 +12,10 @@ public static bool CanBeSetuped(this ISymbol symbol)
 
         public static bool InternalsVisibleToProxyGenerator(this ISymbol typeSymbol)
         {
-            var internalsVisibleToAttribute = typeSymbol.ContainingAssembly.GetAttributes()
-                .FirstOrDefault(att =>
-                    att.AttributeClass.ToString() == MetadataNames.InternalsVisibleToAttributeFullTypeName);
-
-            return internalsVisibleToAttribute != null &&
-                   internalsVisibleToAttribute.ConstructorArguments.Any(arg =>
-                       arg.Value.ToString() == MetadataNames.CastleDynamicProxyGenAssembly2Name);
+            return typeSymbol.ContainingAssembly != null &&
+                   typeSymbol.ContainingAssembly.GetAttributes()
+                       .Any(att => att.AttributeClass.ToString() == MetadataNames.InternalsVisibleToAttributeFullTypeName &&
+                                   att.ConstructorArguments.Any(arg => arg.Value.ToString() == MetadataNames.CastleDynamicProxyGenAssembly2Name));
         }
 
         public static string ToMinimalMethodString(this ISymbol symbol, SemanticModel semanticModel)

diff --git a/...xProviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsGenericMethodTests.cs b/...xProviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsGenericMethodTests.cs
@@ -202,5 +202,36 @@ public void Test()
 }";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"using NSubstitute;
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")]
+
+namespace MyNamespace
+{
+    internal class Foo
+    {
+        internal class Bar
+        {
+
+        }
+    }
+
+    public class FooTests
+    {
+        public void Test()
+        {
+            var substitute = Substitute.For<Foo>();
+        }
+    }
+}";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...oviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsNonGenericMethodTests.cs b/...oviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsNonGenericMethodTests.cs
@@ -202,5 +202,36 @@ public void Test()
 }";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"using NSubstitute;
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")]
+
+namespace MyNamespace
+{
+    internal class Foo
+    {
+        internal class Bar
+        {
+
+        }
+    }
+
+    public class FooTests
+    {
+        public void Test()
+        {
+            var substitute = Substitute.For(new[] {typeof(Foo)}, null);
+        }
+    }
+}";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...FixProviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForPartsOfMethodTests.cs b/...FixProviderTests/SubstituteForInternalMemberCodeFixProviderTests/ForPartsOfMethodTests.cs
@@ -202,5 +202,36 @@ public void Test()
 }";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"using NSubstitute;
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")]
+
+namespace MyNamespace
+{
+    internal class Foo
+    {
+        internal class Bar
+        {
+
+        }
+    }
+
+    public class FooTests
+    {
+        public void Test()
+        {
+            var substitute = Substitute.ForPartsOf<Foo>();
+        }
+    }
+}";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...sts/SubstituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreateMethodTests.cs b/...sts/SubstituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreateMethodTests.cs
@@ -202,5 +202,36 @@ public void Test()
 }";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"using NSubstitute.Core;
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")]
+
+namespace MyNamespace
+{
+    internal class Foo
+    {
+        internal class Bar
+        {
+
+        }
+    }
+
+    public class FooTests
+    {
+        public void Test()
+        {
+            var substitute = SubstitutionContext.Current.SubstituteFactory.Create(new[] {typeof(Foo)}, null);
+        }
+    }
+}";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...stituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreatePartialMethodTests.cs b/...stituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreatePartialMethodTests.cs
@@ -202,5 +202,36 @@ public void Test()
 }";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"using NSubstitute.Core;
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")]
+
+namespace MyNamespace
+{
+    internal class Foo
+    {
+        internal class Bar
+        {
+
+        }
+    }
+
+    public class FooTests
+    {
+        public void Test()
+        {
+            var substitute = SubstitutionContext.Current.SubstituteFactory.CreatePartial(new[] {typeof(Foo)}, null);
+        }
+    }
+}";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...tituteForInternalMemberCodeFixProviderTests/SubstituteForInternalMemberCodeFixVerifier.cs b/...tituteForInternalMemberCodeFixProviderTests/SubstituteForInternalMemberCodeFixVerifier.cs
@@ -20,6 +20,8 @@ public abstract class SubstituteForInternalMemberCodeFixVerifier : CSharpCodeFix
 
         public abstract Task DoesNot_AppendsInternalsVisibleTo_WhenUsedWithPublicClass();
 
+        public abstract Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2();
+
         protected override DiagnosticAnalyzer GetDiagnosticAnalyzer()
         {
             return new SubstituteAnalyzer();

diff --git a/...s.Tests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForAsGenericMethodTests.cs b/...s.Tests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForAsGenericMethodTests.cs
@@ -450,7 +450,9 @@ public override async Task
         {
             var source = @"using NSubstitute;
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo(""OtherFirstAssembly"")]
 [assembly: InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: InternalsVisibleTo(""OtherSecondAssembly"")]
 namespace MyNamespace
 {
     internal class Foo

diff --git a/...ests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForAsNonGenericMethodTests.cs b/...ests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForAsNonGenericMethodTests.cs
@@ -502,7 +502,9 @@ public override async Task ReturnsNoDiagnostic_WhenUsedWithInternalClass_AndInte
         {
             var source = @"using NSubstitute;
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo(""OtherFirstAssembly"")]
 [assembly: InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: InternalsVisibleTo(""OtherSecondAssembly"")]
 namespace MyNamespace
 {
     internal class Foo

diff --git a/...ers.Tests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForPartsOfMethodTests.cs b/...ers.Tests.CSharp/DiagnosticAnalyzerTests/SubstituteAnalyzerTests/ForPartsOfMethodTests.cs
@@ -256,7 +256,9 @@ public override async Task ReturnsNoDiagnostic_WhenUsedWithInternalClass_AndInte
         {
             var source = @"using NSubstitute;
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo(""OtherFirstAssembly"")]
 [assembly: InternalsVisibleTo(""DynamicProxyGenAssembly2"")]
+[assembly: InternalsVisibleTo(""OtherSecondAssembly"")]
 namespace MyNamespace
 {
     internal class Foo

diff --git a/...te.Analyzers.Tests.Shared/CodeFixProviders/ISubstituteForInternalMemberCodeFixVerifier.cs b/...te.Analyzers.Tests.Shared/CodeFixProviders/ISubstituteForInternalMemberCodeFixVerifier.cs
@@ -13,5 +13,7 @@ public interface ISubstituteForInternalMemberCodeFixVerifier
         Task AppendsInternalsVisibleTo_WhenUsedWithNestedInternalClass();
 
         Task DoesNot_AppendsInternalsVisibleTo_WhenUsedWithPublicClass();
+
+        Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2();
     }
 }
diff --git a/...ProvidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsGenericMethodTests.cs b/...ProvidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsGenericMethodTests.cs
@@ -165,5 +165,29 @@ End Namespace
 ";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"Imports NSubstitute.Core
+
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")>
+Namespace MyNamespace
+    Friend Class Foo
+        Friend Class Bar
+        End Class
+    End Class
+
+    Public Class FooTests
+        Public Sub Test()
+            Dim substitute = NSubstitute.Substitute.For(Of Foo)()
+        End Sub
+    End Class
+End Namespace";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...vidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsNonGenericMethodTests.cs b/...vidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForAsNonGenericMethodTests.cs
@@ -165,5 +165,29 @@ End Namespace
 ";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"Imports NSubstitute.Core
+
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")>
+Namespace MyNamespace
+    Friend Class Foo
+        Friend Class Bar
+        End Class
+    End Class
+
+    Public Class FooTests
+        Public Sub Test()
+            Dim substitute = NSubstitute.Substitute.[For]({GetType(Foo)}, Nothing)
+        End Sub
+    End Class
+End Namespace";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...ixProvidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForPartsOfMethodTests.cs b/...ixProvidersTests/SubstituteForInternalMemberCodeFixProviderTests/ForPartsOfMethodTests.cs
@@ -165,5 +165,29 @@ End Namespace
 ";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"Imports NSubstitute.Core
+
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")>
+Namespace MyNamespace
+    Friend Class Foo
+        Friend Class Bar
+        End Class
+    End Class
+
+    Public Class FooTests
+        Public Sub Test()
+            NSubstitute.Substitute.ForPartsOf(Of Foo)()
+        End Sub
+    End Class
+End Namespace";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }
diff --git a/...sts/SubstituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreateMethodTests.cs b/...sts/SubstituteForInternalMemberCodeFixProviderTests/SubstituteFactoryCreateMethodTests.cs
@@ -165,5 +165,29 @@ End Namespace
 ";
             await VerifyFix(oldSource, oldSource);
         }
+
+        [Fact]
+        public override async Task DoesNot_AppendsInternalsVisibleTo_WhenInternalsVisibleToAppliedToDynamicProxyGenAssembly2()
+        {
+            var oldSource = @"Imports NSubstitute.Core
+
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherFirstAssembly"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""DynamicProxyGenAssembly2"")>
+<Assembly: System.Runtime.CompilerServices.InternalsVisibleTo(""OtherSecondAssembly"")>
+Namespace MyNamespace
+    Friend Class Foo
+        Friend Class Bar
+        End Class
+    End Class
+
+    Public Class FooTests
+        Public Sub Test()
+            Dim substitute = SubstitutionContext.Current.SubstituteFactory.Create({GetType(Foo)}, Nothing)
+        End Sub
+    End Class
+End Namespace";
+
+            await VerifyFix(oldSource, oldSource);
+        }
     }
 }