Improve isSubscribable's type checking

lempiji · Oct 14, 2017 · 98aa405 · 98aa405
1 parent e5568f7
commit 98aa405
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/source/rx/algorithm/all.d b/source/rx/algorithm/all.d
@@ -131,16 +131,16 @@ unittest
 
 unittest
 {
-    alias TObserver = AllObserver!(Observer!bool, int);
+    alias TObserver = AllObserver!(Observer!bool, string);
 
-    static assert(isOutputRange!(TObserver, bool));
+    static assert(isOutputRange!(TObserver, string));
     static assert(hasFailure!(TObserver));
     static assert(hasCompleted!(TObserver));
 }
 
 unittest
 {
-    alias TObserver = AllObserver!(Observer!bool, int);
+    alias TObserver = AllObserver!(Observer!bool, string);
 
     static class CounterObserver : Observer!bool
     {
@@ -183,7 +183,7 @@ unittest
         auto counterDisposable = new CounterDisposable;
         auto observer = TObserver(counterObserver, counterDisposable);
 
-        .put(observer, 0);
+        .put(observer, "TEST");
         observer.completed();
         assert(counterObserver.putCount == 1);
         assert(counterObserver.lastValue == true);

diff --git a/source/rx/observable.d b/source/rx/observable.d
@@ -42,6 +42,8 @@ unittest
 template isSubscribable(TObservable, TObserver)
 {
     enum bool isSubscribable = is(typeof({
+                static assert(isOutputRange!(TObserver, TObservable.ElementType));
+
                 TObservable observable = void;
                 TObserver observer = void;
                 auto d = observable.subscribe(observer);
@@ -75,6 +77,8 @@ unittest
 
     struct TestObservable
     {
+        alias ElementType = int;
+
         TestDisposable subscribe(TestObserver observer)
         {
             return TestDisposable();