Merge branch 'master' of https://github.com/reactiveui/reactiveui

AidanCondon · Apr 6, 2015 · 3f45bdf · 3f45bdf
2 parents 3e6a9ff + 7459cb0
commit 3f45bdf
Show file tree

Hide file tree

Showing 11 changed files with 703 additions and 241 deletions.
diff --git a/ReactiveUI.Tests/Cocoa/IndexNormalizerTest.cs b/ReactiveUI.Tests/Cocoa/IndexNormalizerTest.cs
@@ -0,0 +1,95 @@
+namespace ReactiveUI.Tests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using ReactiveUI;
+    using Xunit;
+
+    public class IndexNormalizerTest
+    {
+        [Theory]
+        [InlineData("", "")]
+        [InlineData("D0:D0", "D0:D1")]
+        [InlineData("D0:D0:D0", "D0:D1:D2")]
+        [InlineData("D2:D0:D1", "D2:D0:D3")]
+        [InlineData("D1:D0", "D1:D0")]
+        [InlineData("D0:D1", "D0:D2")]
+        [InlineData("D0:D5:D10", "D0:D6:D12")]
+        [InlineData("D5:D0:D10", "D5:D0:D12")]
+        [InlineData("A0:D1", "A0:D0")]
+        [InlineData("D0:A0", "D0:A0")]
+        [InlineData("D0:A1", "D0:A1")]
+        [InlineData("A0:D0", "")]
+        [InlineData("A0:A0:D0", "A0")]
+        [InlineData("A1:A1:D0", "A1:A0:D0")]
+        [InlineData("A1:D0:A1", "A0:D0:A1")]
+        [InlineData("A1:D1", "")]
+        [InlineData("A0:A1:D0", "A0")]
+        [InlineData("A0:A0", "A1:A0")]
+        [InlineData("A0:A0:A0", "A2:A1:A0")]
+        [InlineData("A0:A1", "A0:A1")]
+        [InlineData("A1:A0", "A2:A0")]
+        [InlineData("A0:A10:D5:A6:D3:D6", "A0:A8:D4:A5:D2:D6")]
+        [InlineData("A0:A10:D5:A6:D7:D6", "A0:A8:D4:D6")]
+        [InlineData("A0:A0:A0:D0:D1", "A0")]
+        [InlineData("A0:A1:A2:D0:D1", "A0")]
+        [InlineData("A0:A10:D5:D7", "A0:A8:D4:D7")]
+        [InlineData("A0:A0:D2:A3:D4", "A1:A0:D0:A3:D2")]
+        [InlineData("D0:A0:D1", "D0:A0:D1")]
+        [InlineData("A0:D1:D0", "D0")]
+        [InlineData("A1:D1:D1", "D1")]
+        [InlineData("D0:A0:A0:A5:A2:D3:A5:D2:A3:A1", "D0:A2:A0:A7:D1:A6:A4:A1")]
+        [InlineData("A2:A5:D2", "A4")]
+        [InlineData("A2:D3:A5:D2", "D2:A4")]
+        [InlineData("A5:A2:D3:A5:D2", "A5:D2:A4")]
+        [InlineData("A5:A2:A5:D2", "A6:A4")]
+        [InlineData("A7:A2:D3:A6:A2", "A9:A3:D2:A7:A2")]
+        [InlineData("D0:D0:A6:A0:D5:D0:D4:A4:A0:A6", "D0:D1:A7:D6:D7:A5:A0:A6")]
+        [InlineData("D0:D0:A6:D5:D4:A4:A0:A6", "D0:D1:A7:D7:D6:A5:A0:A6")]
+        [InlineData("D0:D0:A6:D5:D4", "D0:D1:A4:D7:D6")]
+        public void UpdatesAreCorrectlyNormalized(string inputUpdatesString, string expectedOutputUpdatesString)
+        {
+            var inputUpdates = inputUpdatesString.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(ParseUpdate)
+                .ToList();
+            var outputUpdates = IndexNormalizer.Normalize(inputUpdates);
+            Assert.NotNull(outputUpdates);
+            var formattedOutputUpdates = FormatUpdates(outputUpdates);
+
+            Assert.Equal(expectedOutputUpdatesString, formattedOutputUpdates);
+        }
+
+        private string FormatUpdates(IEnumerable<Update> updates)
+        {
+            return updates.Aggregate(
+                new StringBuilder(),
+                (current, next) =>
+                {
+                    if (current.Length > 0)
+                    {
+                        current.Append(":");
+                    }
+
+                    return current.Append(next);
+                },
+                x => x.ToString());
+        }
+
+        private Update ParseUpdate(string input)
+        {
+            var index = int.Parse(input.Substring(1));
+
+            switch (input[0])
+            {
+                case 'A':
+                    return Update.CreateAdd(index);
+                case 'D':
+                    return Update.CreateDelete(index);
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}
diff --git a/ReactiveUI.Tests/ReactiveNotifyPropertyChangedMixinTest.cs b/ReactiveUI.Tests/ReactiveNotifyPropertyChangedMixinTest.cs
@@ -23,8 +23,8 @@ namespace ReactiveUI.Tests
 {
     public class TestWhenAnyObsViewModel : ReactiveObject
     {
-        public ReactiveCommand<object> Command1 { get; protected set; }
-        public ReactiveCommand<object> Command2 { get; protected set; }
+        public ReactiveCommand<object> Command1 { get; set; }
+        public ReactiveCommand<object> Command2 { get; set; }
 
         ReactiveList<int> myListOfInts;
         public ReactiveList<int> MyListOfInts {
@@ -648,6 +648,25 @@ public void WhenAnyWithNullObjectShouldUpdateWhenObjectIsntNullAnymore()
             fixture.MyListOfInts = null;
             Assert.Equal(1, output.Count);
         }
+
+        [Fact]
+        public void NullObservablesDoNotCauseExceptions()
+        {
+            var fixture = new TestWhenAnyObsViewModel();
+            fixture.Command1 = null;
+
+            fixture.WhenAnyObservable(x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+            fixture.WhenAnyObservable(x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1, x => x.Command1).Subscribe();
+        }
     }
 
 #if !MONO

diff --git a/ReactiveUI.Tests/ReactiveUI.Tests_iOS.csproj b/ReactiveUI.Tests/ReactiveUI.Tests_iOS.csproj
@@ -141,6 +141,7 @@
     <None Include="packages.ReactiveUI.Tests_iOS.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Cocoa\IndexNormalizerTest.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
     <Compile Include="ActivationTest.cs" />