Browse Source

Removed ReactiveUI dependeny in BindingTests.

Jeremy Koritzinsky 8 years ago
parent
commit
e5449020f3

+ 0 - 1
tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj

@@ -19,7 +19,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />

+ 15 - 3
tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs

@@ -10,8 +10,9 @@ using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Data;
 using Moq;
-using ReactiveUI;
 using Xunit;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
@@ -350,14 +351,25 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             }
         }
 
-        public class Source : ReactiveObject
+        public class Source : INotifyPropertyChanged
         {
             private string _foo;
 
             public string Foo
             {
                 get { return _foo; }
-                set { this.RaiseAndSetIfChanged(ref _foo, value); }
+                set
+                {
+                    _foo = Foo;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            private void RaisePropertyChanged([CallerMemberName] string prop = "")
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
             }
         }
 

+ 16 - 4
tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs

@@ -6,8 +6,9 @@ using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Data;
-using ReactiveUI;
 using Xunit;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
@@ -24,15 +25,26 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
 
             Assert.Equal(target.Text, "foo");
         }
-
-        public class Source : ReactiveObject
+        
+        public class Source : INotifyPropertyChanged
         {
             private string _foo;
 
             public string Foo
             {
                 get { return _foo; }
-                set { this.RaiseAndSetIfChanged(ref _foo, value); }
+                set
+                {
+                    _foo = Foo;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            private void RaisePropertyChanged([CallerMemberName] string prop = "")
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
             }
         }
     }