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

Added tests and remove jsunit fields test file.

Browse Source
This commit is contained in:
Beka Westberg
2019-08-08 15:48:28 -07:00
parent cdc90f4059
commit 16c59d2ffc
5 changed files with 130 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/utils/field.js
View File

@@ -53,7 +53,8 @@ Blockly.utils.fields.typeMap_ = {};
*/
Blockly.utils.fields.register = function(type, fieldClass) {
if ((typeof type != 'string') || (type.trim() == '')) {
throw Error('Invalid field type "' + type + '"');
throw Error('Invalid field type "' + type + '". The type must be a' +
' non-empty string.');
}
if (!fieldClass || (typeof fieldClass.fromJson != 'function')) {
throw Error('Field "' + fieldClass + '" must have a fromJson function');

126
tests/jsunit/field_test.js
View File

@@ -1,126 +0,0 @@
/**
* @license
* Visual Blocks Editor
*
* Copyright 2017 Google Inc.
* https://developers.google.com/blockly/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @fileoverview Tests for Blockly.Field
* @author fenichel@google.com (Rachel Fenichel)
*/
'use strict';
function test_field_isEditable_simple() {
var field = new Blockly.Field("Dummy text");
// EDITABLE is true by default, but without a source block a field can't be
// edited.
assertFalse('Field without a block is not editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_false() {
// Setting EDITABLE to false doesn't matter.
var field = new Blockly.Field("Dummy text");
field.EDITABLE = false;
assertFalse('Field without a block is not editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_editableBlock() {
var editableBlock = {
isEditable: function() {
return true;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = editableBlock;
assertTrue('Editable field with editable block is editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_editableBlock_false() {
var editableBlock = {
isEditable: function() {
return true;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = editableBlock;
field.EDITABLE = false;
assertFalse('Non-editable field with editable block is not editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_nonEditableBlock() {
var nonEditableBlock = {
isEditable: function() {
return false;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = nonEditableBlock;
assertFalse('Editable field with non-editable block is not editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_nonEditableBlock_false() {
var nonEditableBlock = {
isEditable: function() {
return false;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = nonEditableBlock;
field.EDITABLE = false;
assertFalse('Non-editable field with non-editable block is not editable',
field.isCurrentlyEditable());
}
function test_field_register_with_custom_field() {
var CustomFieldType = function(value) {
CustomFieldType.superClass_.constructor.call(this, value);
};
goog.inherits(CustomFieldType, Blockly.Field);
CustomFieldType.fromJson = function(options) {
return new CustomFieldType(options['value']);
};
var json = {
type: 'field_custom_test',
value: 'ok'
};
// before registering
var field = Blockly.Field.fromJson(json);
assertNull(field);
Blockly.Field.register('field_custom_test', CustomFieldType);
// after registering
field = Blockly.Field.fromJson(json);
assertNotNull(field);
assertEquals(field.getValue(), 'ok');
}

1
tests/jsunit/index.html
View File

@@ -18,7 +18,6 @@
<script src="connection_test.js"></script>
<script src="event_test.js"></script>
<script src="extensions_test.js"></script>
<script src="field_test.js"></script>
<script src="generator_test.js"></script>
<script src="gesture_test.js"></script>
<script src="input_test.js"></script>

1
tests/mocha/index.html
View File

@@ -48,6 +48,7 @@
<script src="procedures_test.js"></script>
<script src="trashcan_test.js"></script>
<script src="utils_test.js"></script>
<script src="utils_field_test.js"></script>
<script src="xml_test.js"></script>
<div id="blocklyDiv"></div>

127
tests/mocha/utils_field_test.js Normal file
View File

@@ -0,0 +1,127 @@
/**
* @license
* Visual Blocks Editor
*
* Copyright 2019 Google Inc.
* https://developers.google.com/blockly/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @fileoverview Tests for Blockly.utils.fields
* @author bekawestberg@gmail.com (Beka WEstberg)
*/
'use strict';
suite('Field Utils', function() {
function CustomFieldType(value) {
CustomFieldType.superClass_.constructor.call(this, value);
}
goog.inherits(CustomFieldType, Blockly.Field);
CustomFieldType.fromJson = function(options) {
return new CustomFieldType(options['value']);
};
teardown(function() {
if (Blockly.utils.fields.typeMap_['field_custom_test']) {
delete Blockly.utils.fields.typeMap_['field_custom_test'];
}
});
suite('Registration', function() {
test('Simple', function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
});
test('Empty String Key', function() {
chai.assert.throws(function() {
Blockly.utils.fields.register('', CustomFieldType);
}.bind(this), 'Invalid field type');
});
test('Class as Key', function() {
chai.assert.throws(function() {
Blockly.utils.fields.register(CustomFieldType, '');
}.bind(this), 'Invalid field type');
});
test('fromJson as Key', function() {
chai.assert.throws(function() {
Blockly.utils.fields.register(CustomFieldType.fromJson, '');
}.bind(this), 'Invalid field type');
});
// TODO (#2788): What do you want it to do if you overwrite a key?
test('Overwrite a Key', function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
});
test('Null Value', function() {
chai.assert.throws(function() {
Blockly.utils.fields.register('field_custom_test', null);
}.bind(this), 'fromJson function');
});
test('No fromJson', function() {
var fromJson = CustomFieldType.fromJson;
delete CustomFieldType.fromJson;
chai.assert.throws(function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
}.bind(this), 'fromJson function');
CustomFieldType.fromJson = fromJson;
});
test('fromJson not a function', function() {
var fromJson = CustomFieldType.fromJson;
CustomFieldType.fromJson = true;
chai.assert.throws(function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
}.bind(this), 'fromJson function');
CustomFieldType.fromJson = fromJson;
});
});
suite('Retrieval', function() {
test('Simple', function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
var json = {
type: 'field_custom_test',
value: 'ok'
};
var field = Blockly.utils.fields.fromJson(json);
chai.assert.isNotNull(field);
chai.assert.equal('ok', field.getValue());
});
test('Not Registered', function() {
var json = {
type: 'field_custom_test',
value: 'ok'
};
var spy = sinon.stub(console, 'warn');
var field = Blockly.utils.fields.fromJson(json);
chai.assert.isNull(field);
chai.assert.isTrue(spy.called);
spy.restore();
});
// TODO: Is this supposed to be case sensitive?
test.skip('Case Different', function() {
Blockly.utils.fields.register('field_custom_test', CustomFieldType);
var json = {
type: 'FIELD_CUSTOM_TEST',
value: 'ok'
};
var field = Blockly.utils.fields.fromJson(json);
chai.assert.isNotNull(field);
chai.assert.equal('ok', field.getValue());
});
});
});