fix: move test helpers from samples into core

tests/mocha/.eslintrc.json

@@ -5,8 +5,7 @@
  },
  "globals": {
  "chai": false,
- "sinon": false,
- "testHelpers": true
+ "sinon": false
  },
  "rules": {
  "no-unused-vars": ["off"],

tests/mocha/astnode_test.js

@@ -7,7 +7,7 @@
 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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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');
 
 

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() {

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');
 
 

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() {

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);
  });
  });
  });

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());
  });

tests/mocha/field_colour_test.js

@@ -6,7 +6,9 @@
 
 goog.module('Blockly.test.fieldColour');
 
-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('Colour Fields', function() {
@@ -87,23 +89,23 @@ suite('Colour Fields', function() {
  * @param {FieldTemplate} field The field to check.
  */
  const assertFieldDefault = function(field) {
- testHelpers.assertFieldValue(field, defaultFieldValue, defaultTextValue);
+ assertFieldValue(field, defaultFieldValue, defaultTextValue);
  };
  /**
  * 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(
+ assertFieldValue(
  field, testCase.expectedValue, testCase.expectedText);
  };
 
- testHelpers.runConstructorSuiteTests(
+ runConstructorSuiteTests(
  Blockly.FieldColour, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
- testHelpers.runFromJsonSuiteTests(
+ runFromJsonSuiteTests(
  Blockly.FieldColour, validValueTestCases, invalidValueTestCases,
  validTestCaseAssertField, assertFieldDefault);
 
@@ -112,25 +114,25 @@ suite('Colour Fields', function() {
  setup(function() {
  this.field = new Blockly.FieldColour();
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, defaultFieldValue,
  defaultTextValue);
  test('With source block', function() {
  this.field.setSourceBlock(createTestBlock());
  this.field.setValue('#bcbcbc');
- testHelpers.assertFieldValue(this.field, '#bcbcbc', '#bcbcbc');
+ assertFieldValue(this.field, '#bcbcbc', '#bcbcbc');
  });
  });
  suite('Value -> New Value', function() {
  setup(function() {
  this.field = new Blockly.FieldColour('#aaaaaa');
  });
- testHelpers.runSetValueTests(
+ runSetValueTests(
  validValueTestCases, invalidValueTestCases, '#aaaaaa', '#aaa');
  test('With source block', function() {
  this.field.setSourceBlock(createTestBlock());
  this.field.setValue('#bcbcbc');
- testHelpers.assertFieldValue(this.field, '#bcbcbc', '#bcbcbc');
+ assertFieldValue(this.field, '#bcbcbc', '#bcbcbc');
  });
  });
  });
@@ -161,7 +163,7 @@ suite('Colour Fields', function() {
  });
  test('New Value', function() {
  this.field.setValue(suiteInfo.value);
- testHelpers.assertFieldValue(
+ assertFieldValue(
  this.field, suiteInfo.expectedValue, suiteInfo.expectedText);
  });
  });