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

refactor(bufferTime): reduce the size of the implementation #5712

Merged
merged 2 commits into from Sep 11, 2020
Merged

refactor(bufferTime): reduce the size of the implementation #5712

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
1cf36fc
refactor(bufferTime): reduce the size of the implementation
benlesh Sep 10, 2020
a1323c4
fix(bufferTime): ensure proper behavior for buffer creation intervals…
benlesh Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 47 additions & 13 deletions spec/operators/bufferTime-spec.ts
View file
Open in desktop
@@ -1,7 +1,8 @@
import { of, throwError, interval } from 'rxjs';
import { of, throwError, interval, scheduled, asapScheduler } from 'rxjs';
import { bufferTime, mergeMap, take } from 'rxjs/operators';
import { TestScheduler } from 'rxjs/testing';
import { observableMatcher } from '../helpers/observableMatcher';
import { expect } from 'chai';

/** @test {bufferTime} */
describe('bufferTime operator', () => {
Expand Down Expand Up @@ -53,6 +54,9 @@ describe('bufferTime operator', () => {
const e1 = hot(' ---a---b---c---d---e---f---g-----| ');
const subs = ' ^--------------------------------! ';
const t = time(' ----------| ');
// ----------|
// ----------|
// ----------|
benlesh marked this conversation as resolved.
Show resolved Hide resolved
const expected = '-------w-------x-------y---------(z|)';
const values = {
w: ['a', 'b'],
Expand All @@ -68,11 +72,43 @@ describe('bufferTime operator', () => {
});
});

it('should handle situations with a creation interval of zero', (done) => {
// This is an odd scenario, and I can't imagine who is weird enough to want this, but here
// it is. Someone scheduling buffers to open and close on microtasks, with values emitted on microtasks
// NOTE: Trying this with a completely synchronous scheduler (like queueScheduler, which is
// async relative to what it is scheduling, but synchronous relative to its container) will
// cause your thread to lock up. Don't be weird. This test is just to prove behavior.
const source = scheduled([0, 1, 2, 3, 4], asapScheduler);
const results: any[] = [];
source.pipe(
bufferTime(0, 0, asapScheduler),
)
.subscribe({
next: value => results.push(value),
complete: () => {
expect(results).to.deep.equal([
// It opens one on 0 and closes it on 0
[],
// It opens one on 0, emits on 0, and closes on 0 (x 5)
[0],
[1],
[2],
[3],
[4],
// It opens one on 0, and then completes on 0, leaving us with an empty array.
[]
]);
done();
}
});
});

it('should emit buffers at intervals or when the buffer is full test 2', () => {
testScheduler.run(({ hot, time, expectObservable, expectSubscriptions }) => {
const e1 = hot(' ---a---b---c---d---e---f---g-----| ');
const subs = ' ^--------------------------------! ';
const t = time(' ----------| ');
// ---------|---------|---------|
const expected = '----------w--------x---------y---(z|)';
const values = {
w: ['a', 'b'],
Expand Down Expand Up @@ -110,8 +146,7 @@ describe('bufferTime operator', () => {
});
});

it('should emit buffers that have been created at intervals and close after the specified delay ' +
'or when the buffer is full', () => {
it('should emit buffers that have been created at intervals and close after the specified delay or when the buffer is full', () => {
testScheduler.run(({ hot, time, expectObservable }) => {
const e1 = hot(' ---a---b---c----d----e----f----g----h----i----(k|)');
// --------------------*--------------------*---- start interval
Expand Down Expand Up @@ -297,18 +332,17 @@ describe('bufferTime operator', () => {
});
});

it('should emit buffers that have been created at intervals and close after ' +
'the specified delay with errors', () => {
it('should emit buffers that have been created at intervals and close after the specified delay with errors', () => {
testScheduler.run(({ hot, time, expectObservable, expectSubscriptions }) => {
const e1 = hot(' ---a---b---c----d----e----f----g----h----i--#');
// --------------------*--------------------*---- start interval
// ---------------------| timespans
// ---------------------|
// -----|
const e1subs = ' ^-------------------------------------------!';
const t = time(' ---------------------| ');
const e1 = hot(' ---a---b---c----d----e----f----g----h----i--#');
// --------------------|-------------------|-------------------| interval
// ---------------------|
// ---------------------|
// ---------------------| timespan
const e1subs = ' ^-------------------------------------------!';
const t = time(' ---------------------| ');
const interval = time(' --------------------| ');
const expected = '---------------------x-------------------y--#';
const expected = ' ---------------------x-------------------y--#';
const values = {
x: ['a', 'b', 'c', 'd', 'e'],
y: ['e', 'f', 'g', 'h', 'i']
Expand Down