Skip to content

Make toolbox_tests use extended python generator. #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan412 merged 1 commit into from
Mar 17, 2025
Merged

Make toolbox_tests use extended python generator. #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const App: React.FC = () => {

openStorage();
initializeBlocks();
//testAllBlocksInToolbox(toolbox.getToolboxJSON([], []).contents);
//testAllBlocksInToolbox();
}, []);

const openStorage = async () => {
Expand Down
12 changes: 6 additions & 6 deletions src/toolbox/toolbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {category as methodsCategory} from './methods_category';

export function getToolboxJSON(
opt_includeExportedBlocksFromProject: toolboxItems.ContentsType[],
shownPythonToolboxCategories: Set<string>) {
shownPythonToolboxCategories: Set<string> | null) {
const contents: toolboxItems.ContentsType[] = generatedToolbox.getToolboxCategories();
filterGeneratedCategories(contents, shownPythonToolboxCategories);

Expand Down Expand Up @@ -81,7 +81,7 @@ export function getToolboxJSON(
}

function filterGeneratedCategories(
contents: toolboxItems.ContentsType[], shownPythonToolboxCategories: Set<string>) {
contents: toolboxItems.ContentsType[], shownPythonToolboxCategories: Set<string> | null) {
contents.forEach((item) => {
if (item.kind === 'category') {
const category = item as toolboxItems.Category;
Expand All @@ -91,15 +91,15 @@ function filterGeneratedCategories(
}
if ((category as toolboxItems.PythonModuleCategory).moduleName) {
const moduleName = (item as toolboxItems.PythonModuleCategory).moduleName;
if (!shownPythonToolboxCategories.has(moduleName)) {
if (shownPythonToolboxCategories != null && !shownPythonToolboxCategories.has(moduleName)) {
if (category.contents) {
removeBlocksAndSeparators(category.contents);
}
}
}
if ((category as toolboxItems.PythonClassCategory).className) {
const className = (item as toolboxItems.PythonClassCategory).className;
if (!shownPythonToolboxCategories.has(className)) {
if (shownPythonToolboxCategories != null && !shownPythonToolboxCategories.has(className)) {
if (category.contents) {
removeBlocksAndSeparators(category.contents);
}
Expand All @@ -123,7 +123,7 @@ function removeBlocksAndSeparators(contents: toolboxItems.ContentsType[]) {
}

function removeEmptyCategories(
contents: toolboxItems.ContentsType[], shownPythonToolboxCategories: Set<string>) {
contents: toolboxItems.ContentsType[], shownPythonToolboxCategories: Set<string> | null) {
let i = 0;
while (i < contents.length) {
let remove = false;
Expand All @@ -137,7 +137,7 @@ function removeEmptyCategories(
}
if (category.contents &&
category.contents.length == 0 &&
!shownPythonToolboxCategories.has(fullCategoryName)) {
shownPythonToolboxCategories != null && !shownPythonToolboxCategories.has(fullCategoryName)) {
remove = true;
}
}
Expand Down
14 changes: 8 additions & 6 deletions src/toolbox/toolbox_tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
*/

import * as Blockly from 'blockly/core';
import { pythonGenerator } from 'blockly/python';
import { extendedPythonGenerator } from '../editor/extended_python_generator';
import * as toolboxItems from './items';
import { getToolboxJSON } from '../toolbox/toolbox';


// Tests

export function testAllBlocksInToolbox(contents: toolboxItems.ContentsType[]) {
export function testAllBlocksInToolbox() {
const contents: toolboxItems.ContentsType[] = getToolboxJSON([], null).contents;
alert('Press OK to run tests on all blocks from the toolbox.');
const toolboxTestData = new ToolboxTestData(contents, () => {
alert('Completed tests on all blocks in the toolbox. See console for any errors.');
Expand Down Expand Up @@ -104,24 +106,24 @@ class ToolboxTestData {
}

private testBlockPython(block: Blockly.Block) {
pythonGenerator.init(this.blocklyWorkspace);
extendedPythonGenerator.init(this.blocklyWorkspace);
let code = null;
try {
code = pythonGenerator.blockToCode(block);
code = extendedPythonGenerator.blockToCode(block);
} catch (e) {
console.log('Error - ' + e + ' - Unable to test block...'); console.log(block);
}
if (block.outputConnection) {
if (!Array.isArray(code)) {
console.log(
'Error - pythonGenerator.forBlock["' + block.type + '"] ' +
'Error - extendedPythonGenerator.forBlock["' + block.type + '"] ' +
'generated a ' + (typeof code) +
', but it should generate an array because the block has an output connection.');
}
} else {
if (typeof code != 'string') {
console.log(
'Error - pythonGenerator.forBlock["' + block.type + '"] ' +
'Error - extendedPythonGenerator.forBlock["' + block.type + '"] ' +
'generated a ' + (typeof code) +
', but should generate a string because the block does not have an output connection.');
}
Expand Down