Rewrite offending test (#97118)

* Remove active issue

Author: AaronRobinsonMSFT

src/tests/Interop/CMakeLists.txt

@@ -65,7 +65,6 @@ add_subdirectory(DisabledRuntimeMarshalling)
 add_subdirectory(MonoAPI/Native)
 if(CLR_CMAKE_TARGET_WIN32)
     add_subdirectory(ExecInDefAppDom)
-    add_subdirectory(MarshalAPI/IUnknown)
     add_subdirectory(PInvoke/Attributes/LCID)
     add_subdirectory(PInvoke/BestFitMapping/Char)
     add_subdirectory(PInvoke/BestFitMapping/LPStr)

src/tests/Interop/Interop.csproj

@@ -48,7 +48,6 @@
     <CMakeProjectReference Include="MarshalAPI/**/CMakeLists.txt" />
     <CMakeProjectReference Include="PInvoke/**/CMakeLists.txt" />
 
-    <WindowsOnlyCMakeProjectReference Include="MarshalAPI/IUnknown/**/CMakeLists.txt" />
     <WindowsOnlyCMakeProjectReference Include="PInvoke/Attributes/LCID/**/CMakeLists.txt" />
     <WindowsOnlyCMakeProjectReference Include="PInvoke/BestFitMapping/**/CMakeLists.txt" />
     <WindowsOnlyCMakeProjectReference Include="PInvoke/Variant/**/CMakeLists.txt" />

src/tests/Interop/MarshalAPI/IUnknown/CMakeLists.txt

@@ -29,22 +29,12 @@ public override string ToString()
 
 public class IUnknownMarshalingTest
 {
-    [DllImport(@"IUnknownNative", CallingConvention = CallingConvention.Cdecl)]
-    private static extern bool Marshal_IUnknown([In]IntPtr ptr);
-
     private object[] TestObjects;
 
-    public void GetIUnknownForObjectTest()
+    public unsafe void GetIUnknownForObjectTest()
     {
-
-        try
-        {
-            //test null
-            IntPtr nullPtr = Marshal.GetIUnknownForObject(null);
-        }
-        catch (ArgumentNullException) { }
-
-
+        // Test null
+        Assert.Throws<ArgumentNullException>(() => Marshal.GetIUnknownForObject(null));
         foreach (object obj in TestObjects)
         {
             IntPtr ptr = IntPtr.Zero;
@@ -53,82 +43,36 @@ public void GetIUnknownForObjectTest()
             {
                 ptr = Marshal.GetIUnknownForObject(obj);
 
-                if (!Marshal_IUnknown(ptr))
+                // Validate IUnknown AddRef/Release usage
+                int plusOne = Marshal.AddRef(ptr);
+                int count = Marshal.Release(ptr);
+                if ((plusOne - 1) != count)
                 {
-                    throw new Exception("Failure on native side. Ref counts do not work as expected");
+                    throw new Exception("Ref counts do not work as expected");
                 }
-            }
-            finally
-            {
-                if (ptr != IntPtr.Zero)
-                    Marshal.Release(ptr);
-            }
-        }
-    }
 
-    public void GetComInterfaceForObjectTest()
-    {
-
-        //test null
-        IntPtr nullPtr = Marshal.GetComInterfaceForObject(null, typeof(object));
-            if (nullPtr != IntPtr.Zero)
-                throw new Exception("A valid ptr was returned for null object.");
-
-        foreach (object obj in TestObjects)
-        {
-            IntPtr ptr = IntPtr.Zero;
-
-            try
-            {
-                ptr = Marshal.GetComInterfaceForObject(obj, typeof(object));
-
-                if (!Marshal_IUnknown(ptr))
+                // Validate IUnknown QueryInterface usage
+                Guid noIID = new("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
+                int hr = Marshal.QueryInterface(ptr, noIID, out IntPtr _);
+                if (hr == 0)
                 {
-                    throw new Exception("Failure on native side. Ref counts do not work as expected");
+                    throw new Exception("QueryInterface() does not work as expected");
                 }
             }
             finally
             {
                 if (ptr != IntPtr.Zero)
-                    Marshal.Release(ptr);
-            }
-        }
-    }
-
-    public void GetComInterfaceForObjectQueryInterfaceTest()
-    {
-            IntPtr nullPtr = Marshal.GetComInterfaceForObject(null, typeof(object), CustomQueryInterfaceMode.Allow);
-            if (nullPtr != IntPtr.Zero)
-                throw new Exception("A valid ptr was returned for null object.");
-
-        foreach (object obj in TestObjects)
-        {
-            IntPtr ptr = IntPtr.Zero;
-            ptr = Marshal.GetComInterfaceForObject(obj, typeof(object), CustomQueryInterfaceMode.Allow);
-            try
-            {
-               if (!Marshal_IUnknown(ptr))
                 {
-                   throw new Exception("Failure on native side. Ref counts do not work as expected");
-                }
-            }
-            finally
-            {
-                if (ptr != IntPtr.Zero)
                     Marshal.Release(ptr);
+                }
             }
         }
     }
 
     public void GetObjectForIUnknownTest()
     {
-        try
-        {
-            //test IntPtr.Zero
-            Object nullObj = Marshal.GetObjectForIUnknown(IntPtr.Zero);
-
-        }
-        catch (ArgumentNullException) { }
+        // Test null
+        Assert.Throws<ArgumentNullException>(() => Marshal.GetObjectForIUnknown(IntPtr.Zero));
 
         foreach (object obj in TestObjects)
         {
@@ -138,69 +82,31 @@ public void GetObjectForIUnknownTest()
             {
                 ptr = Marshal.GetIUnknownForObject(obj);
 
-                Object tmpObj = Marshal.GetObjectForIUnknown(ptr);
+                var tmpObj = Marshal.GetObjectForIUnknown(ptr);
 
                 //compare the new object reference with the original object, they should point to the same underlying object
                 if (!object.ReferenceEquals(obj, tmpObj))
+                {
                     throw new Exception("GetObjectForIUnknown returned a different object. Original: " + obj + ", New: " + tmpObj);
+                }
             }
             finally
             {
                 if (ptr != IntPtr.Zero)
+                {
                     Marshal.Release(ptr);
+                }
             }
         }
     }
 
-    public void GetUniqueObjectForIUnknownTest()
-    {
-
-            //test IntPtr.Zero
-            Object nullObj = Marshal.GetUniqueObjectForIUnknown(IntPtr.Zero);
-
-            if (nullObj != null)
-                throw new Exception("Object returned for IntPtr.Zero is not null.");
-
-
-        foreach (object obj in TestObjects)
-        {
-            IntPtr ptr = IntPtr.Zero;
-            object tmpObj = null;
-
-            try
-            {
-                ptr = Marshal.GetIUnknownForObject(obj);
-
-                tmpObj = Marshal.GetUniqueObjectForIUnknown(ptr);
-
-                //compare the new object reference with the original object, they should point to differnet objects
-                if (object.ReferenceEquals(obj, tmpObj))
-                    throw new Exception("GetUniqueObjectForIUnknown returned the original object");
-
-                //The value should be the same
-                if (!obj.Equals(tmpObj))
-                    throw new Exception("GetUniqueObjectForIUnknown returned an object with different value. Original: " + obj + ", New: " + tmpObj);
-
-            }
-            finally
-            {
-                if (tmpObj != null)
-                    Marshal.ReleaseComObject(tmpObj);
-                if (ptr != IntPtr.Zero)
-                    Marshal.Release(ptr);
-            }
-        }
-    }
-
-    public bool RunTests()
+    public void RunTests()
     {
-        Initialize();
         GetIUnknownForObjectTest();
         GetObjectForIUnknownTest();
-        return true;
     }
 
-    public bool Initialize()
+    public void Initialize()
     {
         TestObjects = new object[7];
         TestObjects[0] = 1;                             //int
@@ -210,12 +116,10 @@ public bool Initialize()
         TestObjects[4] = new TestClass();               //Object of type TestClass
         TestObjects[5] = new List<int>();               //Projected Type
         TestObjects[6] = new Nullable<int>(2);          //Nullable Type
-        return true;
     }
 
     [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsBuiltInComEnabled))]
     [SkipOnMono("Requires COM support")]
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/85234", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsGCStress))]
     public static void Run()
     {
         IUnknownMarshalingTest testObj = new IUnknownMarshalingTest();
@@ -225,7 +129,6 @@ public static void Run()
 
     [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsBuiltInComEnabled))]
     [SkipOnMono("Requires COM support")]
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/85234", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsGCStress))]
     public static void RunInALC()
     {
         TestLibrary.Utilities.ExecuteAndUnload(typeof(IUnknownMarshalingTest).Assembly.Location, nameof(IUnknownMarshalingTest), nameof(Run));

src/tests/Interop/MarshalAPI/IUnknown/IUnknownNative.cpp

@@ -72,8 +72,6 @@ public static void Validate_InvalidReturn()
 
     [Fact]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/91388", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.PlatformDoesNotSupportNativeTestAssets))]
-    [SkipOnCoreClr("https://github.com/dotnet/runtime/issues/96364", RuntimeTestModes.GCStress3)]
-    [SkipOnCoreClr("https://github.com/dotnet/runtime/issues/96364", RuntimeTestModes.GCStressC)]
     public static void Validate_NoGC()
     {
         HandleRef hr = CreateHandleRef();