add testing

Author: dsyme

tests/fsharp/core/fsfromfsviacs/lib2.cs

@@ -2,29 +2,31 @@
 using Microsoft.FSharp.Core;
 using Microsoft.FSharp.Collections;
 
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("a")]
+
 public class Lib2
 {
     public static Lib.recd1 r1 = new Lib.recd1(3);
     public static Lib.recd2 r2 = new Lib.recd2(3, "a");
     public static Lib.rrecd2 rr2 = new Lib.rrecd2("a", 3);
     public static Lib.recd3<string> r3 = new Lib.recd3<string>(4, "c", null);
-    
+
     public static Lib.discr1_0 d10a = Lib.discr1_0.Discr1_0_A;
     public static Lib.discr1_1 d11a = Lib.discr1_1.NewDiscr1_1_A(3);
     public static Lib.discr1_2 d12a = Lib.discr1_2.NewDiscr1_2_A(3, 4);
-    
+
     public static Lib.discr2_0_0 d200a = Lib.discr2_0_0.Discr2_0_0_A;
     public static Lib.discr2_1_0 d210a = Lib.discr2_1_0.NewDiscr2_1_0_A(3);
     public static Lib.discr2_0_1 d201a = Lib.discr2_0_1.Discr2_0_1_A;
     public static Lib.discr2_1_1 d211a = Lib.discr2_1_1.NewDiscr2_1_1_A(3);
-    
+
     public static Lib.discr2_0_0 d200b = Lib.discr2_0_0.Discr2_0_0_B;
     public static Lib.discr2_1_0 d210b = Lib.discr2_1_0.Discr2_1_0_B;
     public static Lib.discr2_0_1 d201b = Lib.discr2_0_1.NewDiscr2_0_1_B(3);
     public static Lib.discr2_1_1 d211b = Lib.discr2_1_1.NewDiscr2_1_1_B(4);
 
-    public static FSharpList<int> li1 = FSharpList<int>.Cons(3,FSharpList<int>.Empty);
-    public static FSharpList<Lib.recd1> lr1 = FSharpList<Lib.recd1>.Cons(r1,FSharpList<Lib.recd1>.Empty);
+    public static FSharpList<int> li1 = FSharpList<int>.Cons(3, FSharpList<int>.Empty);
+    public static FSharpList<Lib.recd1> lr1 = FSharpList<Lib.recd1>.Cons(r1, FSharpList<Lib.recd1>.Empty);
 
     public static FSharpOption<int> oi1 = FSharpOption<int>.Some(3);
     public static FSharpOption<Lib.recd1> or1 = FSharpOption<Lib.recd1>.Some(r1);
@@ -34,8 +36,27 @@ public class Lib2
 
     public static Lib.StructUnionsTests.U0 u0 = Lib.StructUnionsTests.U0.U0;
     public static Lib.StructUnionsTests.U1 u1 = Lib.StructUnionsTests.U1.NewU1(3);
-    public static Lib.StructUnionsTests.U2 u2 = Lib.StructUnionsTests.U2.NewU2(3,4);
+    public static Lib.StructUnionsTests.U2 u2 = Lib.StructUnionsTests.U2.NewU2(3, 4);
 
-    static Lib2() {     r3.recd3field3 = r3; }
+    static Lib2() { r3.recd3field3 = r3; }
+
+}
+
+namespace Newtonsoft.Json.Converters
+{
+    internal class SomeClass
+    {
+        public SomeClass() { }
+        public static void SomeMethod() { }
+    }
+    public class ContainerClass
+    {
+        public ContainerClass() { }
+        internal class SomeClass
+        {
+            public SomeClass() { }
+            public static void SomeMethod() { }
+        }
 
+    }
 }

tests/fsharp/core/fsfromfsviacs/lib3.cs

@@ -0,0 +1,26 @@
+using Microsoft.FSharp;
+using Microsoft.FSharp.Core;
+using Microsoft.FSharp.Collections;
+
+namespace Newtonsoft.Json.Converters
+{
+    // This should be preferred over the same type in lib2.cs
+    public class SomeClass
+    {
+        public SomeClass() { }
+        public static void SomeMethod() { }
+    }
+
+    public class ContainerClass
+    {
+        public ContainerClass() { } 
+
+        // This should be preferred over the same type in lib2.cs
+        public class SomeClass
+        {
+            public SomeClass() { }
+            public static void SomeMethod() { }
+        }
+
+    }
+}

tests/fsharp/core/fsfromfsviacs/test.fsx

@@ -92,6 +92,12 @@ module NestedStructPatternMatchingAcrossAssemblyBoundaries =
     let _ = test "structunion394b3f" (testPattern3mut(u2))
 
 
+let TestAccessibility() = 
+     let x = new Newtonsoft.Json.Converters.SomeClass()
+     let x2 = new Newtonsoft.Json.Converters.ContainerClass.SomeClass()
+     Newtonsoft.Json.Converters.SomeClass.SomeMethod()
+     Newtonsoft.Json.Converters.ContainerClass.SomeClass.SomeMethod()
+
 (*
     public Lib.discr1_0 d10a = Lib.discr1_0.MkDiscr1_0_A();
     public Lib.discr1_1 d11a = Lib.discr1_1.MkDiscr1_1_A(3);

tests/fsharp/core/tests_core.fs

@@ -316,19 +316,21 @@ module FsFromFsViaCs =
         let csc = Printf.ksprintf (Commands.csc exec cfg.CSC)
         let fsc_flags = cfg.fsc_flags
 
-        // "%FSC%" %fsc_flags% -a -o:lib.dll -g lib.fs
         do! fsc "%s -a -o:lib.dll -g" fsc_flags ["lib.fs"]
 
-        // "%PEVERIFY%" lib.dll
         do! peverify "lib.dll"
 
-        // %CSC% /nologo /target:library /r:"%FSCOREDLLPATH%" /r:lib.dll /out:lib2.dll lib2.cs 
         do! csc """/nologo /target:library /r:"%s" /r:lib.dll /out:lib2.dll""" cfg.FSCOREDLLPATH ["lib2.cs"]
 
-        // "%FSC%" %fsc_flags% -r:lib.dll -r:lib2.dll -o:test.exe -g test.fsx
-        do! fsc "%s -r:lib.dll -r:lib2.dll -o:test.exe -g" fsc_flags ["test.fsx"]
+        do! csc """/nologo /target:library /r:"%s" /out:lib3.dll""" cfg.FSCOREDLLPATH ["lib3.cs"]
+
+        do! fsc "%s -r:lib.dll -r:lib2.dll -r:lib3.dll -o:test.exe -g" fsc_flags ["test.fsx"]
+
+        do! peverify "test.exe"
+
+        // Same with library refrences the other way around
+        do! fsc "%s -r:lib.dll -r:lib3.dll -r:lib2.dll -o:test.exe -g" fsc_flags ["test.fsx"]
 
-        // "%PEVERIFY%" test.exe 
         do! peverify "test.exe"
 
         }