Implement stderr in UI

mbucko · mbucko · commit 622142edd4f0 · 2024-03-12T03:59:32.000+01:00
diff --git a/src/ui/index.html b/src/ui/index.html
@@ -46,7 +46,7 @@
       <!-- Right Panel BOTTOM  -->
       <div id="bottom-right-panel" class="panel-item">
         <div class="tab-panel">
-          <div class="tab">Testcase</div>
+          <div class="tab" id="tab-testcases">Testcase</div>
           <div class="tab-separator"></div>
           <div class="tab" id="tab-test-results-button">Test Results</div>
           <div class="tab-separator"></div>
@@ -56,15 +56,20 @@
           <!-- Testcase Container-->
           <div id="tab-testcase-container">
             <h5 class="testcase-container-title">Input:</h5>
-            <textarea id="input-container" class="testcase-container-text"></textarea>
-            <h5 class="testcase-container-title">Output:</h5>
-            <textarea readonly id="testcase-output" class="testcase-container-text">
+            <textarea id="input-container" class="testcase-container-text">
             </textarea>
             <h5 class="testcase-container-title">Expected:</h5>
             <textarea readonly id="expected-output" class="testcase-container-text">
             </textarea>
+            <h5 class="testcase-container-title">Output:</h5>
+            <textarea readonly id="testcase-output" class="testcase-container-text">
+            </textarea>
             <h5 class="testcase-container-title">Stdout:</h5>
-            <textarea readonly id="testcase-stdout" class="testcase-container-text"></textarea>
+            <textarea readonly id="testcase-stdout" class="testcase-container-text">
+            </textarea>
+            <h5 class="testcase-container-title">Stderr:</h5>
+            <textarea readonly id="testcase-stderr" class="testcase-container-text">
+            </textarea>
           <!-- Testcase Container END -->
           </div>
         </div>
diff --git a/src/ui/index.js b/src/ui/index.js
@@ -182,16 +182,19 @@ function setCustomTestcaseResults(results) {
     if (!validateResults(results)) {
         return;
     }
+    
+    document.getElementById('testcase-stderr').textContent = results.stderr;
 
     if (results.tests.length !== 1) {
         console.error("Expected 1 custom test results, got " +
             results.tests.length);
-            return;
+        return;
     }
 
     if (results.tests[0].status !== "Skipped") {
         console.error("Expected custom test status to be 'skipped', got " +
             results.tests[0].status);
+        return;
     }
 
     console.log("Setting custom testcase results: " + JSON.stringify(results));
@@ -202,6 +205,8 @@ function setCustomTestcaseResults(results) {
 
     run(setExpectedTestcaseResults, directoryManager.getCustomTestcaseName(),
     true);
+
+    document.getElementById('tab-testcases').click();
 }
 
 function setExpectedTestcaseResults(expected) {
@@ -227,6 +232,12 @@ function setExpectedTestcaseResults(expected) {
 function runCustomTestcase() {
     console.log("Running custom testcase for " + activeProblem);
 
+    document.getElementById('testcase-stdout').textContent = "";
+    document.getElementById('testcase-stderr').textContent = "";
+    document.getElementById('testcase-output').textContent = "";
+    document.getElementById('compilation-content').textContent = "";
+    document.getElementById('test-results-content').innerHTML = "";
+
     const input = document.getElementById('input-container').value + "\n*";
     const customTestcaseFilename =
         directoryManager.getCustomTestcaseFilename(activeProblem);
@@ -266,6 +277,10 @@ function setUserSolution(problemName) {
 
 var previousProblem;
 function onProblemSelected(problemName) {
+    document.getElementById('testcase-stdout').textContent = "";
+    document.getElementById('testcase-stderr').textContent = "";
+    document.getElementById('testcase-output').textContent = "";
+
     saveSolution('cpp', editor.getValue());
     previousProblem = problemName;
     
@@ -306,12 +321,16 @@ function initializeSaveCommand() {
 function initializeRunCommand() {
     ipcRenderer.on('run-command', () => {
         console.log('Received run command');
+        document.getElementById('compilation-content').textContent = "";
+        document.getElementById('test-results-content').innerHTML = "";
         run(setTestResults);
     });
     
     document.getElementById('run-button')
         .addEventListener('click', function() {
             console.log('Run button clicked');
+            document.getElementById('compilation-content').textContent = "";
+            document.getElementById('test-results-content').innerHTML = "";
             run(setTestResults);
     });
 }
