From 06f1c8c7031d48e767c013c1526da0adf607b4b7 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Sun, 23 Aug 2015 19:20:34 -0700
Subject: [PATCH] Traits displaying in the UI

---
 xunit.runner.data/TestCaseData.cs             | 11 +++-
 xunit.runner.worker/DiscoverUtil.cs           |  5 +-
 xunit.runner.wpf/MainWindow.xaml              |  9 ++-
 xunit.runner.wpf/ViewModel/MainViewModel.cs   |  5 +-
 ...itCollectionView.TraitViewModelComparer.cs | 39 ++++++++++++
 .../ViewModel/TraitCollectionView.cs          | 61 +++++++++++++++++++
 xunit.runner.wpf/ViewModel/TraitViewModel.cs  | 25 ++++++++
 xunit.runner.wpf/xunit.runner.wpf.csproj      |  3 +
 8 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 xunit.runner.wpf/ViewModel/TraitCollectionView.TraitViewModelComparer.cs
 create mode 100644 xunit.runner.wpf/ViewModel/TraitCollectionView.cs
 create mode 100644 xunit.runner.wpf/ViewModel/TraitViewModel.cs

diff --git a/xunit.runner.data/TestCaseData.cs b/xunit.runner.data/TestCaseData.cs
index 9a92b9d..2ce446c 100644
--- a/xunit.runner.data/TestCaseData.cs
+++ b/xunit.runner.data/TestCaseData.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -12,27 +13,33 @@ namespace xunit.runner.data
         public string SerializedForm { get; set; }
         public string DisplayName { get; set; }
         public string AssemblyPath { get; set; }
+        public Dictionary<string, List<string>> TraitMap { get; set; }
 
-        public TestCaseData(string serializedForm, string displayName, string assemblyPath)
+        public TestCaseData(string serializedForm, string displayName, string assemblyPath, Dictionary<string, List<string>> traitMap)
         {
             SerializedForm = serializedForm;
             DisplayName = displayName;
             AssemblyPath = assemblyPath;
+            TraitMap = traitMap;
         }
 
         public static TestCaseData ReadFrom(BinaryReader reader)
         {
+            var formatter = new BinaryFormatter();
             var serializedForm = reader.ReadString();
             var displayName = reader.ReadString();
             var assemblyPath = reader.ReadString();
-            return new TestCaseData(serializedForm, displayName, assemblyPath);
+            var traitMap = (Dictionary<string, List<string>>)formatter.Deserialize(reader.BaseStream);
+            return new TestCaseData(serializedForm, displayName, assemblyPath, traitMap);
         }
 
         public void WriteTo(BinaryWriter writer)
         {
+            var formatter = new BinaryFormatter();
             writer.Write(SerializedForm);
             writer.Write(DisplayName);
             writer.Write(AssemblyPath);
+            formatter.Serialize(writer.BaseStream, TraitMap);
         }
     }
 }
diff --git a/xunit.runner.worker/DiscoverUtil.cs b/xunit.runner.worker/DiscoverUtil.cs
index e5c2c63..ae32630 100644
--- a/xunit.runner.worker/DiscoverUtil.cs
+++ b/xunit.runner.worker/DiscoverUtil.cs
@@ -16,11 +16,13 @@ namespace xunit.runner.worker
         {
             private readonly ITestFrameworkDiscoverer _discoverer;
             private readonly ClientWriter _writer;
+            private readonly Dictionary<string, List<string>> _traitMap;
 
             internal Impl(ITestFrameworkDiscoverer discoverer, ClientWriter writer)
             {
                 _discoverer = discoverer;
                 _writer = writer;
+                _traitMap = new Dictionary<string, List<string>>(StringComparer.Ordinal);
             }
 
             protected override bool Visit(ITestCaseDiscoveryMessage testCaseDiscovered)
@@ -29,7 +31,8 @@ namespace xunit.runner.worker
                 var testCaseData = new TestCaseData(
                     _discoverer.Serialize(testCase),
                     testCase.DisplayName,
-                    testCaseDiscovered.TestAssembly.Assembly.AssemblyPath);
+                    testCaseDiscovered.TestAssembly.Assembly.AssemblyPath,
+                    testCase.Traits);
 
                 Console.WriteLine(testCase.DisplayName);
                 _writer.Write(TestDataKind.Value);
