forked from ReactiveX/rxjs
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(TestScheduler): add asserts for unsubscriptions
Add expectSubscription(coldOrHotTestObservable.subscriptions).toBe(unsubs) feature to test utilities. Create multiple test utility classes such as ColdObservable, HotObservable, SubscriptionLog, TestMessage, etc. Also fix minor issues with VirtualTimeScheduler and Subject. Subject._subscribe() was taking an Observer, but its parent Observable._subscribe() was taking a Subscriber, so this commit changes Subject._subscribe() to take a Subscriber as well. This facilitates usage in HotObservable, for example. Resolves issue ReactiveX#428.
- Loading branch information
Andre Medeiros
committed
Oct 6, 2015
1 parent
af603bd
commit 35be9cd
Showing
14 changed files
with
205 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import Observable from '../Observable'; | ||
import Subscription from '../Subscription'; | ||
import Scheduler from '../Scheduler'; | ||
import TestMessage from './TestMessage'; | ||
import SubscriptionLog from './SubscriptionLog'; | ||
import SubscriptionLoggable from './SubscriptionLoggable'; | ||
import applyMixins from '../util/applyMixins'; | ||
|
||
export default class ColdObservable<T> extends Observable<T> implements SubscriptionLoggable { | ||
public subscriptions: SubscriptionLog[] = []; | ||
scheduler: Scheduler; | ||
logSubscribedFrame: () => number; | ||
logUnsubscribedFrame: (index: number) => void; | ||
|
||
constructor(private messages: TestMessage[], | ||
scheduler: Scheduler) { | ||
super(function (subscriber) { | ||
const observable: ColdObservable<T> = this; | ||
const index = observable.logSubscribedFrame(); | ||
subscriber.add(new Subscription(() => { | ||
observable.logUnsubscribedFrame(index); | ||
})); | ||
observable.scheduleMessages(subscriber); | ||
return subscriber; | ||
}); | ||
this.scheduler = scheduler; | ||
} | ||
|
||
scheduleMessages(subscriber) { | ||
const messagesLength = this.messages.length; | ||
for (let i = 0; i < messagesLength; i++) { | ||
const message = this.messages[i]; | ||
subscriber.add( | ||
this.scheduler.schedule( | ||
() => { message.notification.observe(subscriber); }, | ||
message.frame | ||
) | ||
); | ||
} | ||
} | ||
} | ||
applyMixins(ColdObservable, [SubscriptionLoggable]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import Subject from '../Subject'; | ||
import Subscriber from './Subscriber'; | ||
import Subscription from '../Subscription'; | ||
import Scheduler from '../Scheduler'; | ||
import TestMessage from './TestMessage'; | ||
import SubscriptionLog from './SubscriptionLog'; | ||
import SubscriptionLoggable from './SubscriptionLoggable'; | ||
import applyMixins from '../util/applyMixins'; | ||
|
||
export default class HotObservable<T> extends Subject<T> implements SubscriptionLoggable { | ||
public subscriptions: SubscriptionLog[] = []; | ||
scheduler: Scheduler; | ||
logSubscribedFrame: () => number; | ||
logUnsubscribedFrame: (index: number) => void; | ||
|
||
constructor(private messages: TestMessage[], | ||
scheduler: Scheduler) { | ||
super(); | ||
this.scheduler = scheduler; | ||
} | ||
|
||
_subscribe(subscriber: Subscriber<any>): Subscription<T> { | ||
const subject: HotObservable<T> = this; | ||
const index = subject.logSubscribedFrame(); | ||
subscriber.add(new Subscription(() => { | ||
subject.logUnsubscribedFrame(index); | ||
})); | ||
return super._subscribe(subscriber); | ||
} | ||
|
||
setup() { | ||
const subject = this; | ||
const messagesLength = subject.messages.length; | ||
for (let i = 0; i < messagesLength; i++) { | ||
const message = subject.messages[i]; | ||
this.scheduler.schedule( | ||
() => { message.notification.observe(subject); }, | ||
message.frame | ||
); | ||
} | ||
} | ||
} | ||
applyMixins(HotObservable, [SubscriptionLoggable]); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
export default class SubscriptionLog { | ||
private _subscribedFrame: number; | ||
private _unsubscribedFrame: number; | ||
|
||
get subscribedFrame(): number { | ||
return this._subscribedFrame; | ||
} | ||
|
||
get unsubscribedFrame(): number { | ||
return this._unsubscribedFrame; | ||
} | ||
|
||
constructor(subscribedFrame: number, | ||
unsubscribedFrame: number = Number.POSITIVE_INFINITY) { | ||
this._subscribedFrame = subscribedFrame; | ||
this._unsubscribedFrame = unsubscribedFrame; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import Scheduler from '../Scheduler'; | ||
import SubscriptionLog from './SubscriptionLog'; | ||
|
||
export default class SubscriptionLoggable { | ||
public subscriptions: SubscriptionLog[] = []; | ||
scheduler: Scheduler; | ||
|
||
logSubscribedFrame(): number { | ||
this.subscriptions.push(new SubscriptionLog(this.scheduler.now())); | ||
return this.subscriptions.length - 1; | ||
} | ||
|
||
logUnsubscribedFrame(index: number) { | ||
const subscriptionLogs = this.subscriptions; | ||
const oldSubscriptionLog = subscriptionLogs[index]; | ||
subscriptionLogs[index] = new SubscriptionLog( | ||
oldSubscriptionLog.subscribedFrame, | ||
this.scheduler.now() | ||
); | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import Notification from '../Notification'; | ||
|
||
interface TestMessage { | ||
frame: number; | ||
notification: Notification<any>; | ||
} | ||
|
||
export default TestMessage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
export default function applyMixins(derivedCtor: any, baseCtors: any[]) { | ||
baseCtors.forEach(baseCtor => { | ||
Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => { | ||
derivedCtor.prototype[name] = baseCtor.prototype[name]; | ||
}) | ||
}); | ||
} |