Fix TreeViewNode content display (microsoft#1357)

* fix TreeViewNode Tostring * CR feedback
Surfndez · Sep 24, 2019 · 75ea41e · 75ea41e
1 parent fb8dd3e
commit 75ea41e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/dev/TreeView/TreeViewNode.cpp b/dev/TreeView/TreeViewNode.cpp
@@ -284,6 +284,8 @@ hstring TreeViewNode::GetContentAsString()
         {
             return result.ToString();
         }
+
+        return winrt::unbox_value_or<hstring>(content, Type().Name);
     }
 
     return Type().Name;

diff --git a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs
@@ -70,5 +70,12 @@ public void CornerRadiusTest()
             var textBlock = new TextBlock(FindElement.ByName("CheckBoxRectangleCornerRadiusValueTextBlock"));
             Verify.AreEqual("2,2", textBlock.DocumentText);
         }
+
+        [TestMethod]
+        public void TreeViewNodeContentTest()
+        {
+            var node = FindElement.ByName("TreeViewNode1");
+            Verify.IsNotNull(node, "Verify TreeViewNode conteins right content");
+        }
     }
 }
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml
@@ -46,6 +46,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <TextBlock x:Name="TestTextBlock" AutomationProperties.Name="TestTextBlock" Text="Loaded"/>
@@ -54,8 +55,13 @@
                 <Button x:Name="GetCheckBoxRectangleCornerRadiusValue" Content="GetCheckBoxRectangleCornerRadiusValue" AutomationProperties.Name="GetCheckBoxRectangleCornerRadiusValue"  Click="GetCheckBoxRectangleCornerRadiusValue_Click"/>
                 <TextBlock x:Name="CheckBoxRectangleCornerRadiusValueTextBlock" AutomationProperties.Name="CheckBoxRectangleCornerRadiusValueTextBlock"></TextBlock>
             </StackPanel>
-            <Button Grid.Row="2" Click="OnAddItemsButtonClick" Content="Add Items" AutomationProperties.Name="AddItemsButton"  />
-            <ScrollViewer Grid.Row="3">
+            <controls:TreeView Grid.Row="2">
+                <controls:TreeView.RootNodes>
+                    <controls:TreeViewNode Content="TreeViewNode1"/>
+                </controls:TreeView.RootNodes>
+            </controls:TreeView>
+            <Button Grid.Row="3" Click="OnAddItemsButtonClick" Content="Add Items" AutomationProperties.Name="AddItemsButton"  />
+            <ScrollViewer Grid.Row="4">
                 <controls:ItemsRepeater x:Name="Repeater" />
             </ScrollViewer>
         </Grid>
-Original file line number
+Diff line change
@@ Expand Up / @@ -284,6 +284,8 @@ hstring TreeViewNode::GetContentAsString() @@
             {
                 return result.ToString();
             }
+            return winrt::unbox_value_or<hstring>(content, Type().Name);
         }
         return Type().Name;
@@ Expand Down @@