chore: Improve code health of generator tests.

google · Dec 19, 2024 · bc34808 · bc34808
1 parent 4680b4b
commit bc34808
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/tests/generators/index.html b/tests/generators/index.html
@@ -38,7 +38,7 @@
  * If some tests are failing, load test suites individually to continue
  * debugging.
  */
-function loadSelected() {
+async function loadSelected() {
   var output = document.getElementById('importExport');
   output.style.background = 'gray';
 
@@ -53,9 +53,12 @@
     if (boxList[i].checked) {
       var testUrl = boxList[i].value;
       if (testUrl) {
-        var xmlText = fetchFile(testUrl);
+        var xmlText = await fetchFile(testUrl);
         if (xmlText !== null) {
           fromXml(testUrl, xmlText, /* opt_append */ true);
+          // Clean up the workspace to normalize the position of blocks and
+          // thus the order of functions in the generated code.
+          Blockly.getMainWorkspace().cleanUp();
         }
       }
     }
@@ -67,23 +70,24 @@
 /**
  * Ask the user for a file name, then load that file's contents.
  */
-function loadOther() {
+async function loadOther() {
   var url = window.prompt('Enter URL of test file.');
   if (!url) {
     return;
   }
-  var xmlText = fetchFile(url);
+  var xmlText = await fetchFile(url);
   if (xmlText !== null) {
     fromXml(url, xmlText);
   }
 }
 
-function fetchFile(xmlUrl) {
+async function fetchFile(xmlUrl) {
   try {
-    var xmlHttp = new XMLHttpRequest();
-    xmlHttp.open('GET', xmlUrl, false);
-    xmlHttp.setRequestHeader('Content-Type', 'text/xml');
-    xmlHttp.send('');
+    const response = await fetch(xmlUrl);
+    if (!response.ok) {
+      throw new Error(`Got a 404 when loading ${xmlUrl}`);
+    }
+    return response.text();
   } catch (e) {
     // Attempt to diagnose the problem.
     var msg = 'Error: Unable to load XML data.\n';
@@ -95,7 +99,6 @@
     alert(msg + '\n' + e);
     return null;
   }
-  return xmlHttp.responseText;
 }
 
 /**
@@ -188,7 +191,7 @@
 function changeIndex() {
   var oneBasedIndex = document.getElementById('indexing').checked;
   demoWorkspace.options.oneBasedIndex = oneBasedIndex;
-  demoWorkspace.getToolbox().flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
+  demoWorkspace.getToolbox().getFlyout().getWorkspace().options.oneBasedIndex = oneBasedIndex;
 }
 </script>
 

diff --git a/tests/generators/webdriver.js b/tests/generators/webdriver.js
@@ -78,7 +78,7 @@ async function runGeneratorsInBrowser(outputDir) {
 
   await browser.execute(function() {
     checkAll();
-    loadSelected();
+    return loadSelected();
   });
 
   await runLangGeneratorInBrowser(browser, prefix + '.js',