Skip to content

Commit 9c24848

Browse files
rachel-fenichelrachel-fenichel
authored
chore(tests): update generator test blocks to use forBlock (#7311)
1 parent c3aa970 commit 9c24848

5 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎tests/generators/unittest_dart.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
dartGenerator['unittest_main'] = function(block) {
12+
dartGenerator.forBlock['unittest_main'] = function(block) {
1313
// Container for unit tests.
1414
var resultsVar = dartGenerator.nameDB_.getName('unittestResults',
1515
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -59,7 +59,7 @@ dartGenerator['unittest_main'] = function(block) {
5959
return code;
6060
};
6161

62-
dartGenerator['unittest_main'].defineAssert_ = function() {
62+
function dartDefineAssert() {
6363
var resultsVar = dartGenerator.nameDB_.getName('unittestResults',
6464
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
6565
var functionName = dartGenerator.provideFunction_(
@@ -96,19 +96,19 @@ dartGenerator['unittest_main'].defineAssert_ = function() {
9696
return functionName;
9797
};
9898

99-
dartGenerator['unittest_assertequals'] = function(block) {
99+
dartGenerator.forBlock['unittest_assertequals'] = function(block) {
100100
// Asserts that a value equals another value.
101101
var message = dartGenerator.valueToCode(block, 'MESSAGE',
102102
dartGenerator.ORDER_NONE) || '';
103103
var actual = dartGenerator.valueToCode(block, 'ACTUAL',
104104
dartGenerator.ORDER_NONE) || 'null';
105105
var expected = dartGenerator.valueToCode(block, 'EXPECTED',
106106
dartGenerator.ORDER_NONE) || 'null';
107-
return dartGenerator['unittest_main'].defineAssert_() +
107+
return dartDefineAssert() +
108108
'(' + actual + ', ' + expected + ', ' + message + ');\n';
109109
};
110110

111-
dartGenerator['unittest_assertvalue'] = function(block) {
111+
dartGenerator.forBlock['unittest_assertvalue'] = function(block) {
112112
// Asserts that a value is true, false, or null.
113113
var message = dartGenerator.valueToCode(block, 'MESSAGE',
114114
dartGenerator.ORDER_NONE) || '';
@@ -122,11 +122,11 @@ dartGenerator['unittest_assertvalue'] = function(block) {
122122
} else if (expected === 'NULL') {
123123
expected = 'null';
124124
}
125-
return dartGenerator['unittest_main'].defineAssert_() +
125+
return dartDefineAssert() +
126126
'(' + actual + ', ' + expected + ', ' + message + ');\n';
127127
};
128128

129-
dartGenerator['unittest_fail'] = function(block) {
129+
dartGenerator.forBlock['unittest_fail'] = function(block) {
130130
// Always assert an error.
131131
var resultsVar = dartGenerator.nameDB_.getName('unittestResults',
132132
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -144,7 +144,7 @@ dartGenerator['unittest_fail'] = function(block) {
144144
return functionName + '(' + message + ');\n';
145145
};
146146

147-
dartGenerator['unittest_adjustindex'] = function(block) {
147+
dartGenerator.forBlock['unittest_adjustindex'] = function(block) {
148148
var index = dartGenerator.valueToCode(block, 'INDEX',
149149
dartGenerator.ORDER_ADDITIVE) || '0';
150150
// Adjust index if using one-based indexing.

‎tests/generators/unittest_javascript.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
javascriptGenerator['unittest_main'] = function(block) {
12+
javascriptGenerator.forBlock['unittest_main'] = function(block) {
1313
// Container for unit tests.
1414
var resultsVar = javascriptGenerator.nameDB_.getName('unittestResults',
1515
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -60,7 +60,7 @@ javascriptGenerator['unittest_main'] = function(block) {
6060
return code;
6161
};
6262

63-
javascriptGenerator['unittest_main'].defineAssert_ = function(block) {
63+
function javascriptDefineAssert() {
6464
var resultsVar = javascriptGenerator.nameDB_.getName('unittestResults',
6565
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
6666
var functionName = javascriptGenerator.provideFunction_(
@@ -100,19 +100,19 @@ javascriptGenerator['unittest_main'].defineAssert_ = function(block) {
100100
return functionName;
101101
};
102102

103-
javascriptGenerator['unittest_assertequals'] = function(block) {
103+
javascriptGenerator.forBlock['unittest_assertequals'] = function(block) {
104104
// Asserts that a value equals another value.
105105
var message = javascriptGenerator.valueToCode(block, 'MESSAGE',
106106
javascriptGenerator.ORDER_NONE) || '';
107107
var actual = javascriptGenerator.valueToCode(block, 'ACTUAL',
108108
javascriptGenerator.ORDER_NONE) || 'null';
109109
var expected = javascriptGenerator.valueToCode(block, 'EXPECTED',
110110
javascriptGenerator.ORDER_NONE) || 'null';
111-
return javascriptGenerator['unittest_main'].defineAssert_() +
111+
return javascriptDefineAssert() +
112112
'(' + actual + ', ' + expected + ', ' + message + ');\n';
113113
};
114114

115-
javascriptGenerator['unittest_assertvalue'] = function(block) {
115+
javascriptGenerator.forBlock['unittest_assertvalue'] = function(block) {
116116
// Asserts that a value is true, false, or null.
117117
var message = javascriptGenerator.valueToCode(block, 'MESSAGE',
118118
javascriptGenerator.ORDER_NONE) || '';
@@ -126,11 +126,11 @@ javascriptGenerator['unittest_assertvalue'] = function(block) {
126126
} else if (expected === 'NULL') {
127127
expected = 'null';
128128
}
129-
return javascriptGenerator['unittest_main'].defineAssert_() +
129+
return javascriptDefineAssert() +
130130
'(' + actual + ', ' + expected + ', ' + message + ');\n';
131131
};
132132

133-
javascriptGenerator['unittest_fail'] = function(block) {
133+
javascriptGenerator.forBlock['unittest_fail'] = function(block) {
134134
// Always assert an error.
135135
var resultsVar = javascriptGenerator.nameDB_.getName('unittestResults',
136136
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -148,7 +148,7 @@ javascriptGenerator['unittest_fail'] = function(block) {
148148
return functionName + '(' + message + ');\n';
149149
};
150150

151-
javascriptGenerator['unittest_adjustindex'] = function(block) {
151+
javascriptGenerator.forBlock['unittest_adjustindex'] = function(block) {
152152
var index = javascriptGenerator.valueToCode(block, 'INDEX',
153153
javascriptGenerator.ORDER_ADDITION) || '0';
154154
// Adjust index if using one-based indexing.

‎tests/generators/unittest_lua.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
luaGenerator['unittest_main'] = function(block) {
12+
luaGenerator.forBlock['unittest_main'] = function(block) {
1313
// Container for unit tests.
1414
var resultsVar = luaGenerator.nameDB_.getName('unittestResults',
1515
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -58,7 +58,7 @@ luaGenerator['unittest_main'] = function(block) {
5858
return code;
5959
};
6060

61-
luaGenerator['unittest_main'].defineAssert_ = function(block) {
61+
function luaDefineAssert() {
6262
var resultsVar = luaGenerator.nameDB_.getName('unittestResults',
6363
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
6464
var functionName = luaGenerator.provideFunction_(
@@ -106,19 +106,19 @@ luaGenerator['unittest_main'].defineAssert_ = function(block) {
106106
return functionName;
107107
};
108108

109-
luaGenerator['unittest_assertequals'] = function(block) {
109+
luaGenerator.forBlock['unittest_assertequals'] = function(block) {
110110
// Asserts that a value equals another value.
111111
var message = luaGenerator.valueToCode(block, 'MESSAGE',
112112
luaGenerator.ORDER_NONE) || '';
113113
var actual = luaGenerator.valueToCode(block, 'ACTUAL',
114114
luaGenerator.ORDER_NONE) || 'nil';
115115
var expected = luaGenerator.valueToCode(block, 'EXPECTED',
116116
luaGenerator.ORDER_NONE) || 'nil';
117-
return luaGenerator['unittest_main'].defineAssert_() +
117+
return luaDefineAssert() +
118118
'(' + actual + ', ' + expected + ', ' + message + ')\n';
119119
};
120120

121-
luaGenerator['unittest_assertvalue'] = function(block) {
121+
luaGenerator.forBlock['unittest_assertvalue'] = function(block) {
122122
// Asserts that a value is true, false, or null.
123123
var message = luaGenerator.valueToCode(block, 'MESSAGE',
124124
luaGenerator.ORDER_NONE) || '';
@@ -132,11 +132,11 @@ luaGenerator['unittest_assertvalue'] = function(block) {
132132
} else if (expected == 'NULL') {
133133
expected = 'nil';
134134
}
135-
return luaGenerator.unittest_main.defineAssert_() +
135+
return luaDefineAssert() +
136136
'(' + actual + ', ' + expected + ', ' + message + ')\n';
137137
};
138138

139-
luaGenerator['unittest_fail'] = function(block) {
139+
luaGenerator.forBlock['unittest_fail'] = function(block) {
140140
// Always assert an error.
141141
var resultsVar = luaGenerator.nameDB_.getName('unittestResults',
142142
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -153,7 +153,7 @@ luaGenerator['unittest_fail'] = function(block) {
153153
return functionName + '(' + message + ')\n';
154154
};
155155

156-
luaGenerator['unittest_adjustindex'] = function(block) {
156+
luaGenerator.forBlock['unittest_adjustindex'] = function(block) {
157157
var index = luaGenerator.valueToCode(block, 'INDEX',
158158
luaGenerator.ORDER_ADDITIVE) || '0';
159159
if (Blockly.utils.string.isNumber(index)) {

‎tests/generators/unittest_php.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
phpGenerator['unittest_main'] = function(block) {
12+
phpGenerator.forBlock['unittest_main'] = function(block) {
1313
// Container for unit tests.
1414
var resultsVar = phpGenerator.nameDB_.getName('unittestResults',
1515
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -60,7 +60,7 @@ phpGenerator['unittest_main'] = function(block) {
6060
return code;
6161
};
6262

63-
phpGenerator['unittest_main'].defineAssert_ = function(block) {
63+
function phpDefineAssert() {
6464
var resultsVar = phpGenerator.nameDB_.getName('unittestResults',
6565
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
6666
var functionName = phpGenerator.provideFunction_(
@@ -86,19 +86,19 @@ phpGenerator['unittest_main'].defineAssert_ = function(block) {
8686
return functionName;
8787
};
8888

89-
phpGenerator['unittest_assertequals'] = function(block) {
89+
phpGenerator.forBlock['unittest_assertequals'] = function(block) {
9090
// Asserts that a value equals another value.
9191
var message = phpGenerator.valueToCode(block, 'MESSAGE',
9292
phpGenerator.ORDER_NONE) || '';
9393
var actual = phpGenerator.valueToCode(block, 'ACTUAL',
9494
phpGenerator.ORDER_NONE) || 'null';
9595
var expected = phpGenerator.valueToCode(block, 'EXPECTED',
9696
phpGenerator.ORDER_NONE) || 'null';
97-
return phpGenerator['unittest_main'].defineAssert_() +
97+
return phpDefineAssert() +
9898
'(' + actual + ', ' + expected + ', ' + message + ');\n';
9999
};
100100

101-
phpGenerator['unittest_assertvalue'] = function(block) {
101+
phpGenerator.forBlock['unittest_assertvalue'] = function(block) {
102102
// Asserts that a value is true, false, or null.
103103
var message = phpGenerator.valueToCode(block, 'MESSAGE',
104104
phpGenerator.ORDER_NONE) || '';
@@ -112,11 +112,11 @@ phpGenerator['unittest_assertvalue'] = function(block) {
112112
} else if (expected == 'NULL') {
113113
expected = 'null';
114114
}
115-
return phpGenerator['unittest_main'].defineAssert_() +
115+
return phpDefineAssert() +
116116
'(' + actual + ', ' + expected + ', ' + message + ');\n';
117117
};
118118

119-
phpGenerator['unittest_fail'] = function(block) {
119+
phpGenerator.forBlock['unittest_fail'] = function(block) {
120120
// Always assert an error.
121121
var resultsVar = phpGenerator.nameDB_.getName('unittestResults',
122122
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -135,7 +135,7 @@ phpGenerator['unittest_fail'] = function(block) {
135135
return functionName + '(' + message + ');\n';
136136
};
137137

138-
phpGenerator['unittest_adjustindex'] = function(block) {
138+
phpGenerator.forBlock['unittest_adjustindex'] = function(block) {
139139
var index = phpGenerator.valueToCode(block, 'INDEX',
140140
phpGenerator.ORDER_ADDITION) || '0';
141141
// Adjust index if using one-based indexing.

‎tests/generators/unittest_python.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
pythonGenerator['unittest_main'] = function(block) {
12+
pythonGenerator.forBlock['unittest_main'] = function(block) {
1313
// Container for unit tests.
1414
var resultsVar = pythonGenerator.nameDB_.getName('unittestResults',
1515
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -56,7 +56,7 @@ pythonGenerator['unittest_main'] = function(block) {
5656
return code;
5757
};
5858

59-
pythonGenerator['unittest_main'].defineAssert_ = function() {
59+
function pythonDefineAssert() {
6060
var resultsVar = pythonGenerator.nameDB_.getName('unittestResults',
6161
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
6262
var functionName = pythonGenerator.provideFunction_(
@@ -74,19 +74,19 @@ pythonGenerator['unittest_main'].defineAssert_ = function() {
7474
return functionName;
7575
};
7676

77-
pythonGenerator['unittest_assertequals'] = function(block) {
77+
pythonGenerator.forBlock['unittest_assertequals'] = function(block) {
7878
// Asserts that a value equals another value.
7979
var message = pythonGenerator.valueToCode(block, 'MESSAGE',
8080
pythonGenerator.ORDER_NONE) || '';
8181
var actual = pythonGenerator.valueToCode(block, 'ACTUAL',
8282
pythonGenerator.ORDER_NONE) || 'None';
8383
var expected = pythonGenerator.valueToCode(block, 'EXPECTED',
8484
pythonGenerator.ORDER_NONE) || 'None';
85-
return pythonGenerator['unittest_main'].defineAssert_() +
85+
return pythonDefineAssert() +
8686
'(' + actual + ', ' + expected + ', ' + message + ')\n';
8787
};
8888

89-
pythonGenerator['unittest_assertvalue'] = function(block) {
89+
pythonGenerator.forBlock['unittest_assertvalue'] = function(block) {
9090
// Asserts that a value is true, false, or null.
9191
var message = pythonGenerator.valueToCode(block, 'MESSAGE',
9292
pythonGenerator.ORDER_NONE) || '';
@@ -100,11 +100,11 @@ pythonGenerator['unittest_assertvalue'] = function(block) {
100100
} else if (expected == 'NULL') {
101101
expected = 'None';
102102
}
103-
return pythonGenerator['unittest_main'].defineAssert_() +
103+
return pythonDefineAssert() +
104104
'(' + actual + ', ' + expected + ', ' + message + ')\n';
105105
};
106106

107-
pythonGenerator['unittest_fail'] = function(block) {
107+
pythonGenerator.forBlock['unittest_fail'] = function(block) {
108108
// Always assert an error.
109109
var resultsVar = pythonGenerator.nameDB_.getName('unittestResults',
110110
Blockly.Names.DEVELOPER_VARIABLE_TYPE);
@@ -119,7 +119,7 @@ pythonGenerator['unittest_fail'] = function(block) {
119119
return functionName + '(' + message + ')\n';
120120
};
121121

122-
pythonGenerator['unittest_adjustindex'] = function(block) {
122+
pythonGenerator.forBlock['unittest_adjustindex'] = function(block) {
123123
var index = pythonGenerator.valueToCode(block, 'INDEX',
124124
pythonGenerator.ORDER_ADDITIVE) || '0';
125125
// Adjust index if using one-based indexing.

0 commit comments

Comments
 (0)