feat(traits): updated traits selection logic, children with same name no longer selct across different parents

SampleTestAssembly/Class1.cs

@@ -11,14 +11,14 @@ namespace SampleTestAssembly
     public class Class1
     {
         [Fact]
-        //[Trait("TraitName1", "TraitValue1")]
+        [Trait("TraitName1", "TraitValue1")]
         public void Pass()
         {
             Thread.Sleep(TimeSpan.FromSeconds(1));
         }
 
         [Fact]
-        //[Trait("TraitName1", "TraitValue2")]
+        [Trait("TraitName1", "TraitValue2")]
         public void Fail()
         {
             Thread.Sleep(TimeSpan.FromSeconds(2));
@@ -26,7 +26,7 @@ namespace SampleTestAssembly
         }
 
         [Fact(Skip = "Testing")]
-        //[Trait("TraitName2", "TraitValue2")]
+        [Trait("TraitName2", "TraitValue2")]
         public void Skip()
         {
             Thread.Sleep(TimeSpan.FromSeconds(1));

speckle.xunit.runner.wpf/ViewModel/TraitViewModel.Comparer.cs

@@ -12,9 +12,9 @@ namespace Xunit.Runner.Wpf.ViewModel
 
         private class TraitViewModelComparer : IEqualityComparer<TraitViewModel>, IComparer<TraitViewModel>
         {
-            public int Compare(TraitViewModel x, TraitViewModel y) => StringComparer.Ordinal.Compare(x.Text, y.Text);
-            public bool Equals(TraitViewModel x, TraitViewModel y) => StringComparer.Ordinal.Equals(x.Text, y.Text);
-            public int GetHashCode(TraitViewModel obj) => obj.Text.GetHashCode();
+            public int Compare(TraitViewModel x, TraitViewModel y) => StringComparer.Ordinal.Compare(x.FullText, y.FullText);
+            public bool Equals(TraitViewModel x, TraitViewModel y) => StringComparer.Ordinal.Equals(x.FullText, y.FullText);
+            public int GetHashCode(TraitViewModel obj) => obj.FullText.GetHashCode();
         }
     }
 }

speckle.xunit.runner.wpf/ViewModel/TraitViewModel.cs

