Runtime class name for bare IInspectable should not be "Object" (#930)

microsoft · Apr 27, 2021 · 18670d2 · 18670d2
1 parent 342edc5
commit 18670d2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/strings/base_implements.h b/strings/base_implements.h
@@ -430,6 +430,15 @@ namespace winrt::impl
         }
     };
 
+    template <>
+    struct runtime_class_name<Windows::Foundation::IInspectable>
+    {
+        static hstring get()
+        {
+            return {};
+        }
+    };
+
     template <typename D, typename I, typename Enable>
     struct producer
     {

diff --git a/test/old_tests/UnitTests/IInspectable_GetRuntimeClassName.cpp b/test/old_tests/UnitTests/IInspectable_GetRuntimeClassName.cpp
@@ -28,7 +28,7 @@ TEST_CASE("Test_GetRuntimeClassName_NoOverride")
 {
     Windows::Foundation::IInspectable i = make<Test_GetRuntimeClassName_NoOverride>();
 
-    REQUIRE(get_class_name(i) == L"Object");
+    REQUIRE(get_class_name(i) == L"");
 }
 
 TEST_CASE("Test_GetRuntimeClassName_Override")

diff --git a/test/old_tests/UnitTests/constexpr.cpp b/test/old_tests/UnitTests/constexpr.cpp
@@ -35,6 +35,7 @@ TEST_CASE("constexpr")
     REQUIRE(winrt::guid_of<winrt::IInspectable>() == winrt::guid(__uuidof(::IInspectable)));
     REQUIRE(winrt::guid_of<winrt_container>() == winrt::guid(__uuidof(midl_container)));
     REQUIRE(winrt::name_of<winrt::IInspectable>() == L"Object"sv);
+    REQUIRE(winrt::name_of<winrt::IAsyncOperation<winrt::IInspectable>>() == L"Windows.Foundation.IAsyncOperation`1<Object>"sv);
 
     REQUIRE(winrt::name_of<winrt_container>() == midl_container::z_get_rc_name_impl());
 

diff --git a/test/old_tests/UnitTests/produce.cpp b/test/old_tests/UnitTests/produce.cpp
@@ -133,7 +133,7 @@ struct produce_IInspectable_RuntimeClassName : implements<produce_IInspectable_R
 TEST_CASE("produce_IInspectable_RuntimeClassName")
 {
     Windows::Foundation::IInspectable without = make<produce_IInspectable_No_RuntimeClassName>();
-    REQUIRE(get_class_name(without) == L"Object");
+    REQUIRE(get_class_name(without) == L"");
 
     Windows::Foundation::IInspectable with = make<produce_IInspectable_RuntimeClassName>();
     REQUIRE(get_class_name(with) == L"produce_IInspectable_RuntimeClassName");