Manual commit

This commit is contained in:
ellen.spertus
2013-12-20 16:25:26 -08:00
parent 7e1b5612ae
commit ea211c5080
466 changed files with 6463 additions and 3458 deletions

View File

@@ -88,7 +88,7 @@ Blockly.Python['unittest_main'].defineAssert_ = function() {
Blockly.Python['unittest_assertequals'] = function(block) {
// Asserts that a value equals another value.
var message = Blockly.Python.quote_(block.getTitleValue('MESSAGE'));
var message = Blockly.Python.quote_(block.getFieldValue('MESSAGE'));
var actual = Blockly.Python.valueToCode(block, 'ACTUAL',
Blockly.Python.ORDER_NONE) || 'None';
var expected = Blockly.Python.valueToCode(block, 'EXPECTED',
@@ -99,10 +99,10 @@ Blockly.Python['unittest_assertequals'] = function(block) {
Blockly.Python['unittest_assertvalue'] = function(block) {
// Asserts that a value is true, false, or null.
var message = Blockly.Python.quote_(block.getTitleValue('MESSAGE'));
var message = Blockly.Python.quote_(block.getFieldValue('MESSAGE'));
var actual = Blockly.Python.valueToCode(block, 'ACTUAL',
Blockly.Python.ORDER_NONE) || 'None';
var expected = block.getTitleValue('EXPECTED');
var expected = block.getFieldValue('EXPECTED');
if (expected == 'TRUE') {
expected = 'True';
} else if (expected == 'FALSE') {
@@ -118,7 +118,7 @@ Blockly.Python['unittest_fail'] = function(block) {
// Always assert an error.
var resultsVar = Blockly.Python.variableDB_.getName('unittestResults',
Blockly.Variables.NAME_TYPE);
var message = Blockly.Python.quote_(block.getTitleValue('MESSAGE'));
var message = Blockly.Python.quote_(block.getFieldValue('MESSAGE'));
var functionName = Blockly.Python.provideFunction_(
'fail',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(message):',