Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expand: fixes and tests #788

Closed
wants to merge 2 commits into from
Closed

expand: fixes and tests #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b192a
test(expand): add more marble tests for expand()
staltz Nov 25, 2015
61c2ba5
fix(expand): fix expand's concurrency behavior
staltz Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
225 changes: 216 additions & 9 deletions spec/operators/expand-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals describe, it, expect, expectObservable, hot, cold */
/* globals describe, it, expect, expectObservable, expectSubscriptions, hot, cold */
var Rx = require('../../dist/cjs/Rx');
var Observable = Rx.Observable;
var Promise = require('promise');
Expand All @@ -12,7 +12,10 @@ describe('Observable.prototype.expand()', function () {
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('(a|)', values);
var e1 = hot('(a|)', values);
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a--b--c--d--(e|)';
/*
expectation explanation: (conjunction junction?) ...

Expand All @@ -27,14 +30,214 @@ describe('Observable.prototype.expand()', function () {
---(e|) (...which flattens into:)
a--b--c--d--(e|)
*/
var expected = 'a--b--c--d--(e|)';

expectObservable(e1.expand(function (x) {
var result = e1.expand(function (x) {
if (x === 16) {
return Observable.empty();
}
return cold('---(z|)', { z: x + x });
})).toBe(expected, values);
return cold(e2shape, { z: x + x });
});

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should map and recursively flatten, and handle event raised error', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('(a|)', values);
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a--b--c--(d#)';

var result = e1.expand(function (x) {
if (x === 8) {
return cold('#');
}
return cold(e2shape, { z: x + x });
});

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should map and recursively flatten, and propagate error thrown from projection', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('(a|)', values);
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a--b--c--(d#)';

var result = e1.expand(function (x) {
if (x === 8) {
throw 'error';
}
return cold(e2shape, { z: x + x });
});

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should allow unsubscribing early', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('(a|)', values);
var unsub = ' ! ';
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a--b--c- ';

var result = e1.expand(function (x) {
if (x === 16) {
return Observable.empty();
}
return cold(e2shape, { z: x + x });
});

expectObservable(result, unsub).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should allow concurrent expansions', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('a-a| ', values);
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a-ab-bc-cd-de-(e|)';

var result = e1.expand(function (x) {
if (x === 16) {
return Observable.empty();
}
return cold(e2shape, { z: x + x });
});

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should allow configuring the concurrency limit parameter to 1', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
u: 10,
v: 20, // u + u
x: 40, // v + v
y: 80, // x + x
z: 160, // y + y
};
var e1 = hot('a-u|', values);
var e2shape = '---(z|)';
// ---(z|)
// ---(z|)
// ---(z|)
// ---(z|)
// ---(z|)
// ---(z|)
// ---(z|)
// Notice how for each column, there is at most 1 `-` character.
var e1subs = '^ ! ';
var expected = 'a--u--b--v--c--x--d--y--(ez|)';
var concurrencyLimit = 1;

var result = e1.expand(function (x) {
if (x === 16 || x === 160) {
return Observable.empty();
}
return cold(e2shape, { z: x + x });
}, concurrencyLimit);

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should allow configuring the concurrency limit parameter to 2', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
u: 10,
v: 20, // u + u
x: 40, // v + v
};
var e1 = hot('a---au|', values);
var e2shape = '------(z|)';
// ------(z|)
// ------(z|)
// ------(z|)
// ------(z|)
// ------(z|)
// ------(z|)
// Notice how for each column, there is at most 2 `-` characters.
var e1subs = '^ ! ';
var expected = 'a---a-u---b-b---v-(cc)(x|)';
var concurrencyLimit = 2;

var result = e1.expand(function (x) {
if (x === 4 || x === 40) {
return Observable.empty();
}
return cold(e2shape, { z: x + x });
}, concurrencyLimit);

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should ignore concurrency limit if it is not passed', function () {
var values = {
a: 1,
b: 1 + 1, // a + a,
c: 2 + 2, // b + b,
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
u: 10,
v: 20, // u + u
x: 40, // v + v
y: 80, // x + x
z: 160, // y + y
};
var e1 = hot('a-u| ', values);
var e1subs = '^ ! ';
var e2shape = '---(z|) ';
var expected = 'a-ub-vc-xd-ye-(z|)';
var concurrencyLimit = 100;

var result = e1.expand(function (x) {
if (x === 16 || x === 160) {
return Observable.empty();
}
return cold(e2shape, { z: x + x });
}, concurrencyLimit);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how does concurrency limit ignorance works when it's delivered as param of expand compare to other cases where it delivers and expect to honor those limit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that if the concurrency limit is high enough, then the behavior should be the same as not specifying it at all (which means Infinity). It's important to test because there is an if statement that only runs when the parameter is finite. We want to be sure "very big number" works the same as "infinite".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

understood. thought not passed means explicitly skips concurrency limits.


expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should map and recursively flatten with scalars', function () {
Expand All @@ -45,15 +248,19 @@ describe('Observable.prototype.expand()', function () {
d: 4 + 4, // c + c,
e: 8 + 8, // d + d
};
var e1 = hot('(a|)', values);
var e1 = hot('(a|)', values);
var e1subs = '(^!)';
var expected = '(abcde|)';

expectObservable(e1.expand(function (x) {
var result = e1.expand(function (x) {
if (x === 16) {
return Observable.empty();
}
return Observable.of(x + x); // scalar
})).toBe(expected, values);
});

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should recursively flatten promises', function (done) {
Expand Down
2 changes: 1 addition & 1 deletion src/operators/expand-support.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export class ExpandSubscriber<T, R> extends OuterSubscriber<T, R> {

_next(value: any): void {
const index = this.index++;
this.destination.next(value);
if (this.active < this.concurrent) {
this.destination.next(value);
let result = tryCatch(this.project)(value, index);
if (result === errorObject) {
this.destination.error(result.e);
Expand Down