Skip to content

Commit

Permalink
chore(testrunner): remove effectiveMode and effectiveExpectation (#1569)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgozman
dgozman authored Mar 27, 2020
1 parent 48516ed commit a042466
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 61 deletions.
83 changes: 32 additions & 51 deletions utils/testrunner/TestRunner.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,22 +155,6 @@ class Test {
setRepeat(repeat) {
this._repeat = repeat;
}

effectiveMode() {
for (let suite = this._suite; suite; suite = suite.parentSuite()) {
if (suite.mode() === TestMode.Skip)
return TestMode.Skip;
}
return this._mode;
}

effectiveExpectation() {
for (let suite = this._suite; suite; suite = suite.parentSuite()) {
if (suite.expectation() === TestExpectation.Fail)
return TestExpectation.Fail;
}
return this._expectation;
}
}

class Suite {
Expand Down Expand Up @@ -313,14 +297,20 @@ class TestWorker {
if (this._markTerminated(test))
return;

if (test.effectiveMode() === TestMode.Skip) {
let skipped = test.mode() === TestMode.Skip;
for (let suite = test.suite(); suite; suite = suite.parentSuite())
skipped = skipped || (suite.mode() === TestMode.Skip);
if (skipped) {
await this._testPass._willStartTest(this, test);
test.result = TestResult.Skipped;
await this._testPass._didFinishTest(this, test);
return;
}

if (test.effectiveExpectation() === TestExpectation.Fail && test.effectiveMode() !== TestMode.Focus) {
let expectedToFail = test.expectation() === TestExpectation.Fail;
for (let suite = test.suite(); suite; suite = suite.parentSuite())
expectedToFail = expectedToFail || (suite.expectation() === TestExpectation.Fail);
if (expectedToFail && test.mode() !== TestMode.Focus) {
await this._testPass._willStartTest(this, test);
test.result = TestResult.MarkedAsFailing;
await this._testPass._didFinishTest(this, test);
Expand Down Expand Up @@ -740,6 +730,29 @@ class TestRunner extends EventEmitter {
return result;
}

runnableTests() {
if (!this.hasFocusedTestsOrSuites())
return this._tests.slice();
const notFocusedSuites = new Set();
// Mark parent suites of focused tests as not focused.
for (const test of this._tests) {
if (test.mode() === TestMode.Focus) {
for (let suite = test.suite(); suite; suite = suite.parentSuite())
notFocusedSuites.add(suite);
}
}
// Pick all tests that are focused or belong to focused suites.
const tests = [];
for (const test of this._tests) {
let focused = test.mode() === TestMode.Focus;
for (let suite = test.suite(); suite; suite = suite.parentSuite())
focused = focused || (suite.mode() === TestMode.Focus && !notFocusedSuites.has(suite));
if (focused)
tests.push(test);
}
return tests;
}

async terminate() {
if (!this._runningPass)
return;
Expand All @@ -750,44 +763,12 @@ class TestRunner extends EventEmitter {
return this._timeout;
}

runnableTests() {
if (!this.hasFocusedTestsOrSuites())
return this._tests;

const tests = [];
const blacklistSuites = new Set();
// First pass: pick "fit" and blacklist parent suites
for (let i = 0; i < this._tests.length; i++) {
const test = this._tests[i];
if (test.mode() !== TestMode.Focus)
continue;
tests.push({ i, test });
for (let suite = test.suite(); suite; suite = suite.parentSuite())
blacklistSuites.add(suite);
}
// Second pass: pick all tests that belong to non-blacklisted "fdescribe"
for (let i = 0; i < this._tests.length; i++) {
const test = this._tests[i];
let insideFocusedSuite = false;
for (let suite = test.suite(); suite; suite = suite.parentSuite()) {
if (!blacklistSuites.has(suite) && suite.mode() === TestMode.Focus) {
insideFocusedSuite = true;
break;
}
}
if (insideFocusedSuite)
tests.push({ i, test });
}
tests.sort((a, b) => a.i - b.i);
return tests.map(t => t.test);
}

focusedSuites() {
return this._suites.filter(suite => suite.mode() === TestMode.Focus);
}

focusedTests() {
return this._tests.filter(test => test.effectiveMode() === TestMode.Focus);
return this._tests.filter(test => test.mode() === TestMode.Focus);
}

hasFocusedTestsOrSuites() {
Expand Down
27 changes: 17 additions & 10 deletions utils/testrunner/test/testrunner.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports.addTests = function({testRunner, expect}) {
const test = t.tests()[0];
expect(test.name()).toBe('uno');
expect(test.fullName()).toBe('uno');
expect(test.effectiveMode()).toBe('run');
expect(test.mode()).toBe('run');
expect(test.location().filePath).toEqual(__filename);
expect(test.location().fileName).toEqual('testrunner.spec.js');
expect(test.location().lineNumber).toBeTruthy();
Expand All @@ -35,7 +35,8 @@ module.exports.addTests = function({testRunner, expect}) {
const test = t.tests()[0];
expect(test.name()).toBe('uno');
expect(test.fullName()).toBe('uno');
expect(test.effectiveMode()).toBe('skip');
expect(test.mode()).toBe('skip');
expect(t.runnableTests()).toEqual([test]);
});
});

Expand All @@ -47,7 +48,8 @@ module.exports.addTests = function({testRunner, expect}) {
const test = t.tests()[0];
expect(test.name()).toBe('uno');
expect(test.fullName()).toBe('uno');
expect(test.effectiveMode()).toBe('focus');
expect(test.mode()).toBe('focus');
expect(t.runnableTests()).toEqual([test]);
});
it('should run a failed focused test', async() => {
const t = newTestRunner();
Expand All @@ -70,10 +72,11 @@ module.exports.addTests = function({testRunner, expect}) {
const test = t.tests()[0];
expect(test.name()).toBe('uno');
expect(test.fullName()).toBe('suite uno');
expect(test.effectiveMode()).toBe('run');
expect(test.mode()).toBe('run');
expect(test.suite().name()).toBe('suite');
expect(test.suite().fullName()).toBe('suite');
expect(test.suite().mode()).toBe('run');
expect(t.runnableTests()).toEqual([test]);
});
});

Expand All @@ -85,18 +88,20 @@ module.exports.addTests = function({testRunner, expect}) {
});
expect(t.tests().length).toBe(1);
const test = t.tests()[0];
expect(test.effectiveMode()).toBe('skip');
expect(test.mode()).toBe('run');
expect(test.suite().mode()).toBe('skip');
expect(t.runnableTests()).toEqual([test]);
});
it('focused tests inside a skipped suite are considered skipped', async() => {
it('focused tests inside a skipped suite are not run', async() => {
const t = newTestRunner();
t.xdescribe('suite', () => {
t.fit('uno', () => {});
});
expect(t.tests().length).toBe(1);
const test = t.tests()[0];
expect(test.effectiveMode()).toBe('skip');
expect(test.mode()).toBe('focus');
expect(test.suite().mode()).toBe('skip');
expect(t.runnableTests()).toEqual([test]);
});
});

Expand All @@ -108,18 +113,20 @@ module.exports.addTests = function({testRunner, expect}) {
});
expect(t.tests().length).toBe(1);
const test = t.tests()[0];
expect(test.effectiveMode()).toBe('run');
expect(test.mode()).toBe('run');
expect(test.suite().mode()).toBe('focus');
expect(t.runnableTests()).toEqual([test]);
});
it('skipped tests inside a focused suite should stay skipped', async() => {
it('skipped tests inside a focused suite should not be run', async() => {
const t = newTestRunner();
t.fdescribe('suite', () => {
t.xit('uno', () => {});
});
expect(t.tests().length).toBe(1);
const test = t.tests()[0];
expect(test.effectiveMode()).toBe('skip');
expect(test.mode()).toBe('skip');
expect(test.suite().mode()).toBe('focus');
expect(t.runnableTests()).toEqual([test]);
});
it('should run all "run" tests inside a focused suite', async() => {
const log = [];
Expand Down

0 comments on commit a042466

Please sign in to comment.