Misc fixups

anaisbetts · anaisbetts · commit b50a1d7cf02d · 2011-01-15T18:49:24.000-08:00
diff --git a/ReactiveUI.Tests/ReactiveCommandTest.cs b/ReactiveUI.Tests/ReactiveCommandTest.cs
@@ -37,7 +37,7 @@ public void ObservableCanExecuteShouldShowUpInCommand()
             var result = (new TestScheduler()).With(sched => {
                 var can_execute = new Subject<bool>();
                 var fixture = new ReactiveCommand(can_execute, null);
-                var changes_as_observable = new ListObservable<bool>(fixture.CanExecuteObservable);
+                var changes_as_observable = fixture.CanExecuteObservable.CreateCollection();
 
                 int change_event_count = 0;
                 fixture.CanExecuteChanged += (o, e) => { change_event_count++; };
@@ -49,8 +49,7 @@ public void ObservableCanExecuteShouldShowUpInCommand()
 
                 // N.B. We check against '5' instead of 6 because we're supposed to 
                 // suppress changes that aren't actually changes i.e. false => false
-                can_execute.OnCompleted();
-                sched.Run();
+                sched.RunToMilliseconds(10 * 1000);
                 Assert.Equal(1+5, change_event_count);
 
                 return changes_as_observable;
diff --git a/ReactiveUI/Interfaces.cs b/ReactiveUI/Interfaces.cs
@@ -158,15 +158,6 @@ public interface IReactiveCollection : IReactiveNotifyPropertyChanged, IEnumerab
         /// rebroadcast through ItemChanging/ItemChanged.
         /// </summary>
         bool ChangeTrackingEnabled { get; set; }
-
-        /// <summary>
-        /// When this method is called, an object will not fire change
-        /// notifications (neither traditional nor Observable notifications)
-        /// until the return value is disposed.
-        /// </summary>
-        /// <returns>An object that, when disposed, reenables change
-        /// notifications.</returns>
-        IDisposable SuppressChangeNotifications();
     }
 
     /// <summary>
diff --git a/ReactiveUI/MessageBus.cs b/ReactiveUI/MessageBus.cs
@@ -190,14 +190,14 @@ public static T ViewModelForType<T>(this IMessageBus This, string contract = nul
             return This.Listen<T>(viewModelCurrentValueContractName(typeof(T), contract)).First();
         }
 
-        static string viewModelContractName(Type Type, string contract)
+        static string viewModelContractName(Type type, string contract)
         {
-            return Type.FullName + "_" + (contract ?? String.Empty);
+            return type.FullName + "_" + (contract ?? String.Empty);
         }
 
-        static string viewModelCurrentValueContractName(Type Type, string contract)
+        static string viewModelCurrentValueContractName(Type type, string contract)
         {
-            return viewModelContractName(Type, contract) + "__current";
+            return viewModelContractName(type, contract) + "__current";
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -190,14 +190,14 @@ public static T ViewModelForType<T>(this IMessageBus This, string contract = nul`
`190`	`190`	`return This.Listen<T>(viewModelCurrentValueContractName(typeof(T), contract)).First();`
`191`	`191`	`}`
`192`	`192`
`193`		`- static string viewModelContractName(Type Type, string contract)`
	`193`	`+ static string viewModelContractName(Type type, string contract)`
`194`	`194`	`{`
`195`		`- return Type.FullName + "_" + (contract ?? String.Empty);`
	`195`	`+ return type.FullName + "_" + (contract ?? String.Empty);`
`196`	`196`	`}`
`197`	`197`
`198`		`- static string viewModelCurrentValueContractName(Type Type, string contract)`
	`198`	`+ static string viewModelCurrentValueContractName(Type type, string contract)`
`199`	`199`	`{`
`200`		`- return viewModelContractName(Type, contract) + "__current";`
	`200`	`+ return viewModelContractName(type, contract) + "__current";`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`}`