From d176b1d7dc10e22137a21b7e2cf1836ec4cd2e27 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 29 Aug 2019 12:34:03 +0800
Subject: [PATCH] Fix unit tests.

---
 src/Avalonia.Animation/Animatable.cs                   | 4 ++--
 tests/Avalonia.Animation.UnitTests/TransitionsTests.cs | 4 ++--
 tests/Avalonia.LeakTests/TransitionTests.cs            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index 09991a5990..5ff3b17fb5 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Animation
                 (o, v) => o.Transitions = v);
 
         private Transitions _transitions;
-
+        private bool _isTransitionsSet = false;
         private Dictionary<AvaloniaProperty, IDisposable> _previousTransitions;
 
         /// <summary>
@@ -66,7 +66,7 @@ namespace Avalonia.Animation
         /// <param name="e">The event args.</param>
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (Transitions is null ||  e.Priority == BindingPriority.Animation) return;
+            if (_transitions is null || _previousTransitions is null || e.Priority == BindingPriority.Animation) return;
 
             var match = Transitions.FirstOrDefault(x => x.Property == e.Property);
 
diff --git a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
index f1b4b0d071..a8efc2c8ae 100644
--- a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Animation.UnitTests
             {
                 var border = new Border
                 {
-                    Transitions =
+                    Transitions = new Transitions
                     {
                         new DoubleTransition
                         {
@@ -51,7 +51,7 @@ namespace Avalonia.Animation.UnitTests
             {
                 var border = new Border
                 {
-                    Transitions =
+                    Transitions = new Transitions
                     {
                         new DoubleTransition
                         {
diff --git a/tests/Avalonia.LeakTests/TransitionTests.cs b/tests/Avalonia.LeakTests/TransitionTests.cs
index c7add1fe11..699dec7229 100644
--- a/tests/Avalonia.LeakTests/TransitionTests.cs
+++ b/tests/Avalonia.LeakTests/TransitionTests.cs
@@ -27,7 +27,7 @@ namespace Avalonia.LeakTests
                 {
                     var border = new Border
                     {
-                        Transitions =
+                        Transitions = new Transitions
                         {
                             new DoubleTransition
                             {