From cecbe8fefe4ea48e9dd92841eacb443dbac4bbe9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 4 Aug 2016 21:48:39 +0200
Subject: [PATCH] Move WeakReference setup to separate method.

Trying to fix #655.
---
 .../AvaloniaObjectTests_Direct.cs               | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 6f1f59b77b..12d1b7a5f0 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -360,15 +360,7 @@ namespace Avalonia.Base.UnitTests
         public void Binding_To_Direct_Property_Gets_Collected_When_Completed()
         {
             var target = new Class2();
-
-            Func<WeakReference> setupBinding = () =>
-            {
-                var source = new Subject<string>();
-                var sub = target.Bind((AvaloniaProperty)Class1.FooProperty, source);
-                return new WeakReference(source);
-            };
-        
-            var weakSource = setupBinding();
+            var weakSource = SetupDirectBinding(target);
 
             Action completeSource = () =>
             {
@@ -455,6 +447,13 @@ namespace Avalonia.Base.UnitTests
             Assert.True(called);
         }
 
+        private WeakReference SetupDirectBinding(Class2 target)
+        {
+            var source = new Subject<string>();
+            var sub = target.Bind((AvaloniaProperty)Class1.FooProperty, source);
+            return new WeakReference(source);
+        }
+
         private class Class1 : AvaloniaObject
         {
             public static readonly DirectProperty<Class1, string> FooProperty =