Skip to content

Commit

Permalink
tests(lantern): remove usage of computed PageDependencyGraph (#16063)
Browse files Browse the repository at this point in the history
  • Loading branch information
connorjclark committed Jun 11, 2024
1 parent 5ef22db commit 4285e05
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
8 changes: 7 additions & 1 deletion core/test/lib/lantern/metrics/metric-test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import * as Lantern from '../../../../lib/lantern/types/lantern.js';
import {NetworkAnalyzer} from '../../../../lib/lantern/simulator/network-analyzer.js';
import {Simulator} from '../../../../lib/lantern/simulator/simulator.js';
import * as TraceEngineComputationData from '../../../../lib/lantern/trace-engine-computation-data.js';
import {polyfillDOMRect} from '../../../../lib/polyfill-dom-rect.js';

polyfillDOMRect();

/**
* @param {TraceEngine.Types.TraceEvents.TraceEventData[]} traceEvents
Expand Down Expand Up @@ -40,4 +43,7 @@ async function getComputationDataFromFixture({trace, settings, URL}) {
};
}

export {getComputationDataFromFixture};
export {
runTraceEngine,
getComputationDataFromFixture,
};
20 changes: 15 additions & 5 deletions core/test/lib/lantern/simulator/simulator-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,32 @@

import assert from 'assert/strict';

import * as Lantern from '../../../../lib/lantern/metric.js';
import {NetworkNode} from '../../../../lib/lantern/network-node.js';
import {CPUNode} from '../../../../lib/lantern/cpu-node.js';
import {Simulator} from '../../../../lib/lantern/simulator/simulator.js';
import {DNSCache} from '../../../../lib/lantern/simulator/dns-cache.js';
import {PageDependencyGraph} from '../../../../computed/page-dependency-graph.js';
import {getURLArtifactFromDevtoolsLog, readJson} from '../../../test-utils.js';
import {NetworkRequest} from '../../../../lib/network-request.js';
import * as TraceEngineComputationData from '../../../../lib/lantern/trace-engine-computation-data.js';
import {runTraceEngine} from '../metrics/metric-test-utils.js';

const pwaTrace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta);
const pwaDevtoolsLog = readJson('../../../fixtures/artifacts/progressive-app/devtoolslog.json', import.meta);

let nextRequestId = 1;
let nextTid = 1;

/**
* @param {Lantern.Trace} trace
* @param {Lantern.Simulation.URL} URL
*/
async function createGraph(trace, URL) {
const traceEngineData = await runTraceEngine(trace.traceEvents);
const requests = TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
return TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
}

function request(opts) {
const scheme = opts.scheme || 'http';
const url = `${scheme}://example.com`;
Expand Down Expand Up @@ -386,16 +398,14 @@ describe('DependencyGraph/Simulator', () => {
const URL = getURLArtifactFromDevtoolsLog(devtoolsLog);

it('should compute a timeInMs', async () => {
const computedCache = new Map();
const graph = await PageDependencyGraph.request({trace, devtoolsLog, URL}, {computedCache});
const graph = await createGraph(trace, URL);
const simulator = new Simulator({serverResponseTimeByOrigin});
const result = simulator.simulate(graph);
expect(result.timeInMs).toBeGreaterThan(100);
});

it('should sort the task event times', async () => {
const computedCache = new Map();
const graph = await PageDependencyGraph.request({trace, devtoolsLog, URL}, {computedCache});
const graph = await createGraph(trace, URL);
const simulator = new Simulator({serverResponseTimeByOrigin});
const result = simulator.simulate(graph);
const nodeTimings = Array.from(result.nodeTimings.entries());
Expand Down

0 comments on commit 4285e05

Please sign in to comment.