fix: move test helpers from samples into core (google#5969)

* fix: move core test helpers into new directory * fix: add test helpers to core and convert to goog modules * fix: change tests to use local helpers * fix: change local tests to use chai asserts * fix: skip field tests in serializer b/c test blocks are unavailable * fix: rename some helper files * fix: rename some helper modules * fix: split block helpers into code gen and serialization * fix: split block defs into new helper file * fix: split warning helpers into new file * fix: split user input helpers into new file * fix: split event helpers into a new file * fix: split variable helper into new file * fix: move remaining test helpers to new setup-teardown file * fix: rename setup and teardown module * fix: cleanup from rebase * fix: undo accidental rename * fix: lint? * fix: bad toolbox definitions namespace * fix: fixup warning helpers * fix: remove inclusion of dev-tools in mocha tests * move to modules, but break mocha * fix: run mocha as a module * fix: lint
alschmiedt · Mar 4, 2022 · 2edd228 · 2edd228
1 parent 6841ccc
commit 2edd228
Show file tree

Hide file tree

Showing 74 changed files with 1,713 additions and 985 deletions.
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
diff --git a/tests/mocha/.eslintrc.json b/tests/mocha/.eslintrc.json
@@ -1,18 +1,21 @@
 {
+ "parserOptions": {
+ "sourceType": "module"
+ },
  "env": {
  "browser": true,
  "mocha": true
  },
  "globals": {
  "chai": false,
- "sinon": false,
- "testHelpers": true
+ "sinon": false
  },
  "rules": {
  "no-unused-vars": ["off"],
  // Allow uncommented helper functions in tests.
  "require-jsdoc": ["off"],
- "prefer-rest-params": ["off"]
+ "prefer-rest-params": ["off"],
+ "no-invalid-this": ["off"]
  },
  "extends": "../../.eslintrc.json"
 }
diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js
@@ -7,10 +7,11 @@
 goog.module('Blockly.test.astNode');
 
 const {ASTNode} = goog.require('Blockly.ASTNode');
-const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('ASTNode', function() {
+ console.log('1/a');
  setup(function() {
  sharedTestSetup.call(this);
  Blockly.defineBlocksWithJsonArray([{
@@ -100,7 +101,9 @@ suite('ASTNode', function() {
  });
 
  suite('HelperFunctions', function() {
+ console.log('2');
  test('findNextForInput_', function() {
+ console.log('3');
  const input = this.blocks.statementInput1.inputList[0];
  const input2 = this.blocks.statementInput1.inputList[1];
  const connection = input.connection;
@@ -169,6 +172,7 @@ suite('ASTNode', function() {
  });
 
  suite('NavigationFunctions', function() {
+ console.log('b');
  setup(function() {
  Blockly.defineBlocksWithJsonArray([{
  "type": "top_connection",
@@ -319,7 +323,9 @@ suite('ASTNode', function() {
  workspaceTeardown.call(this, this.singleBlockWorkspace);
  });
 
+ console.log('c');
  test('fromPreviousToBlock', function() {
+ console.log('d');
  const prevConnection = this.blocks.statementInput1.previousConnection;
  const node = ASTNode.createConnectionNode(prevConnection);
  const nextNode = node.next();

diff --git a/tests/mocha/block_change_event_test.js b/tests/mocha/block_change_event_test.js
@@ -6,7 +6,8 @@
 
 goog.module('Blockly.test.blockChangeEvent');
 
-const {defineMutatorBlocks, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
+const {defineMutatorBlocks} = goog.require('Blockly.test.helpers.blockDefinitions');
 
 
 suite('Block Change Event', function() {

diff --git a/tests/mocha/block_create_event_test.js b/tests/mocha/block_create_event_test.js
@@ -6,8 +6,9 @@
 
 goog.module('Blockly.test.blockCreateEvent');
 
+const {assertEventFired} = goog.require('Blockly.test.helpers.events');
 const eventUtils = goog.require('Blockly.Events.utils');
-const {assertEventFired, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Block Create Event', function() {

diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
@@ -6,10 +6,12 @@
 
 goog.module('Blockly.test.blocks');
 
-const eventUtils = goog.require('Blockly.Events.utils');
 const {Blocks} = goog.require('Blockly.blocks');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
-const {createDeprecationWarningStub, createRenderedBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {createDeprecationWarningStub} = goog.require('Blockly.test.helpers.warnings');
+const {createRenderedBlock} = goog.require('Blockly.test.helpers.blockDefinitions');
+const eventUtils = goog.require('Blockly.Events.utils');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Blocks', function() {

diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js
@@ -6,8 +6,9 @@
 
 goog.module('Blockly.test.comments');
 
+const {assertEventFired} = goog.require('Blockly.test.helpers.events');
 const eventUtils = goog.require('Blockly.Events.utils');
-const {assertEventFired, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Comments', function() {

diff --git a/tests/mocha/connection_checker_test.js b/tests/mocha/connection_checker_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.connectionChecker');
 
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Connection checker', function() {

diff --git a/tests/mocha/connection_db_test.js b/tests/mocha/connection_db_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.connectionDb');
 
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Connection Database', function() {

diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
@@ -6,7 +6,8 @@
 
 goog.module('Blockly.test.connection');
 
-const {assertSingleDeprecationWarningCall, createDeprecationWarningStub, createGenUidStubWithReturns, defineRowBlock, defineStatementBlock, defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
+const {defineRowBlock, defineStatementBlock, defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions');
 
 
 suite('Connection', function() {

diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.contextMenuItem');
 
-const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Context Menu Items', function() {

diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.cursor');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 
 

diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.dropdown');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('DropDownDiv', function() {

diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
@@ -6,9 +6,11 @@
 
 goog.module('Blockly.test.event');
 
-const eventUtils = goog.require('Blockly.Events.utils');
-const {assertEventEquals, assertNthCallEventArgEquals, assertVariableValues, createFireChangeListenerSpy, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 const {ASTNode} = goog.require('Blockly.ASTNode');
+const {assertEventEquals, assertNthCallEventArgEquals, createFireChangeListenerSpy} = goog.require('Blockly.test.helpers.events');
+const {assertVariableValues} = goog.require('Blockly.test.helpers.variables');
+const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
+const eventUtils = goog.require('Blockly.Events.utils');
 goog.require('Blockly.WorkspaceComment');
 
 

diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.extensions');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Extensions', function() {

diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js
@@ -6,7 +6,9 @@
 
 goog.module('Blockly.test.fieldAngle');
 
-const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields');
+const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
 
 
 suite('Angle Fields', function() {
@@ -60,22 +62,22 @@ suite('Angle Fields', function() {
  * @param {FieldTemplate} field The field to check.
  */
  const assertFieldDefault = function(field) {
- testHelpers.assertFieldValue(field, defaultFieldValue);
+ assertFieldValue(field, defaultFieldValue);
  };
  /**
  * Asserts that the field properties are correct based on the test case.
  * @param {!Blockly.FieldAngle} field The field to check.
  * @param {!FieldValueTestCase} testCase The test case.
  */
  const validTestCaseAssertField = function(field, testCase) {
- testHelpers.assertFieldValue(field, testCase.expectedValue);
+ assertFieldValue(field, testCase.expectedValue);
  };
 
- testHelpers.runConstructorSuiteTests(
+ runConstructorSuiteTests(
  Blockly.FieldAngle, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
- testHelpers.runFromJsonSuiteTests(
+ runFromJsonSuiteTests(
  Blockly.FieldAngle, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
@@ -84,25 +86,25 @@ suite('Angle Fields', function() {
  setup(function() {
  this.field = new Blockly.FieldAngle();
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, defaultFieldValue);
  test('With source block', function() {
  this.field.setSourceBlock(createTestBlock());
  this.field.setValue(2.5);
- testHelpers.assertFieldValue(this.field, 2.5);
+ assertFieldValue(this.field, 2.5);
  });
  });
  suite('Value -> New Value', function() {
  const initialValue = 1;
  setup(function() {
  this.field = new Blockly.FieldAngle(initialValue);
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, initialValue);
  test('With source block', function() {
  this.field.setSourceBlock(createTestBlock());
  this.field.setValue(2.5);
- testHelpers.assertFieldValue(this.field, 2.5);
+ assertFieldValue(this.field, 2.5);
  });
  });
  });
@@ -142,12 +144,12 @@ suite('Angle Fields', function() {
  this.field.isBeingEdited_ = true;
  this.field.htmlInput_.value = String(suiteInfo.value);
  this.field.onHtmlInputChange_(null);
- testHelpers.assertFieldValue(
+ assertFieldValue(
  this.field, suiteInfo.expectedValue, String(suiteInfo.value));
  });
  test('When Not Editing', function() {
  this.field.setValue(suiteInfo.value);
- testHelpers.assertFieldValue(this.field, suiteInfo.expectedValue);
+ assertFieldValue(this.field, suiteInfo.expectedValue);
  });
  });
  });

diff --git a/tests/mocha/field_checkbox_test.js b/tests/mocha/field_checkbox_test.js
@@ -6,7 +6,9 @@
 
 goog.module('Blockly.test.fieldCheckbox');
 
-const {defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown');
+const {defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions');
 
 
 suite('Checkbox Fields', function() {
@@ -61,7 +63,7 @@ suite('Checkbox Fields', function() {
  * @param {!Blockly.FieldCheckbox} field The field to check.
  */
  const assertFieldDefault = function(field) {
- testHelpers.assertFieldValue(
+ assertFieldValue(
  field, defaultFieldValue, defaultFieldValue.toLowerCase());
  };
  /**
@@ -70,15 +72,15 @@ suite('Checkbox Fields', function() {
  * @param {!FieldValueTestCase} testCase The test case.
  */
  const validTestCaseAssertField = function(field, testCase) {
- testHelpers.assertFieldValue(
+ assertFieldValue(
  field, testCase.expectedValue, testCase.expectedValue.toLowerCase());
  };
 
- testHelpers.runConstructorSuiteTests(
+ runConstructorSuiteTests(
  Blockly.FieldCheckbox, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
- testHelpers.runFromJsonSuiteTests(
+ runFromJsonSuiteTests(
  Blockly.FieldCheckbox, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
@@ -87,14 +89,14 @@ suite('Checkbox Fields', function() {
  setup(function() {
  this.field = new Blockly.FieldCheckbox('TRUE');
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, 'TRUE', 'true');
  });
  suite('False -> New Value', function() {
  setup(function() {
  this.field = new Blockly.FieldCheckbox('FALSE');
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, 'FALSE', 'false');
  });
  });
@@ -131,7 +133,7 @@ suite('Checkbox Fields', function() {
  });
  test('New Value', function() {
  this.field.setValue(suiteInfo.value);
- testHelpers.assertFieldValue(
+ assertFieldValue(
  this.field, suiteInfo.expectedValue,
  String(suiteInfo.expectedValue).toLowerCase());
  });