Fixed #180

TestStack · Jan 21, 2014 · ff7d5f6 · ff7d5f6 · JakeGinnivan · Nov 13, 2014
1 parent b1daffa
commit ff7d5f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/TestStack.White.UnitTests/Mappings/ControlDictionaryTest.cs b/src/TestStack.White.UnitTests/Mappings/ControlDictionaryTest.cs
@@ -98,6 +98,9 @@ public void GetTestControlType()
             Assert.Equal(typeof(TextBox), controlDictionary.GetTestControlType(string.Empty, string.Empty, ControlType.Edit, WindowsFramework.Silverlight.FrameworkId(), true));
             Assert.Equal(typeof(DateTimePicker), controlDictionary.GetTestControlType("SysDateTimePick32", string.Empty, ControlType.Pane, WindowsFramework.WinForms.FrameworkId(), true));
             Assert.Equal(typeof(DateTimePicker), controlDictionary.GetTestControlType("Winforms.SysDateTimePick32.ad8aa", string.Empty, ControlType.Pane, WindowsFramework.WinForms.FrameworkId(), true));
+            Assert.Equal(typeof(Win32ListItem), controlDictionary.GetTestControlType(string.Empty, string.Empty, ControlType.ListItem, string.Empty, false));
+            Assert.Equal(typeof(Win32ListItem), controlDictionary.GetTestControlType(string.Empty, string.Empty, ControlType.ListItem, WindowsFramework.WinForms.FrameworkId(), false));
+            Assert.Equal(typeof(WPFListItem), controlDictionary.GetTestControlType(string.Empty, string.Empty, ControlType.ListItem, WindowsFramework.Wpf.FrameworkId(), false));
         }
 
         [Fact]

diff --git a/src/TestStack.White/Mappings/ControlDictionary.cs b/src/TestStack.White/Mappings/ControlDictionary.cs
@@ -118,6 +118,9 @@ public virtual ControlType[] GetControlType(Type testControlType, string framewo
 
         public virtual Type GetTestControlType(string className, string name, ControlType controlType, string frameWorkId, bool isNativeControl)
         {
+            if (Equals(controlType, ControlType.ListItem) && string.IsNullOrEmpty(frameWorkId))
+                frameWorkId = WindowsFramework.Win32.FrameworkId();
+
             var dictionaryItems = items.Where(controlDictionaryItem =>
             {
                 if (!ControlTypeMatches(controlType, controlDictionaryItem)) return false;