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

Rename createVarBlock to createMockVarBlock, and pass in the workspace as a parameter

Browse Source
This commit is contained in:
Rachel Fenichel
2018-01-29 15:15:32 -08:00
parent 3b168f5370
commit 4c130aab83
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/jsunit/test_utilities.js
View File

@@ -93,11 +93,12 @@ function checkVariableValues(container, name, type, id) {
/**
* Create a test get_var_block.
* Will fail if get_var_block isn't defined.
* TODO (fenichel): Rename to createMockVarBlock.
* @param {!Blockly.Workspace} workspace The workspace on which to create the
* block.
* @param {!string} variable_id The id of the variable to reference.
* @return {!Blockly.Block} The created block.
*/
function createMockBlock(variable_id) {
function createMockVarBlock(workspace, variable_id) {
if (!Blockly.Blocks['get_var_block']) {
fail();
}
@@ -114,13 +115,13 @@ function createTwoVariablesAndBlocks(workspace) {
workspace.createVariable('name1', 'type1', 'id1');
workspace.createVariable('name2', 'type2', 'id2');
// Create blocks to refer to both of them.
createMockBlock('id1');
createMockBlock('id2');
createMockVarBlock(workspace, 'id1');
createMockVarBlock(workspace, 'id2');
}
function createVariableAndBlock(workspace) {
workspace.createVariable('name1', 'type1', 'id1');
createMockBlock('id1');
createMockVarBlock(workspace, 'id1');
}
function defineGetVarBlock() {

16
tests/jsunit/workspace_test.js
View File

@@ -141,9 +141,9 @@ function test_deleteVariable_InternalTrivial() {
workspaceTest_setUp();
var var_1 = workspace.createVariable('name1', 'type1', 'id1');
workspace.createVariable('name2', 'type2', 'id2');
createMockBlock('id1');
createMockBlock('id1');
createMockBlock('id2');
createMockVarBlock(workspace, 'id1');
createMockVarBlock(workspace, 'id1');
createMockVarBlock(workspace, 'id2');
var uses = workspace.getVariableUsesById(var_1.getId());
workspace.deleteVariableInternal_(var_1, uses);
@@ -169,7 +169,7 @@ function test_addTopBlock_TrivialFlyoutIsTrue() {
workspace.variableMap_ = targetWorkspace.getVariableMap();
try {
var block = createMockBlock('1');
var block = createMockVarBlock(workspace, '1');
workspace.removeTopBlock(block);
workspace.addTopBlock(block);
checkVariableValues(workspace, 'name1', '', '1');
@@ -266,8 +266,8 @@ function test_renameVariable_TwoVariablesSameType() {
workspace.createVariable(oldName, type, id1);
workspace.createVariable(newName, type, id2);
// Create blocks to refer to both of them.
createMockBlock(id1);
createMockBlock(id2);
createMockVarBlock(workspace, id1);
createMockVarBlock(workspace, id2);
workspace.renameVariableById(id1, newName);
checkVariableValues(workspace, newName, type, id2);
@@ -340,8 +340,8 @@ function test_renameVariable_TwoVariablesAndOldCase() {
workspace.createVariable(oldName, type, id1);
workspace.createVariable(oldCase, type, id2);
createMockBlock(id1);
createMockBlock(id2);
createMockVarBlock(workspace, id1);
createMockVarBlock(workspace, id2);
workspace.renameVariableById(id1, newName);

14
tests/jsunit/workspace_undo_redo_test.js
View File

@@ -225,7 +225,7 @@ function test_redoAndUndoDeleteVariableTwice_WithBlocks() {
undoRedoTest_setUp();
var id = 'id1';
workspace.createVariable('name1', 'type1', id);
createMockBlock(id);
createMockVarBlock(workspace, id);
workspace.deleteVariableById(id);
workspace.deleteVariableById(id);
@@ -268,7 +268,7 @@ function test_undoRedoRenameVariable_OneExists_NoBlocks() {
function test_undoRedoRenameVariable_OneExists_WithBlocks() {
undoRedoTest_setUp();
workspace.createVariable('name1', '', 'id1');
createMockBlock('id1');
createMockVarBlock(workspace, 'id1');
workspace.renameVariableById('id1', 'name2');
workspace.undo();
@@ -299,8 +299,8 @@ function test_undoRedoRenameVariable_BothExist_NoBlocks() {
function test_undoRedoRenameVariable_BothExist_WithBlocks() {
undoRedoTest_setUp();
createTwoVarsEmptyType();
createMockBlock('id1');
createMockBlock('id2');
createMockVarBlock(workspace, 'id1');
createMockVarBlock(workspace, 'id2');
workspace.renameVariableById('id1', 'name2');
workspace.undo();
@@ -333,8 +333,8 @@ function test_undoRedoRenameVariable_BothExistCaseChange_NoBlocks() {
function test_undoRedoRenameVariable_BothExistCaseChange_WithBlocks() {
undoRedoTest_setUp();
createTwoVarsEmptyType();
createMockBlock('id1');
createMockBlock('id2');
createMockVarBlock(workspace, 'id1');
createMockVarBlock(workspace, 'id2');
workspace.renameVariableById('id1', 'Name2');
workspace.undo();
@@ -367,7 +367,7 @@ function test_undoRedoRenameVariable_OnlyCaseChange_NoBlocks() {
function test_undoRedoRenameVariable_OnlyCaseChange_WithBlocks() {
undoRedoTest_setUp();
workspace.createVariable('name1', '', 'id1');
createMockBlock('id1');
createMockVarBlock(workspace, 'id1');
workspace.renameVariableById('id1', 'Name1');
workspace.undo();