Removed notification profiler code from the test

(cherry picked from commit da7ddd3)

Author: alexey-zakharov

src/tests/profiler/native/classload/classload.cpp

@@ -10,7 +10,7 @@ GUID ClassLoad::GetClsid()
     return clsid;
 }
 
-HRESULT ClassLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
+HRESULT ClassLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
 {
     Profiler::Initialize(pICorProfilerInfoUnk);
 
@@ -26,22 +26,6 @@ HRESULT ClassLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
     return S_OK;
 }
 
-HRESULT ClassLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
-{
-    return InitializeCommon(pICorProfilerInfoUnk);
-}
-
-HRESULT ClassLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
-{
-    return InitializeCommon(pICorProfilerInfoUnk);
-}
-
-HRESULT ClassLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
-{
-    *pbNotificationOnly = TRUE;
-    return S_OK;
-}
-
 HRESULT ClassLoad::ClassLoadStarted(ClassID classId)
 {
     _classLoadStartedCount++;
@@ -76,7 +60,14 @@ HRESULT ClassLoad::Shutdown()
     if(_failures == 0 
         && (_classLoadStartedCount != 0)
         // Expect unloading of UnloadLibrary.TestClass and
-        // List<UnloadLibrary.TestClass> with all its base classes with everything used in List constructor.
+        // List<UnloadLibrary.TestClass> with all its base classes with everything used in List constructor:
+        // - UnloadLibrary.TestClass
+        // - System.Collections.Generic.IEnumerable`1<UnloadLibrary.TestClass>
+        // - System.Collections.Generic.IList`1<UnloadLibrary.TestClass>
+        // - System.Collections.Generic.IReadOnlyCollection`1<UnloadLibrary.TestClass>
+        // - System.Collections.Generic.IReadOnlyList`1<UnloadLibrary.TestClass>
+        // - System.Collections.Generic.List`1<UnloadLibrary.TestClass>
+        // - System.Collections.Generic.ICollection`1<UnloadLibrary.TestClass>        
         && (_classUnloadStartedCount == 7)
         && (_classLoadStartedCount == _classLoadFinishedCount)
         && (_classUnloadStartedCount == _classUnloadFinishedCount))

src/tests/profiler/native/classload/classload.h

@@ -21,9 +21,7 @@ class ClassLoad : public Profiler
 
     static GUID GetClsid();
     virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
-    virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
     virtual HRESULT STDMETHODCALLTYPE Shutdown();
-    virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);
 
     virtual HRESULT STDMETHODCALLTYPE ClassLoadStarted(ClassID classId);
     virtual HRESULT STDMETHODCALLTYPE ClassLoadFinished(ClassID classId, HRESULT hrStatus);
@@ -36,6 +34,4 @@ class ClassLoad : public Profiler
     std::atomic<int> _classUnloadStartedCount;
     std::atomic<int> _classUnloadFinishedCount;
     std::atomic<int> _failures;
-
-    HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
 };

src/tests/profiler/unittest/classload.cs

@@ -31,6 +31,8 @@ static int Main(string[] args)
         static int RunTest()
         {
             LoadCollectibleAssembly();
+
+            // Force a garbage collection to ensure the assembly is unloaded
             GC.Collect();
             GC.WaitForPendingFinalizers();
             GC.Collect();
@@ -49,7 +51,6 @@ private static void LoadCollectibleAssembly()
             object instance = Activator.CreateInstance(testType);
 
             Console.WriteLine(instance.GetHashCode());
-            GC.Collect();
             collectibleContext.Unload();
         }
     }