From 8ed800ad715ac9bbce8e36804a6e5c3fd9474e7a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 16 Nov 2019 12:19:37 +0100
Subject: [PATCH] I did the merge wrong.

Delete some files that should have been deleted in merge.
---
 .../TestControlBase.cs                        | 153 ------------------
 .../TestTemplatedControl.cs                   | 151 -----------------
 2 files changed, 304 deletions(-)
 delete mode 100644 tests/Avalonia.Styling.UnitTests/TestControlBase.cs
 delete mode 100644 tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs

diff --git a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs b/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
deleted file mode 100644
index 4bc7baa4dbc..00000000000
--- a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class TestControlBase : IStyleable
-    {
-        public TestControlBase()
-        {
-            Classes = new Classes();
-            SubscribeCheckObservable = new TestObservable();
-        }
-
-#pragma warning disable CS0067 // Event not used
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-#pragma warning restore CS0067
-
-        public string Name { get; set; }
-
-        public virtual Classes Classes { get; set; }
-
-        public Type StyleKey => GetType();
-
-        public TestObservable SubscribeCheckObservable { get; private set; }
-
-        public ITemplatedControl TemplatedParent
-        {
-            get;
-            set;
-        }
-
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-        public object GetValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsAnimating(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsSet(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind(AvaloniaProperty property, IObservable<BindingValue<object>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void AddInheritanceChild(IAvaloniaObject child)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RemoveInheritanceChild(IAvaloniaObject child)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void InheritanceParentChanged<T>(StyledPropertyBase<T> property, IAvaloniaObject oldParent, IAvaloniaObject newParent)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void InheritedPropertyChanged<T>(AvaloniaProperty<T> property, Optional<T> oldValue, Optional<T> newValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(StyledPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(DirectPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(StyledPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(DirectPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(DirectPropertyBase<T> property, T value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(StyledPropertyBase<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(DirectPropertyBase<T> property, IObservable<BindingValue<T>> source)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs b/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
deleted file mode 100644
index 58d1a57bdf8..00000000000
--- a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public abstract class TestTemplatedControl : ITemplatedControl, IStyleable
-    {
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-
-        public abstract Classes Classes
-        {
-            get;
-        }
-
-        public abstract string Name
-        {
-            get;
-        }
-
-        public abstract Type StyleKey
-        {
-            get;
-        }
-
-        public abstract ITemplatedControl TemplatedParent
-        {
-            get;
-        }
-
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-        public object GetValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind(AvaloniaProperty property, IObservable<BindingValue<object>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsAnimating(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsSet(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void AddInheritanceChild(IAvaloniaObject child)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RemoveInheritanceChild(IAvaloniaObject child)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void InheritanceParentChanged<T>(StyledPropertyBase<T> property, IAvaloniaObject oldParent, IAvaloniaObject newParent)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void InheritedPropertyChanged<T>(AvaloniaProperty<T> property, Optional<T> oldValue, Optional<T> newValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(StyledPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearValue<T>(DirectPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(StyledPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(DirectPropertyBase<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(DirectPropertyBase<T> property, T value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(StyledPropertyBase<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(DirectPropertyBase<T> property, IObservable<BindingValue<T>> source)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}