{"parents":["da1e5776b1491177c59d68e7723ad0e787e7fc49"],"commit":{"authorName":"Brian Vaughn","authoredAt":"2019-05-04T14:22:50-07:00","subject":"Added remaining profiling tests. One currently fails because of a bug with act() and interaction tracing","authorEmail":"bvaughn@fb.com","shortRevision":"1c49a7ef59","revision":"1c49a7ef59f5e35b11d7418fee163a6d93a0856a"},"body":"","files":[{"status":"M","path":"src\/__tests__\/__snapshots__\/profiling-test.js.snap"},{"status":"M","path":"src\/__tests__\/profiling-test.js"}],"patch":"diff --git a\/src\/__tests__\/__snapshots__\/profiling-test.js.snap b\/src\/__tests__\/__snapshots__\/profiling-test.js.snap\nindex 4f9c7ae56d..01204c9a6b 100644\n--- a\/src\/__tests__\/__snapshots__\/profiling-test.js.snap\n+++ b\/src\/__tests__\/__snapshots__\/profiling-test.js.snap\n@@ -1,33 +1,6 @@\n \/\/ Jest Snapshot v1, https:\/\/goo.gl\/fbAQLP\n \n-exports[`profiling commitDetails should be collected for each commit: 1: mount 1`] = `\n-[root]\n- ▾ \n- \n- \n-`;\n-\n-exports[`profiling commitDetails should be collected for each commit: 2: add child 1`] = `\n-[root]\n- ▾ \n- \n- \n- \n-`;\n-\n-exports[`profiling commitDetails should be collected for each commit: 3: remove children 1`] = `\n-[root]\n- ▾ \n- \n-`;\n-\n-exports[`profiling commitDetails should be collected for each commit: 4: profiling stopped 1`] = `\n-[root]\n- ▾ \n- \n-`;\n-\n-exports[`profiling commitDetails should be collected for each commit: 5: CommitDetails: mount 1`] = `\n+exports[`profiling CommitDetails should be collected for each commit: CommitDetails commitIndex: 0 1`] = `\n Object {\n \"actualDurations\": Map {\n 1 => 14,\n@@ -41,7 +14,7 @@ Object {\n }\n `;\n \n-exports[`profiling commitDetails should be collected for each commit: 6: CommitDetails: add child 1`] = `\n+exports[`profiling CommitDetails should be collected for each commit: CommitDetails commitIndex: 1 1`] = `\n Object {\n \"actualDurations\": Map {\n 3 => 2,\n@@ -56,7 +29,7 @@ Object {\n }\n `;\n \n-exports[`profiling commitDetails should be collected for each commit: 7: CommitDetails: remove children 1`] = `\n+exports[`profiling CommitDetails should be collected for each commit: CommitDetails commitIndex: 2 1`] = `\n Object {\n \"actualDurations\": Map {\n 3 => 2,\n@@ -69,42 +42,106 @@ Object {\n }\n `;\n \n-exports[`profiling profilingSummary should be collected for each commit: 1: mount 1`] = `\n-[root]\n- ▾ \n- \n- \n+exports[`profiling CommitDetails should be collected for each commit: CommitDetails commitIndex: 3 1`] = `\n+Object {\n+ \"actualDurations\": Map {\n+ 2 => 10,\n+ 1 => 10,\n+ },\n+ \"commitIndex\": 3,\n+ \"interactions\": Array [],\n+ \"rootID\": 1,\n+}\n+`;\n+\n+exports[`profiling FiberCommits should be collected for each rendered fiber: FiberCommits: element 2 1`] = `\n+Object {\n+ \"commitDurations\": Array [\n+ 0,\n+ 12,\n+ 1,\n+ 14,\n+ 2,\n+ 16,\n+ ],\n+ \"fiberID\": 2,\n+ \"rootID\": 1,\n+}\n+`;\n+\n+exports[`profiling FiberCommits should be collected for each rendered fiber: FiberCommits: element 3 1`] = `\n+Object {\n+ \"commitDurations\": Array [\n+ 0,\n+ 2,\n+ 1,\n+ 2,\n+ 2,\n+ 2,\n+ ],\n+ \"fiberID\": 3,\n+ \"rootID\": 1,\n+}\n `;\n \n-exports[`profiling profilingSummary should be collected for each commit: 2: add child 1`] = `\n-[root]\n- ▾ \n- \n- \n- \n+exports[`profiling FiberCommits should be collected for each rendered fiber: FiberCommits: element 4 1`] = `\n+Object {\n+ \"commitDurations\": Array [\n+ 1,\n+ 2,\n+ 2,\n+ 2,\n+ ],\n+ \"fiberID\": 4,\n+ \"rootID\": 1,\n+}\n `;\n \n-exports[`profiling profilingSummary should be collected for each commit: 3: remove children 1`] = `\n-[root]\n- ▾ \n- \n+exports[`profiling FiberCommits should be collected for each rendered fiber: FiberCommits: element 5 1`] = `\n+Object {\n+ \"commitDurations\": Array [\n+ 2,\n+ 2,\n+ ],\n+ \"fiberID\": 5,\n+ \"rootID\": 1,\n+}\n `;\n \n-exports[`profiling profilingSummary should be collected for each commit: 4: profiling stopped 1`] = `\n-[root]\n- ▾ \n- \n+exports[`profiling Interactions should be collected for every traced interaction: Interactions 1`] = `\n+Array [\n+ Object {\n+ \"__count\": 0,\n+ \"commits\": Array [\n+ 1,\n+ ],\n+ \"id\": 0,\n+ \"name\": \"one child\",\n+ \"timestamp\": 10,\n+ },\n+ Object {\n+ \"__count\": 0,\n+ \"commits\": Array [\n+ 2,\n+ ],\n+ \"id\": 1,\n+ \"name\": \"two children\",\n+ \"timestamp\": 22,\n+ },\n+]\n `;\n \n-exports[`profiling profilingSummary should be collected for each commit: ProfilingSummary 1`] = `\n+exports[`profiling ProfilingSummary should be collected for each commit: ProfilingSummary 1`] = `\n Object {\n \"commitDurations\": Array [\n 16,\n 12,\n+ 10,\n ],\n \"commitTimes\": Array [\n 16,\n 28,\n+ 38,\n ],\n \"initialTreeBaseDurations\": Map {\n 1 => 14,\ndiff --git a\/src\/__tests__\/profiling-test.js b\/src\/__tests__\/profiling-test.js\nindex 253270cf13..b38c6dadd8 100644\n--- a\/src\/__tests__\/profiling-test.js\n+++ b\/src\/__tests__\/profiling-test.js\n@@ -4,6 +4,7 @@ describe('profiling', () => {\n let React;\n let ReactDOM;\n let Scheduler;\n+ let SchedulerTracing;\n let TestRenderer;\n let store;\n let utils;\n@@ -18,10 +19,11 @@ describe('profiling', () => {\n React = require('react');\n ReactDOM = require('react-dom');\n Scheduler = require('scheduler');\n+ SchedulerTracing = require('scheduler\/tracing');\n TestRenderer = utils.requireTestRenderer();\n });\n \n- describe('profilingSummary', () => {\n+ describe('ProfilingSummary', () => {\n it('should be collected for each commit', async done => {\n const Parent = ({ count }) => {\n Scheduler.advanceTime(10);\n@@ -36,26 +38,19 @@ describe('profiling', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('1: mount');\n-\n+ utils.act(() => ReactDOM.render(, container));\n utils.act(() => store.startProfiling());\n-\n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('2: add child');\n-\n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('3: remove children');\n-\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n utils.act(() => store.stopProfiling());\n- expect(store).toMatchSnapshot('4: profiling stopped');\n \n- let profilingSummary;\n function Suspender({ rendererID, rootID }) {\n- profilingSummary = store.profilingCache.ProfilingSummary.read({\n+ const profilingSummary = store.profilingCache.ProfilingSummary.read({\n rendererID,\n rootID,\n });\n+ expect(profilingSummary).toMatchSnapshot('ProfilingSummary');\n return null;\n }\n \n@@ -70,13 +65,11 @@ describe('profiling', () => {\n )\n );\n \n- expect(profilingSummary).toMatchSnapshot('ProfilingSummary');\n-\n done();\n });\n });\n \n- describe('commitDetails', () => {\n+ describe('CommitDetails', () => {\n it('should be collected for each commit', async done => {\n const Parent = ({ count }) => {\n Scheduler.advanceTime(10);\n@@ -92,72 +85,153 @@ describe('profiling', () => {\n const container = document.createElement('div');\n \n utils.act(() => store.startProfiling());\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => store.stopProfiling());\n+\n+ function Suspender({ commitIndex, rendererID, rootID }) {\n+ const commitDetails = store.profilingCache.CommitDetails.read({\n+ commitIndex,\n+ rendererID,\n+ rootID,\n+ });\n+ expect(commitDetails).toMatchSnapshot(\n+ `CommitDetails commitIndex: ${commitIndex}`\n+ );\n+ return null;\n+ }\n \n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('1: mount');\n+ const rendererID = utils.getRendererID();\n+ const rootID = store.roots[0];\n \n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('2: add child');\n+ for (let commitIndex = 0; commitIndex <= 3; commitIndex++) {\n+ await utils.actSuspense(() =>\n+ TestRenderer.create(\n+ \n+ \n+ <\/React.Suspense>\n+ )\n+ );\n+ }\n \n- utils.act(() => ReactDOM.render(, container));\n- expect(store).toMatchSnapshot('3: remove children');\n+ done();\n+ });\n+ });\n \n+ describe('FiberCommits', () => {\n+ it('should be collected for each rendered fiber', async done => {\n+ const Parent = ({ count }) => {\n+ Scheduler.advanceTime(10);\n+ return new Array(count)\n+ .fill(true)\n+ .map((_, index) => );\n+ };\n+ const Child = () => {\n+ Scheduler.advanceTime(2);\n+ return null;\n+ };\n+\n+ const container = document.createElement('div');\n+\n+ utils.act(() => store.startProfiling());\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n+ utils.act(() => ReactDOM.render(, container));\n utils.act(() => store.stopProfiling());\n- expect(store).toMatchSnapshot('4: profiling stopped');\n \n- let commitDetails;\n- function Suspender({ commitIndex, rendererID, rootID }) {\n- commitDetails = store.profilingCache.CommitDetails.read({\n- commitIndex,\n+ function Suspender({ fiberID, rendererID, rootID }) {\n+ const fiberCommits = store.profilingCache.FiberCommits.read({\n+ fiberID,\n rendererID,\n rootID,\n });\n+ expect(fiberCommits).toMatchSnapshot(\n+ `FiberCommits: element ${fiberID}`\n+ );\n return null;\n }\n \n const rendererID = utils.getRendererID();\n const rootID = store.roots[0];\n \n- await utils.actSuspense(() =>\n- TestRenderer.create(\n- \n- \n- <\/React.Suspense>\n+ for (let index = 0; index < store.numElements; index++) {\n+ await utils.actSuspense(() =>\n+ TestRenderer.create(\n+ \n+ \n+ <\/React.Suspense>\n+ )\n+ );\n+ }\n+\n+ done();\n+ });\n+ });\n+\n+ describe('Interactions', () => {\n+ it('should be collected for every traced interaction', async done => {\n+ const Parent = ({ count }) => {\n+ Scheduler.advanceTime(10);\n+ return new Array(count)\n+ .fill(true)\n+ .map((_, index) => );\n+ };\n+ const Child = () => {\n+ Scheduler.advanceTime(2);\n+ return null;\n+ };\n+\n+ const container = document.createElement('div');\n+\n+ utils.act(() => store.startProfiling());\n+ console.log('[test] render one');\n+ utils.act(() =>\n+ SchedulerTracing.unstable_trace(\n+ 'one child',\n+ Scheduler.unstable_now(),\n+ () => ReactDOM.render(, container)\n )\n );\n- expect(commitDetails).toMatchSnapshot('5: CommitDetails: mount');\n-\n- await utils.actSuspense(() =>\n- TestRenderer.create(\n- \n- \n- <\/React.Suspense>\n+ console.log('[test] render two');\n+ utils.act(() =>\n+ SchedulerTracing.unstable_trace(\n+ 'two children',\n+ Scheduler.unstable_now(),\n+ () => ReactDOM.render(, container)\n )\n );\n- expect(commitDetails).toMatchSnapshot('6: CommitDetails: add child');\n+ console.log('[test] done');\n+ utils.act(() => store.stopProfiling());\n+\n+ function Suspender({ rendererID, rootID }) {\n+ const interactions = store.profilingCache.Interactions.read({\n+ rendererID,\n+ rootID,\n+ });\n+ expect(interactions).toMatchSnapshot('Interactions');\n+ return null;\n+ }\n+\n+ const rendererID = utils.getRendererID();\n+ const rootID = store.roots[0];\n \n await utils.actSuspense(() =>\n TestRenderer.create(\n \n- \n+ \n <\/React.Suspense>\n )\n );\n- expect(commitDetails).toMatchSnapshot(\n- '7: CommitDetails: remove children'\n- );\n \n done();\n });\n"}

dillon1000/react

Files changed