simplify test output

jacklowrie · jacklowrie · commit ca8aeb779294 · 2025-11-17T12:47:16.000-05:00
diff --git a/public/index.html b/public/index.html
@@ -23,14 +23,14 @@
       integrity="sha512-yh2RE0wZCVZeysGiqTwDTO/dKelCbS9bP2L94UvOFtl/FKXcNAje3Y2oBg/ZMZ3LS1sicYk4dYVGtDex75fvvA==" 
       crossorigin="anonymous" 
       referrerpolicy="no-referrer" 
-    />
+    >
 
     <!-- Custom styles -->
     <link rel="stylesheet" href="style.css">
   </head>
 
   <body>
-        <h1 class="title">Python Coding Challenge</h1>
+    <h1 class="title">Python Coding Challenge</h1>
     <div class="section">
       <div class="columns">
         <div class="column">
@@ -41,18 +41,24 @@ <h3>Instructions</h3>
           </p>
         </div>
         <div class="column">
-          <div class="box image is-5by4" id="solution"></div>
-          <div class="controls">
-            <button class="button is-primary" id="run">Run</button>
+          <div class="card">
+            <header class="card-header"><p class="card-header-title">Your Code</p></header>
+            <div class="mx-0" id="solution" style="aspect-ratio:4/3">
+            </div>
+            <div class="card-footer">
+                <button class="card-footer-item" id="run">Run</button>
+            </div>
+          </div>
+          <div class="card">
+            <header class="card-header">
+                <p class="card-header-title">Output</p>
+            </header>
+            <div class="card-content" id="output"></div>
           </div>
-          <div id="output"></div>
         </div>
       </div>
     </div>
-    <div class="right-half">
-    </div>
     <script type="mpy" src="main.py"></script>
-    </div>
   </body>
 </html>
 
diff --git a/public/main.py b/public/main.py
@@ -26,7 +26,8 @@ async def run(event):
     global worker
 
     code = editor.getValue()
-    document.getElementById("output").innerText = "⏳ Running..."
+    output = document.getElementById("output")
+    output.innerText = "⏳ Running..."
 
     # ---- TIMEOUT HANDLING ----
     timeout_ms = 1500  # 1.5 second limit
@@ -44,19 +45,19 @@ async def run(event):
         # Race the worker call vs. timeout
         result = await window.Promise.race([eval_promise, timeout_promise])
 
-        document.getElementById("output").innerText = f"{result}"
+        output.innerText = f"{result}"
 
     except Exception as e:
         if str(e) == "Error: timeout":
             # ---- Worker hung. Kill it. ----
             worker.terminate()
             worker = make_worker()   # start fresh
             await worker.ready
-            document.getElementById("output").innerText = (
+            output.innerText = (
                 "💥 Your code took too long (possible infinite loop). Worker reset."
             )
         else:
-            document.getElementById("output").innerText = f"💥 Error: {e}"
+            output.innerText = f"💥 Error: {e}"
 
 document.getElementById("run").addEventListener("click", run)
 
diff --git a/public/worker.py b/public/worker.py
@@ -30,16 +30,8 @@ def evaluate(code):
     if check_for_multiplication(code):
         return "💥 Your solution cannot use the * operator!"
 
-    tests = [
-        (1,1),
-        (1,2),
-        (2,1),
-        (2,3),
-        (0,3),
-        (3,0),
-        (-2,3),
-        (2,-3),
-    ]
+    tests = [(x, y) for x in range(-3,4) for y in range(-3,4)]
+
     results = []
     for test in tests:
         try:
@@ -52,15 +44,25 @@ def evaluate(code):
             results.append( f"error: {e}")
     
     formatted = ""
+    correct = 0
+    all_correct = False
     for test, result in zip(tests, results):
         if str(result).startswith("error:"):
-            formatted += f"💥 multiply{test} raised an exception: {result[7:]}\n"
-        elif result == test[0] * test[1]:
-            formatted += f"✅ multiply{test} = {result} (correct)\n"
+            if not all_correct:
+                formatted += f"💥 multiply{test} raised an exception: {result[7:]}\n"
+            all_correct = True
+        elif result != test[0] * test[1]:
+            if not all_correct:
+                formatted += f"❌ inputs {test}. Expected {test[0] * test[1]}, got {result})\n"
+            all_correct = True
         else:
-            formatted += f"❌ multiply{test} = {result} (incorrect, expected {test[0] * test[1]})\n"
+            correct += 1
+    output = f"{correct} / {len(tests)} correct\n" + formatted
 
-    return formatted
+    if correct == len(tests):
+        return "✅ All tests passed! Great job!"
+    else:
+        return f"{correct} / {len(tests)} correct\n" + formatted
 
 
 
