1313'use strict' ;
1414
1515let Scheduler ;
16- let sharedProfilingArray ;
1716// let runWithPriority;
1817let ImmediatePriority ;
1918let UserBlockingPriority ;
@@ -59,10 +58,6 @@ describe('Scheduler', () => {
5958 jest . mock ( 'scheduler' , ( ) => require ( 'scheduler/unstable_mock' ) ) ;
6059 Scheduler = require ( 'scheduler' ) ;
6160
62- sharedProfilingArray = new Int32Array (
63- Scheduler . unstable_Profiling . sharedProfilingBuffer ,
64- ) ;
65-
6661 // runWithPriority = Scheduler.unstable_runWithPriority;
6762 ImmediatePriority = Scheduler . unstable_ImmediatePriority ;
6863 UserBlockingPriority = Scheduler . unstable_UserBlockingPriority ;
@@ -76,20 +71,6 @@ describe('Scheduler', () => {
7671 // shouldYield = Scheduler.unstable_shouldYield;
7772 } ) ;
7873
79- const PRIORITY = 0 ;
80- const CURRENT_TASK_ID = 1 ;
81- const CURRENT_RUN_ID = 2 ;
82- const QUEUE_SIZE = 3 ;
83-
84- afterEach ( ( ) => {
85- if ( sharedProfilingArray [ QUEUE_SIZE ] !== 0 ) {
86- throw Error (
87- 'Test exited, but the shared profiling buffer indicates that a task ' +
88- 'is still running' ,
89- ) ;
90- }
91- } ) ;
92-
9374 const TaskStartEvent = 1 ;
9475 const TaskCompleteEvent = 2 ;
9576 const TaskErrorEvent = 3 ;
@@ -272,23 +253,6 @@ describe('Scheduler', () => {
272253 return '\n' + result ;
273254 }
274255
275- function getProfilingInfo ( ) {
276- const queueSize = sharedProfilingArray [ QUEUE_SIZE ] ;
277- if ( queueSize === 0 ) {
278- return 'Empty Queue' ;
279- }
280- const priorityLevel = sharedProfilingArray [ PRIORITY ] ;
281- if ( priorityLevel === 0 ) {
282- return 'Suspended, Queue Size: ' + queueSize ;
283- }
284- return (
285- `Task: ${ sharedProfilingArray [ CURRENT_TASK_ID ] } , ` +
286- `Run: ${ sharedProfilingArray [ CURRENT_RUN_ID ] } , ` +
287- `Priority: ${ priorityLevelToString ( priorityLevel ) } , ` +
288- `Queue Size: ${ sharedProfilingArray [ QUEUE_SIZE ] } `
289- ) ;
290- }
291-
292256 it ( 'creates a basic flamegraph' , ( ) => {
293257 Scheduler . unstable_Profiling . startLoggingProfilingEvents ( ) ;
294258
@@ -297,35 +261,27 @@ describe('Scheduler', () => {
297261 NormalPriority ,
298262 ( ) => {
299263 Scheduler . unstable_advanceTime ( 300 ) ;
300- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
264+ Scheduler . unstable_yieldValue ( 'Yield 1' ) ;
301265 scheduleCallback (
302266 UserBlockingPriority ,
303267 ( ) => {
304- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
268+ Scheduler . unstable_yieldValue ( 'Yield 2' ) ;
305269 Scheduler . unstable_advanceTime ( 300 ) ;
306270 } ,
307271 { label : 'Bar' } ,
308272 ) ;
309273 Scheduler . unstable_advanceTime ( 100 ) ;
310- Scheduler . unstable_yieldValue ( 'Yield' ) ;
274+ Scheduler . unstable_yieldValue ( 'Yield 3 ' ) ;
311275 return ( ) => {
312- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
276+ Scheduler . unstable_yieldValue ( 'Yield 4' ) ;
313277 Scheduler . unstable_advanceTime ( 300 ) ;
314278 } ;
315279 } ,
316280 { label : 'Foo' } ,
317281 ) ;
318- expect ( Scheduler ) . toFlushAndYieldThrough ( [
319- 'Task: 1, Run: 1, Priority: Normal, Queue Size: 1' ,
320- 'Yield' ,
321- ] ) ;
282+ expect ( Scheduler ) . toFlushAndYieldThrough ( [ 'Yield 1' , 'Yield 3' ] ) ;
322283 Scheduler . unstable_advanceTime ( 100 ) ;
323- expect ( Scheduler ) . toFlushAndYield ( [
324- 'Task: 2, Run: 2, Priority: User-blocking, Queue Size: 2' ,
325- 'Task: 1, Run: 3, Priority: Normal, Queue Size: 1' ,
326- ] ) ;
327-
328- expect ( getProfilingInfo ( ) ) . toEqual ( 'Empty Queue' ) ;
284+ expect ( Scheduler ) . toFlushAndYield ( [ 'Yield 2' , 'Yield 4' ] ) ;
329285
330286 expect ( stopProfilingAndPrintFlamegraph ( ) ) . toEqual (
331287 `
@@ -340,19 +296,16 @@ Task 1 [Normal] │ ████████░░░░░░░
340296 Scheduler . unstable_Profiling . startLoggingProfilingEvents ( ) ;
341297
342298 const task = scheduleCallback ( NormalPriority , ( ) => {
343- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
299+ Scheduler . unstable_yieldValue ( 'Yield 1' ) ;
344300 Scheduler . unstable_advanceTime ( 300 ) ;
345- Scheduler . unstable_yieldValue ( 'Yield' ) ;
301+ Scheduler . unstable_yieldValue ( 'Yield 2 ' ) ;
346302 return ( ) => {
347303 Scheduler . unstable_yieldValue ( 'Continuation' ) ;
348304 Scheduler . unstable_advanceTime ( 200 ) ;
349305 } ;
350306 } ) ;
351307
352- expect ( Scheduler ) . toFlushAndYieldThrough ( [
353- 'Task: 1, Run: 1, Priority: Normal, Queue Size: 1' ,
354- 'Yield' ,
355- ] ) ;
308+ expect ( Scheduler ) . toFlushAndYieldThrough ( [ 'Yield 1' , 'Yield 2' ] ) ;
356309 Scheduler . unstable_advanceTime ( 100 ) ;
357310
358311 cancelCallback ( task ) ;
@@ -392,28 +345,25 @@ Task 1 [Normal] │██████🡐 errored
392345 Scheduler . unstable_Profiling . startLoggingProfilingEvents ( ) ;
393346
394347 const task1 = scheduleCallback ( NormalPriority , ( ) => {
395- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
348+ Scheduler . unstable_yieldValue ( 'Yield 1' ) ;
396349 Scheduler . unstable_advanceTime ( 300 ) ;
397- Scheduler . unstable_yieldValue ( 'Yield' ) ;
350+ Scheduler . unstable_yieldValue ( 'Yield 2 ' ) ;
398351 return ( ) => {
399352 Scheduler . unstable_yieldValue ( 'Continuation' ) ;
400353 Scheduler . unstable_advanceTime ( 200 ) ;
401354 } ;
402355 } ) ;
403356 const task2 = scheduleCallback ( NormalPriority , ( ) => {
404- Scheduler . unstable_yieldValue ( getProfilingInfo ( ) ) ;
357+ Scheduler . unstable_yieldValue ( 'Yield 3' ) ;
405358 Scheduler . unstable_advanceTime ( 300 ) ;
406- Scheduler . unstable_yieldValue ( 'Yield' ) ;
359+ Scheduler . unstable_yieldValue ( 'Yield 4 ' ) ;
407360 return ( ) => {
408361 Scheduler . unstable_yieldValue ( 'Continuation' ) ;
409362 Scheduler . unstable_advanceTime ( 200 ) ;
410363 } ;
411364 } ) ;
412365
413- expect ( Scheduler ) . toFlushAndYieldThrough ( [
414- 'Task: 1, Run: 1, Priority: Normal, Queue Size: 2' ,
415- 'Yield' ,
416- ] ) ;
366+ expect ( Scheduler ) . toFlushAndYieldThrough ( [ 'Yield 1' , 'Yield 2' ] ) ;
417367 Scheduler . unstable_advanceTime ( 100 ) ;
418368
419369 cancelCallback ( task1 ) ;
0 commit comments