From 26e60f9935511fbd46db63a92e746d504d59248d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 2 Nov 2016 15:35:39 -0500
Subject: [PATCH] Moved failing test into LeakTests because it depends on
 runtime implementation details to pass.

---
 .../Avalonia.LeakTests.csproj                 |  1 +
 .../Avalonia.LeakTests/MemberSelectorTests.cs | 47 +++++++++++++++++++
 .../Templates/MemberSelectorTests.cs          | 26 ----------
 3 files changed, 48 insertions(+), 26 deletions(-)
 create mode 100644 tests/Avalonia.LeakTests/MemberSelectorTests.cs

diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index 9aef304beb..7fed908927 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -99,6 +99,7 @@
     <Compile Include="AvaloniaObjectTests.cs" />
     <Compile Include="ControlTests.cs" />
     <Compile Include="ExpressionObserverTests.cs" />
+    <Compile Include="MemberSelectorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.LeakTests/MemberSelectorTests.cs b/tests/Avalonia.LeakTests/MemberSelectorTests.cs
new file mode 100644
index 0000000000..d794e788fd
--- /dev/null
+++ b/tests/Avalonia.LeakTests/MemberSelectorTests.cs
@@ -0,0 +1,47 @@
+using Avalonia.Markup.Xaml.Templates;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Avalonia.LeakTests
+{
+    public class MemberSelectorTests
+    {
+        [Fact]
+        public void Should_Not_Hold_Reference_To_Object()
+        {
+            WeakReference dataRef = null;
+
+            var selector = new MemberSelector() { MemberName = "Child.StringValue" };
+
+            Action run = () =>
+            {
+                var data = new Item()
+                {
+                    Child = new Item() { StringValue = "Value1" }
+                };
+
+                Assert.Same("Value1", selector.Select(data));
+
+                dataRef = new WeakReference(data);
+            };
+
+            run();
+
+            GC.Collect();
+
+            Assert.False(dataRef.IsAlive);
+        }
+
+        private class Item
+        {
+            public Item Child { get; set; }
+            public int IntValue { get; set; }
+
+            public string StringValue { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
index 7082863c0d..49a88e8fae 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
@@ -9,32 +9,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
 {
     public class MemberSelectorTests
     {
-        [Fact]
-        public void Should_Not_Hold_Reference_To_Object()
-        {
-            WeakReference dataRef = null;
-
-            var selector = new MemberSelector() { MemberName = "Child.StringValue" };
-
-            Action run = () =>
-            {
-                var data = new Item()
-                {
-                    Child = new Item() { StringValue = "Value1" }
-                };
-
-                Assert.Same("Value1", selector.Select(data));
-
-                dataRef = new WeakReference(data);
-            };
-
-            run();
-
-            GC.Collect();
-
-            Assert.False(dataRef.IsAlive);
-        }
-
         [Fact]
         public void Should_Select_Child_Property_Value()
         {