mirror of
https://github.com/google/blockly.git
synced 2026-01-09 01:50:11 +01:00
* fix(build): Have buildShims clean up up after itself
We need to create a build/package.json file to allow node.js to
load build/src/core/blockly.js and the other chunk entry points
as ES modules (it forcibly assumes .js means CJS even if one is
trying to import, unless package.json says {"type": "module"}),
but this interferes with scripts/migration/js2ts doing a
require('build/deps.js'), which is _not_ an ES module.
Specific error message was:
/Users/cpcallen/src/blockly/scripts/migration/js2ts:56
require(path.resolve(__dirname, '../../build/deps.js'));
^
Error [ERR_REQUIRE_ESM]: require() of ES Module
/Users/cpcallen/src/blockly/build/deps.js from /Users/cpcallen/src/blockly/scripts/migration/js2ts
not supported.
deps.js is treated as an ES module file as it is a .js file whose
nearest parent package.json contains "type": "module" which
declares all .js files in that package scope as ES modules.
Instead rename deps.js to end in .cjs, change the requiring code
to use dynamic import() which is available in all CommonJS
modules, or change "type": "module" to "type": "commonjs" in
/Users/cpcallen/src/blockly/build/package.json to treat all .js
files as CommonJS (using .mjs for all ES modules instead).
at Object.<anonymous> (/Users/cpcallen/src/blockly/scripts/migration/js2ts:56:1) {
code: 'ERR_REQUIRE_ESM'
}
* chore(tests): Reorder to put interesting script nearer top of file
* chore(tests): Add missing imports of closure/goog/goog.js
These modules were depending on being loaded via the
debug module loader, which cannot be used without first loading
base.js as a script, and thereby defining goog.declareModuleId
as a side effect—but if they are to be loaded via direct import
statements then they need to actually import their own
dependencies.
This is a temporary measure as soon the goog.declareMouleId
calls can themselves be deleted.
* refactor(tests): Use import instead of bootstrap to load Blockly
* chores(build): Stop generating deps.mocha.js
This file was only needed by tests/mocha/index.html's use of
the debug module loader (via bootstrap.js), which has now been
removed.
* chore(tests): Remove unneeded goog.declareModuleId calls
These were only needed because these modules were previously
being loaded by goog.require and/or goog.bootstrap.
* chores(tests): Remove dead code
We are fully committed to proper modules now.
310 lines
9.3 KiB
JavaScript
310 lines
9.3 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {runTestCases, TestCase} from './common.js';
|
|
|
|
/**
|
|
* Field value test case.
|
|
* @implements {TestCase}
|
|
* @record
|
|
*/
|
|
export class FieldValueTestCase {
|
|
/**
|
|
* Class for a a field value test case.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {*} The value to use in test.
|
|
*/
|
|
this.value;
|
|
/**
|
|
* @type {*} The expected value.
|
|
*/
|
|
this.expectedValue;
|
|
/**
|
|
* @type {string|undefined} The expected text value. Provided if different
|
|
* from String(expectedValue).
|
|
*/
|
|
this.expectedText;
|
|
/**
|
|
* @type {!RegExp|string|undefined} The optional error message matcher.
|
|
* Provided if test case is expected to throw.
|
|
*/
|
|
this.errMsgMatcher;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Field creation test case.
|
|
* @extends {FieldValueTestCase}
|
|
* @record
|
|
*/
|
|
export class FieldCreationTestCase {
|
|
/**
|
|
* Class for a field creation test case.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {Array<*>} The arguments to pass to field constructor.
|
|
*/
|
|
this.args;
|
|
/**
|
|
* @type {string} The json to use in field creation.
|
|
*/
|
|
this.json;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Assert a field's value is the same as the expected value.
|
|
* @param {!Blockly.Field} field The field.
|
|
* @param {*} expectedValue The expected value.
|
|
* @param {string=} expectedText The expected text.
|
|
*/
|
|
export function assertFieldValue(
|
|
field,
|
|
expectedValue,
|
|
expectedText = undefined,
|
|
) {
|
|
const actualValue = field.getValue();
|
|
const actualText = field.getText();
|
|
if (expectedText === undefined) {
|
|
expectedText = String(expectedValue);
|
|
}
|
|
chai.assert.deepEqual(actualValue, expectedValue);
|
|
chai.assert.deepEqual(actualText, expectedText);
|
|
}
|
|
|
|
/**
|
|
* Runs provided creation test cases.
|
|
* @param {!Array<!FieldCreationTestCase>} testCases The test cases to run.
|
|
* @param {function(!Blockly.Field, !FieldCreationTestCase)} assertion The
|
|
* assertion to use.
|
|
* @param {function(new:Blockly.Field,!FieldCreationTestCase):Blockly.Field
|
|
* } creation A function that returns an instance of the field based on the
|
|
* provided test case.
|
|
* @private
|
|
*/
|
|
function runCreationTests_(testCases, assertion, creation) {
|
|
/**
|
|
* Creates test callback for creation test.
|
|
* @param {FieldCreationTestCase} testCase The test case to use.
|
|
* @return {Function} The test callback.
|
|
*/
|
|
const createTestFn = (testCase) => {
|
|
return function () {
|
|
const field = creation.call(this, testCase);
|
|
assertion(field, testCase);
|
|
};
|
|
};
|
|
runTestCases(testCases, createTestFn);
|
|
}
|
|
|
|
/**
|
|
* Runs provided creation test cases.
|
|
* @param {!Array<!FieldCreationTestCase>} testCases The test cases to run.
|
|
* @param {function(new:Blockly.Field,!FieldCreationTestCase):Blockly.Field
|
|
* } creation A function that returns an instance of the field based on the
|
|
* provided test case.
|
|
* @private
|
|
*/
|
|
function runCreationTestsAssertThrows_(testCases, creation) {
|
|
/**
|
|
* Creates test callback for creation test.
|
|
* @param {!FieldCreationTestCase} testCase The test case to use.
|
|
* @return {!Function} The test callback.
|
|
*/
|
|
const createTestFn = (testCase) => {
|
|
return function () {
|
|
chai.assert.throws(function () {
|
|
creation.call(this, testCase);
|
|
}, testCase.errMsgMatcher);
|
|
};
|
|
};
|
|
runTestCases(testCases, createTestFn);
|
|
}
|
|
|
|
/**
|
|
* Runs suite of tests for constructor for the specified field.
|
|
* @param {function(new:Blockly.Field, *=)} TestedField The class of the field
|
|
* being tested.
|
|
* @param {Array<!FieldCreationTestCase>} validValueTestCases Test cases with
|
|
* valid values for given field.
|
|
* @param {Array<!FieldCreationTestCase>} invalidValueTestCases Test cases with
|
|
* invalid values for given field.
|
|
* @param {function(!Blockly.Field, !FieldCreationTestCase)
|
|
* } validRunAssertField Asserts that field has expected values.
|
|
* @param {function(!Blockly.Field)=} assertFieldDefault Asserts that field has
|
|
* default values. If undefined, tests will check that field throws when
|
|
* invalid value is passed rather than asserting default.
|
|
* @param {function(!FieldCreationTestCase=)=} customCreateWithJs Custom
|
|
* creation function to use in tests.
|
|
*/
|
|
export function runConstructorSuiteTests(
|
|
TestedField,
|
|
validValueTestCases,
|
|
invalidValueTestCases,
|
|
validRunAssertField,
|
|
assertFieldDefault,
|
|
customCreateWithJs,
|
|
) {
|
|
suite('Constructor', function () {
|
|
if (assertFieldDefault) {
|
|
test('Empty', function () {
|
|
const field = customCreateWithJs
|
|
? customCreateWithJs.call(this)
|
|
: new TestedField();
|
|
assertFieldDefault(field);
|
|
});
|
|
} else {
|
|
test('Empty', function () {
|
|
chai.assert.throws(function () {
|
|
customCreateWithJs
|
|
? customCreateWithJs.call(this)
|
|
: new TestedField();
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Creates a field using its constructor and the provided test case.
|
|
* @param {!FieldCreationTestCase} testCase The test case information.
|
|
* @return {!Blockly.Field} The instantiated field.
|
|
*/
|
|
const createWithJs = function (testCase) {
|
|
return customCreateWithJs
|
|
? customCreateWithJs.call(this, testCase)
|
|
: new TestedField(...testCase.args);
|
|
};
|
|
if (assertFieldDefault) {
|
|
runCreationTests_(
|
|
invalidValueTestCases,
|
|
assertFieldDefault,
|
|
createWithJs,
|
|
);
|
|
} else {
|
|
runCreationTestsAssertThrows_(invalidValueTestCases, createWithJs);
|
|
}
|
|
runCreationTests_(validValueTestCases, validRunAssertField, createWithJs);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Runs suite of tests for fromJson creation of specified field.
|
|
* @param {function(new:Blockly.Field, *=)} TestedField The class of the field
|
|
* being tested.
|
|
* @param {!Array<!FieldCreationTestCase>} validValueTestCases Test cases with
|
|
* valid values for given field.
|
|
* @param {!Array<!FieldCreationTestCase>} invalidValueTestCases Test cases with
|
|
* invalid values for given field.
|
|
* @param {function(!Blockly.Field, !FieldValueTestCase)
|
|
* } validRunAssertField Asserts that field has expected values.
|
|
* @param {function(!Blockly.Field)=} assertFieldDefault Asserts that field has
|
|
* default values. If undefined, tests will check that field throws when
|
|
* invalid value is passed rather than asserting default.
|
|
* @param {function(!FieldCreationTestCase=)=} customCreateWithJson Custom
|
|
* creation function to use in tests.
|
|
*/
|
|
export function runFromJsonSuiteTests(
|
|
TestedField,
|
|
validValueTestCases,
|
|
invalidValueTestCases,
|
|
validRunAssertField,
|
|
assertFieldDefault,
|
|
customCreateWithJson,
|
|
) {
|
|
suite('fromJson', function () {
|
|
if (assertFieldDefault) {
|
|
test('Empty', function () {
|
|
const field = customCreateWithJson
|
|
? customCreateWithJson.call(this)
|
|
: TestedField.fromJson({});
|
|
assertFieldDefault(field);
|
|
});
|
|
} else {
|
|
test('Empty', function () {
|
|
chai.assert.throws(function () {
|
|
customCreateWithJson
|
|
? customCreateWithJson.call(this)
|
|
: TestedField.fromJson({});
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Creates a field using fromJson and the provided test case.
|
|
* @param {!FieldCreationTestCase} testCase The test case information.
|
|
* @return {!Blockly.Field} The instantiated field.
|
|
*/
|
|
const createWithJson = function (testCase) {
|
|
return customCreateWithJson
|
|
? customCreateWithJson.call(this, testCase)
|
|
: TestedField.fromJson(testCase.json);
|
|
};
|
|
if (assertFieldDefault) {
|
|
runCreationTests_(
|
|
invalidValueTestCases,
|
|
assertFieldDefault,
|
|
createWithJson,
|
|
);
|
|
} else {
|
|
runCreationTestsAssertThrows_(invalidValueTestCases, createWithJson);
|
|
}
|
|
runCreationTests_(validValueTestCases, validRunAssertField, createWithJson);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Runs tests for setValue calls.
|
|
* @param {!Array<!FieldValueTestCase>} validValueTestCases Test cases with
|
|
* valid values.
|
|
* @param {!Array<!FieldValueTestCase>} invalidValueTestCases Test cases with
|
|
* invalid values.
|
|
* @param {*} invalidRunExpectedValue Expected value for field after invalid
|
|
* call to setValue.
|
|
* @param {string=} invalidRunExpectedText Expected text for field after invalid
|
|
* call to setValue.
|
|
*/
|
|
export function runSetValueTests(
|
|
validValueTestCases,
|
|
invalidValueTestCases,
|
|
invalidRunExpectedValue,
|
|
invalidRunExpectedText,
|
|
) {
|
|
/**
|
|
* Creates test callback for invalid setValue test.
|
|
* @param {!FieldValueTestCase} testCase The test case information.
|
|
* @return {!Function} The test callback.
|
|
*/
|
|
const createInvalidSetValueTestCallback = (testCase) => {
|
|
return function () {
|
|
this.field.setValue(testCase.value);
|
|
assertFieldValue(
|
|
this.field,
|
|
invalidRunExpectedValue,
|
|
invalidRunExpectedText,
|
|
);
|
|
};
|
|
};
|
|
/**
|
|
* Creates test callback for valid setValue test.
|
|
* @param {!FieldValueTestCase} testCase The test case information.
|
|
* @return {!Function} The test callback.
|
|
*/
|
|
const createValidSetValueTestCallback = (testCase) => {
|
|
return function () {
|
|
this.field.setValue(testCase.value);
|
|
assertFieldValue(
|
|
this.field,
|
|
testCase.expectedValue,
|
|
testCase.expectedText,
|
|
);
|
|
};
|
|
};
|
|
runTestCases(invalidValueTestCases, createInvalidSetValueTestCallback);
|
|
runTestCases(validValueTestCases, createValidSetValueTestCallback);
|
|
}
|