CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2025-12-15 13:50:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9393 from tashee/tashee-8945-take2

Browse Source 
fix: Replace deprecated variable methods in tests (#8945)
This commit is contained in:
RoboErikG
2025-10-01 10:03:22 -07:00
committed by GitHub
parent 2c9732d466 38b96dd6af
commit 4353f90b3e
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/mocha/event_test.js
View File

@@ -904,19 +904,20 @@ suite('Events', function () {
suite('Variable events', function () { suite('Variable events', function () {
setup(function () { setup(function () {
this.variable = this.workspace.createVariable('name1', 'type1', 'id1'); this.variableMap = this.workspace.getVariableMap();
this.variable = this.variableMap.createVariable('name1', 'type1', 'id1');
}); });
/** /**
* Check if a variable with the given values exists. * Check if a variable with the given values exists.
* @param {Blockly.Workspace|Blockly.VariableMap} container The workspace or * @param {Blockly.VariableMap} variableMap The variableMap
* variableMap the checked variable belongs to. * the checked variable belongs to.
* @param {!string} name The expected name of the variable. * @param {!string} name The expected name of the variable.
* @param {!string} type The expected type of the variable. * @param {!string} type The expected type of the variable.
* @param {!string} id The expected id of the variable. * @param {!string} id The expected id of the variable.
*/ */
function checkVariableValues(container, name, type, id) { function checkVariableValues(variableMap, name, type, id) {
const variable = container.getVariableById(id); const variable = variableMap.getVariableById(id);
assert.isDefined(variable); assert.isDefined(variable);
assert.equal(name, variable.name); assert.equal(name, variable.name);
assert.equal(type, variable.type); assert.equal(type, variable.type);
@@ -994,7 +995,7 @@ suite('Events', function () {
varName: 'name2', varName: 'name2',
}; };
const event = eventUtils.fromJson(json, this.workspace); const event = eventUtils.fromJson(json, this.workspace);
const x = this.workspace.getVariableById('id2'); const x = this.variableMap.getVariableById('id2');
assert.isNull(x); assert.isNull(x);
event.run(true); event.run(true);
assertVariableValues(this.workspace, 'name2', 'type2', 'id2'); assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
@@ -1002,22 +1003,22 @@ suite('Events', function () {
test('Var delete', function () { test('Var delete', function () {
const event = new Blockly.Events.VarDelete(this.variable); const event = new Blockly.Events.VarDelete(this.variable);
assert.isNotNull(this.workspace.getVariableById('id1')); assert.isNotNull(this.variableMap.getVariableById('id1'));
event.run(true); event.run(true);
assert.isNull(this.workspace.getVariableById('id1')); assert.isNull(this.variableMap.getVariableById('id1'));
}); });
test('Var rename', function () { test('Var rename', function () {
const event = new Blockly.Events.VarRename(this.variable, 'name2'); const event = new Blockly.Events.VarRename(this.variable, 'name2');
event.run(true); event.run(true);
assert.isNull(this.workspace.getVariable('name1')); assert.isNull(this.variableMap.getVariable('name1'));
checkVariableValues(this.workspace, 'name2', 'type1', 'id1'); checkVariableValues(this.variableMap, 'name2', 'type1', 'id1');
}); });
}); });
suite('Run Backward', function () { suite('Run Backward', function () {
test('Var create', function () { test('Var create', function () {
const event = new Blockly.Events.VarCreate(this.variable); const event = new Blockly.Events.VarCreate(this.variable);
assert.isNotNull(this.workspace.getVariableById('id1')); assert.isNotNull(this.variableMap.getVariableById('id1'));
event.run(false); event.run(false);
}); });
@@ -1029,16 +1030,16 @@ suite('Events', function () {
varName: 'name2', varName: 'name2',
}; };
const event = eventUtils.fromJson(json, this.workspace); const event = eventUtils.fromJson(json, this.workspace);
assert.isNull(this.workspace.getVariableById('id2')); assert.isNull(this.variableMap.getVariableById('id2'));
event.run(false); event.run(false);
assertVariableValues(this.workspace, 'name2', 'type2', 'id2'); assertVariableValues(this.variableMap, 'name2', 'type2', 'id2');
}); });
test('Var rename', function () { test('Var rename', function () {
const event = new Blockly.Events.VarRename(this.variable, 'name2'); const event = new Blockly.Events.VarRename(this.variable, 'name2');
event.run(false); event.run(false);
assert.isNull(this.workspace.getVariable('name2')); assert.isNull(this.variableMap.getVariable('name2'));
checkVariableValues(this.workspace, 'name1', 'type1', 'id1'); checkVariableValues(this.variableMap, 'name1', 'type1', 'id1');
}); });
}); });
}); });
@@ -1431,7 +1432,9 @@ suite('Events', function () {
); );
// Expect the workspace to not have a variable with ID 'test_block_id'. // Expect the workspace to not have a variable with ID 'test_block_id'.
assert.isNull(this.workspace.getVariableById(TEST_BLOCK_ID)); assert.isNull(
this.workspace.getVariableMap().getVariableById(TEST_BLOCK_ID),
);
} finally { } finally {
workspaceTeardown.call(this, workspaceSvg); workspaceTeardown.call(this, workspaceSvg);
} }
@@ -1481,7 +1484,9 @@ suite('Events', function () {
); );
// Expect the workspace to have a variable with ID 'test_var_id'. // Expect the workspace to have a variable with ID 'test_var_id'.
assert.isNotNull(this.workspace.getVariableById(TEST_VAR_ID)); assert.isNotNull(
this.workspace.getVariableMap().getVariableById(TEST_VAR_ID),
);
}); });
test('New block new var xml', function () { test('New block new var xml', function () {