@@ -6,118 +6,129 @@ using Xunit.Runner.Wpf;
 
 namespace Xunit.Runner.Wpf.ViewModel
 {
-    public partial class TraitViewModel : ViewModelBase
+  public partial class TraitViewModel : ViewModelBase
+  {
+    private readonly TraitViewModel _parent;
+    private bool? _isChecked;
+    private bool _isExpanded;
+    private string _text;
+
+    public ObservableCollection<TraitViewModel> Children { get; }
+
+    public TraitViewModel(string text)
+        : this(null, text)
     {
-        private readonly TraitViewModel _parent;
-        private bool? _isChecked;
-        private bool _isExpanded;
-        private string _text;
-
-        public ObservableCollection<TraitViewModel> Children { get; }
-
-        public TraitViewModel(string text)
-            : this(null, text)
-        {
-        }
-
-        private TraitViewModel(TraitViewModel parent, string text)
-        {
-            this._parent = parent;
-            this._isChecked = false;
-            this._isExpanded = true;
-            this._text = text;
-            this.Children = new ObservableCollection<TraitViewModel>();
-        }
-
-        private void SetIsChecked(bool? value, bool updateChildren, bool updateParent)
-        {
-            if (value == this._isChecked)
-            {
-                return;
-            }
-
-            this._isChecked = value;
-
-            if (updateChildren && value != null)
-            {
-                foreach (var child in this.Children)
-                {
-                    child.SetIsChecked(value, updateChildren: true, updateParent: false);
-                }
-            }
-
-            if (updateParent && _parent != null)
-            {
-                _parent.VerifyCheckState();
-            }
-
-            this.RaisePropertyChanged(nameof(IsChecked));
-        }
-
-        private void VerifyCheckState()
-        {
-            bool? state = null;
-            var isFirst = true;
-
-            foreach (var child in this.Children)
-            {
-                if (isFirst)
-                {
-                    state = child.IsChecked;
-                    isFirst = false;
-                }
-                else if (state != child.IsChecked)
-                {
-                    state = null;
-                    break;
-                }
-            }
-
-            this.SetIsChecked(state, updateChildren: false, updateParent: true);
-        }
-
-        public void AddValues(IEnumerable<string> values)
-        {
-            foreach (var value in values)
-            {
-                var index = this.Children.BinarySearch(value, StringComparer.Ordinal.Compare, v => v.Text);
-                if (index < 0)
-                {
-                    this.Children.Insert(~index, new TraitViewModel(this, value));
-                }
-            }
-        }
-
-        public TraitViewModel GetOrAdd(string text)
-        {
-            var index = this.Children.BinarySearch(text, StringComparer.Ordinal, vm => vm.Text);
-
-            if (index < 0)
-            {
-                var viewModel = new TraitViewModel(this, text);
-                this.Children.Insert(~index, viewModel);
-                return viewModel;
-            }
-
-            return this.Children[index];
-        }
-
-        public bool? IsChecked
-        {
-            get { return _isChecked; }
-            set { SetIsChecked(value, updateChildren: true, updateParent: true); }
-        }
-
-        public bool IsExpanded
-        {
-            get { return _isExpanded; }
-            set { Set(ref _isExpanded, value); }
-        }
-
-        public string Text
-        {
-            get { return _text; }
-            set { Set(ref _text, value); }
-        }
     }
+
+    private TraitViewModel(TraitViewModel parent, string text)
+    {
+      this._parent = parent;
+      this._isChecked = false;
+      this._isExpanded = true;
+      this._text = text;
+      this.Children = new ObservableCollection<TraitViewModel>();
+    }
+
+    private void SetIsChecked(bool? value, bool updateChildren, bool updateParent)
+    {
+      if (value == this._isChecked)
+      {
+        return;
+      }
+
+      this._isChecked = value;
+
+      if (updateChildren && value != null)
+      {
+        foreach (var child in this.Children)
+        {
+          child.SetIsChecked(value, updateChildren: true, updateParent: false);
+        }
+      }
+
+      if (updateParent && _parent != null)
+      {
+        _parent.VerifyCheckState();
+      }
+
+      this.RaisePropertyChanged(nameof(IsChecked));
+    }
+
+    private void VerifyCheckState()
+    {
+      bool? state = null;
+      var isFirst = true;
+
+      foreach (var child in this.Children)
+      {
+        if (isFirst)
+        {
+          state = child.IsChecked;
+          isFirst = false;
+        }
+        else if (state != child.IsChecked)
+        {
+          state = null;
+          break;
+        }
+      }
+
+      this.SetIsChecked(state, updateChildren: false, updateParent: true);
+    }
+
+    public void AddValues(IEnumerable<string> values)
+    {
+      foreach (var value in values)
+      {
+        var index = this.Children.BinarySearch(value, StringComparer.Ordinal.Compare, v => v.Text);
+        if (index < 0)
+        {
+          this.Children.Insert(~index, new TraitViewModel(this, value));
+        }
+      }
+    }
+
+    public TraitViewModel GetOrAdd(string text)
+    {
+      var index = this.Children.BinarySearch(text, StringComparer.Ordinal, vm => vm.Text);
+
+      if (index < 0)
+      {
+        var viewModel = new TraitViewModel(this, text);
+        this.Children.Insert(~index, viewModel);
+        return viewModel;
+      }
+
+      return this.Children[index];
+    }
+
+    public bool? IsChecked
+    {
+      get { return _isChecked; }
+      set { SetIsChecked(value, updateChildren: true, updateParent: true); }
+    }
+
+    public bool IsExpanded
+    {
+      get { return _isExpanded; }
+      set { Set(ref _isExpanded, value); }
+    }
+
+    public string Text
+    {
+      get { return _text; }
+      set { Set(ref _text, value); }
+    }
+
+    public string FullText
+    {
+      get
+      {
+        var fullText = _text;
+        if (_parent != null)
+          fullText = _parent.FullText + _text;
+        return fullText;
+      }
+    }
+  }
 }

speckle.xunit.runner.wpf/speckle.xunit.runner.wpf.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
@@ -16,7 +16,7 @@
     <PackageIcon></PackageIcon>
     <PackageIconUrl>https://avatars2.githubusercontent.com/u/2092016</PackageIconUrl>
       <PackageIconUrl>https://avatars2.githubusercontent.com/u/2092016</PackageIconUrl>
-      <Version>1.0.4</Version>
+      <Version>1.0.5</Version>
     </PropertyGroup>
 
   <ItemGroup>