diff --git a/xunit.runner.wpf/MainWindow.xaml b/xunit.runner.wpf/MainWindow.xaml
index a0ecd41..5940406 100644
--- a/xunit.runner.wpf/MainWindow.xaml
+++ b/xunit.runner.wpf/MainWindow.xaml
@@ -98,7 +98,14 @@
                     </ListBox>
                     <Label Content="Traits:"
                            Grid.Row="4" />
-                    <ListBox Grid.Row="5" />
+                    <ListBox Grid.Row="5"
+                             ItemsSource="{Binding Traits}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate DataType="vm:TraitViewModel">
+                                <TextBlock Text="{Binding DisplayName}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
                 </Grid>
             </GroupBox>
 
diff --git a/xunit.runner.wpf/ViewModel/MainViewModel.cs b/xunit.runner.wpf/ViewModel/MainViewModel.cs
index e1a9c48..93b6de8 100644
--- a/xunit.runner.wpf/ViewModel/MainViewModel.cs
+++ b/xunit.runner.wpf/ViewModel/MainViewModel.cs
@@ -24,6 +24,7 @@ namespace xunit.runner.wpf.ViewModel
     {
         private readonly ITestUtil testUtil;
         private readonly ObservableCollection<TestCaseViewModel> allTestCases = new ObservableCollection<TestCaseViewModel>();
+        private readonly TraitCollectionView traitCollectionView = new TraitCollectionView();
         private CancellationTokenSource filterCancellationTokenSource = new CancellationTokenSource();
 
         private CancellationTokenSource cancellationTokenSource;
@@ -189,6 +190,7 @@ namespace xunit.runner.wpf.ViewModel
 
         public ObservableCollection<TestAssemblyViewModel> Assemblies { get; } = new ObservableCollection<TestAssemblyViewModel>();
         public FilteredCollectionView<TestCaseViewModel, SearchQuery> TestCases { get; }
+        public ObservableCollection<TraitViewModel> Traits => this.traitCollectionView.Collection;
 
         private async void OnExecuteOpen(object sender, ExecutedRoutedEventArgs e)
         {
@@ -362,7 +364,8 @@ namespace xunit.runner.wpf.ViewModel
         private void OnTestDiscovered(object sender, TestCaseDataEventArgs e)
         {
             var t = e.TestCaseData;
-            allTestCases.Add(new TestCaseViewModel(t.SerializedForm, t.DisplayName, t.AssemblyPath));
+            this.allTestCases.Add(new TestCaseViewModel(t.SerializedForm, t.DisplayName, t.AssemblyPath));
+            this.traitCollectionView.Add(t.TraitMap);
         }
 
         private void OnTestFinished(object sender, TestResultDataEventArgs e)
diff --git a/xunit.runner.wpf/ViewModel/TraitCollectionView.TraitViewModelComparer.cs b/xunit.runner.wpf/ViewModel/TraitCollectionView.TraitViewModelComparer.cs
new file mode 100644
index 0000000..d8b9358
--- /dev/null
+++ b/xunit.runner.wpf/ViewModel/TraitCollectionView.TraitViewModelComparer.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace xunit.runner.wpf.ViewModel
+{
+    public partial class TraitCollectionView
+    {
+        private sealed class TraitViewModelComparer : IEqualityComparer<TraitViewModel>, IComparer<TraitViewModel>
+        {
+            private readonly StringComparer _comparer = StringComparer.Ordinal;
+
+            public int Compare(TraitViewModel x, TraitViewModel y)
+            {
+                var result = _comparer.Compare(x.Name, y.Name);
+                if (result != 0)
+                {
+                    return result;
+                }
+
+                return _comparer.Compare(x.Value, y.Value);
+            }
+
+            public bool Equals(TraitViewModel x, TraitViewModel y)
+            {
+                return _comparer.Equals(x.Name, y.Name)
+                    && _comparer.Equals(x.Value, y.Value);
+            }
+
+            public int GetHashCode(TraitViewModel obj)
+            {
+                return obj.Name.GetHashCode();
+            }
+        }
+    }
+}
diff --git a/xunit.runner.wpf/ViewModel/TraitCollectionView.cs b/xunit.runner.wpf/ViewModel/TraitCollectionView.cs
new file mode 100644
index 0000000..30cacff
--- /dev/null
+++ b/xunit.runner.wpf/ViewModel/TraitCollectionView.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace xunit.runner.wpf.ViewModel
+{
+    public sealed partial class TraitCollectionView
+    {
+        private readonly TraitViewModelComparer _comparer = new TraitViewModelComparer();
+        private readonly ObservableCollection<TraitViewModel> _collection = new ObservableCollection<TraitViewModel>();
+
+        public ObservableCollection<TraitViewModel> Collection => _collection;
+
+        public TraitCollectionView()
+        {
+
+        }
+
+        public void Add(Dictionary<string, List<string>> traitMap)
+        {
+            if (traitMap.Count == 0)
+            {
+                return;
+            }
+
+            foreach (var pair in traitMap)
+            {
+                foreach (var value in pair.Value)
+                {
+                    TryInsert(new TraitViewModel(pair.Key, value));
+                }
+            }
+        }
+
+        private void TryInsert(TraitViewModel trait)
+        {
+            // TODO: make it a binary search
+            for (int i = 0; i < _collection.Count; i++)
+            {
+                var current = _collection[i];
+                var result = _comparer.Compare(trait, current);
+                if (result < 0)
+                {
+                    _collection.Insert(i, trait);
+                    return;
+                }
+
+                if (result == 0)
+                {
+                    return;
+                }
+            }
+
+            _collection.Add(trait);
+        }
+    }
+}
diff --git a/xunit.runner.wpf/ViewModel/TraitViewModel.cs b/xunit.runner.wpf/ViewModel/TraitViewModel.cs
new file mode 100644
index 0000000..72c7b46
--- /dev/null
+++ b/xunit.runner.wpf/ViewModel/TraitViewModel.cs
@@ -0,0 +1,25 @@
+using GalaSoft.MvvmLight;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace xunit.runner.wpf.ViewModel
+{
+    public sealed class TraitViewModel : ViewModelBase
+    {
+        public readonly string _name;
+        public readonly string _value;
+
+        public string Name => _name;
+        public string Value => _value;
+        public string DisplayName => $"{Name}={Value}";
+
+        public TraitViewModel(string name, string value)
+        {
+            _name = name;
+            _value = value;
+        }
+    }
+}
diff --git a/xunit.runner.wpf/xunit.runner.wpf.csproj b/xunit.runner.wpf/xunit.runner.wpf.csproj
index d93cb01..2812251 100644
--- a/xunit.runner.wpf/xunit.runner.wpf.csproj
+++ b/xunit.runner.wpf/xunit.runner.wpf.csproj
@@ -94,11 +94,14 @@
     <Compile Include="LoadingDialog.xaml.cs">
       <DependentUpon>LoadingDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ViewModel\TraitCollectionView.TraitViewModelComparer.cs" />
+    <Compile Include="ViewModel\TraitCollectionView.cs" />
     <Compile Include="ViewModel\AssemblyAndConfigFile.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\SearchQuery.cs" />
     <Compile Include="ViewModel\TestCaseViewModel.cs" />
     <Compile Include="ViewModel\TestAssemblyViewModel.cs" />
+    <Compile Include="ViewModel\TraitViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
     <Page Include="LoadingDialog.xaml">
       <SubType>Designer</SubType>