mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-07-04 10:10:28 -04:00
Use doOrReject()
for most tests; add tests for non-rejecting do()
This commit is contained in:
parent
4272198dad
commit
c6abcb19ba
1 changed files with 38 additions and 5 deletions
|
@ -76,13 +76,13 @@ test('run tasks', async t => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
test('cancel', async t => {
|
test('cancel with doOrReject', async t => {
|
||||||
const bukkit = makeTestQueue();
|
const bukkit = makeTestQueue();
|
||||||
|
|
||||||
const taskResults = [];
|
const taskResults = [];
|
||||||
const goodCancelMessage = 'Task was canceled correctly';
|
const goodCancelMessage = 'Task was canceled correctly';
|
||||||
const afterCancelMessage = 'Task was run correctly';
|
const afterCancelMessage = 'Task was run correctly';
|
||||||
const cancelTaskPromise = bukkit.do(
|
const cancelTaskPromise = bukkit.doOrReject(
|
||||||
() => {
|
() => {
|
||||||
taskResults.push('nope');
|
taskResults.push('nope');
|
||||||
}, 999);
|
}, 999);
|
||||||
|
@ -94,7 +94,7 @@ test('cancel', async t => {
|
||||||
taskResults.push(goodCancelMessage);
|
taskResults.push(goodCancelMessage);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
const keepTaskPromise = bukkit.do(
|
const keepTaskPromise = bukkit.doOrReject(
|
||||||
() => {
|
() => {
|
||||||
taskResults.push(afterCancelMessage);
|
taskResults.push(afterCancelMessage);
|
||||||
testCompare(t, bukkit._timer.timeElapsed(), '<', 10, 'Canceled task must not delay other tasks');
|
testCompare(t, bukkit._timer.timeElapsed(), '<', 10, 'Canceled task must not delay other tasks');
|
||||||
|
@ -118,6 +118,39 @@ test('cancel', async t => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('cancel with do (no reject)', async t => {
|
||||||
|
const bukkit = makeTestQueue();
|
||||||
|
|
||||||
|
const taskResults = [];
|
||||||
|
const afterCancelMessage = 'Task was run correctly';
|
||||||
|
const cancelTaskPromise = bukkit.do(
|
||||||
|
() => {
|
||||||
|
taskResults.push('nope');
|
||||||
|
}, 999);
|
||||||
|
const keepTaskPromise = bukkit.do(
|
||||||
|
() => {
|
||||||
|
taskResults.push(afterCancelMessage);
|
||||||
|
testCompare(t, bukkit._timer.timeElapsed(), '<', 10, 'Canceled task must not delay other tasks');
|
||||||
|
}, 5);
|
||||||
|
|
||||||
|
// give the bucket a chance to make a mistake
|
||||||
|
await bukkit._timer.advanceMockTimeAsync(1);
|
||||||
|
|
||||||
|
t.equal(bukkit.length, 2);
|
||||||
|
const taskWasCanceled = bukkit.cancel(cancelTaskPromise);
|
||||||
|
t.ok(taskWasCanceled);
|
||||||
|
t.equal(bukkit.length, 1);
|
||||||
|
|
||||||
|
while (bukkit.length > 0) {
|
||||||
|
await bukkit._timer.advanceMockTimeAsync(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return keepTaskPromise.then(() => {
|
||||||
|
t.deepEqual(taskResults, [afterCancelMessage]);
|
||||||
|
t.end();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
test('cancelAll', async t => {
|
test('cancelAll', async t => {
|
||||||
const bukkit = makeTestQueue();
|
const bukkit = makeTestQueue();
|
||||||
|
|
||||||
|
@ -126,7 +159,7 @@ test('cancelAll', async t => {
|
||||||
const goodCancelMessage2 = 'Task2 was canceled correctly';
|
const goodCancelMessage2 = 'Task2 was canceled correctly';
|
||||||
|
|
||||||
const promises = [
|
const promises = [
|
||||||
bukkit.do(() => taskResults.push('nope'), 999).then(
|
bukkit.doOrReject(() => taskResults.push('nope'), 999).then(
|
||||||
() => {
|
() => {
|
||||||
t.fail('Task1 should have been canceled');
|
t.fail('Task1 should have been canceled');
|
||||||
},
|
},
|
||||||
|
@ -134,7 +167,7 @@ test('cancelAll', async t => {
|
||||||
taskResults.push(goodCancelMessage1);
|
taskResults.push(goodCancelMessage1);
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
bukkit.do(() => taskResults.push('nah'), 999).then(
|
bukkit.doOrReject(() => taskResults.push('nah'), 999).then(
|
||||||
() => {
|
() => {
|
||||||
t.fail('Task2 should have been canceled');
|
t.fail('Task2 should have been canceled');
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue