Separate type declarations, run_tests(areaLog, tests) for simulation, and run_all_tests() for testcases into separate files

Author: JustATin555

src/bundles/robot_minigame/functions.ts

@@ -5,20 +5,14 @@ import context from 'js-slang/context';
 //   type List
 // } from 'js-slang/dist/stdlib/list';
 
-// A point (x, y)
-interface Point {
-  x: number
-  y: number
-}
-
-// A point (x, y) with rotation
-interface PointWithRotation extends Point {
-  rotation: number
-}
-
-export interface Robot extends PointWithRotation {
-  radius: number
-}
+import { run_tests } from './tests';
+import type {
+  Point, PointWithRotation, Robot,
+  Action,
+  AreaFlags, Area,
+  AreaTest,
+  RobotMinigame
+} from './types';
 
 // A line segment between p1 and p2
 interface LineSegment {
@@ -32,44 +26,6 @@ interface Ray {
   target: Point
 }
 
-// A stored action
-export interface Action {
-  type: 'begin' | 'move' | 'rotate' | 'sensor'
-  position: PointWithRotation
-}
-
-interface AreaFlags {
-  [name: string]: any
-}
-
-export interface Area {
-  vertices: Point[]
-  isObstacle: boolean
-  flags: AreaFlags
-}
-
-interface Test {
-  type: string
-  test: Function
-}
-
-interface AreaTest extends Test {
-  type: 'area'
-  test: (areas: Area[]) => boolean
-}
-
-export interface RobotMinigame {
-  isInit: boolean
-  width: number
-  height: number
-  robot: Robot
-  areas: Area[]
-  areaLog: Area[]
-  actionLog: Action[]
-  tests: Test[]
-  message: string
-}
-
 // Default state before initialisation
 const state: RobotMinigame = {
   isInit: false,
@@ -405,26 +361,8 @@ export function turn_right() {
  *
  * @returns if all tests pass
  */
-export function run_tests() : boolean {
-  // Run each test in order
-  for (const test of state.tests) {
-    // Store status in a variable
-    let success: boolean;
-
-    switch(test.type) {
-      case 'area':
-        success = test.test(state.areaLog);
-        break;
-      default:
-        success = true;
-    }
-
-    // If the test fails, return false
-    if (!success) return false;
-  }
-
-  // If all tests pass, return true
-  return true;
+export function run_all_tests() : boolean {
+  return run_tests(state);
 }
 
 // ==================
@@ -690,7 +628,7 @@ function logAction(
   type: 'begin' | 'move' | 'rotate' | 'sensor',
   position: PointWithRotation
 ) {
-  state.actionLog.push({type, position});
+  state.actionLog.push({type, position} as Action);
 }
 
 /**

src/bundles/robot_minigame/index.ts

@@ -10,5 +10,5 @@ export {
   init, create_area, create_rect_area, create_obstacle, create_rect_obstacle, complete_init,
   get_distance, get_color,
   move_forward, move_forward_to_wall, rotate, turn_left, turn_right,
-  should_enter_colors, run_tests
+  should_enter_colors, run_all_tests
 } from './functions';

src/bundles/robot_minigame/tests.ts

@@ -0,0 +1,34 @@
+import type { Area, Test } from './types';
+
+/**
+ * Run the stored tests in state
+ *
+ * @returns if all tests pass
+ */
+export function run_tests({
+  areaLog,
+  tests
+}: {
+  areaLog: Area[],
+  tests: Test[]
+}) : boolean {
+  // Run each test in order
+  for (const test of tests) {
+    // Store status in a variable
+    let success: boolean;
+
+    switch(test.type) {
+      case 'area':
+        success = test.test(areaLog);
+        break;
+      default:
+        success = true;
+    }
+
+    // If the test fails, return false
+    if (!success) return false;
+  }
+
+  // If all tests pass, return true
+  return true;
+}

src/bundles/robot_minigame/types.ts

@@ -0,0 +1,53 @@
+// A point (x, y)
+export interface Point {
+  x: number
+  y: number
+}
+
+// A point (x, y) with rotation
+export interface PointWithRotation extends Point {
+  rotation: number
+}
+
+// The robot with position and radius
+export interface Robot extends PointWithRotation {
+  radius: number
+}
+
+// A stored action
+export interface Action {
+  type: 'begin' | 'move' | 'rotate' | 'sensor'
+  position: PointWithRotation
+}
+
+export interface AreaFlags {
+  [name: string]: any
+}
+
+export interface Area {
+  vertices: Point[]
+  isObstacle: boolean
+  flags: AreaFlags
+}
+
+export interface Test {
+  type: string
+  test: Function
+}
+
+export interface AreaTest extends Test {
+  type: 'area'
+  test: (areas: Area[]) => boolean
+}
+
+export interface RobotMinigame {
+  isInit: boolean
+  width: number
+  height: number
+  robot: Robot
+  areas: Area[]
+  areaLog: Area[]
+  actionLog: Action[]
+  tests: Test[]
+  message: string
+}

src/tabs/RobotMaze/components/RobotSimulation.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
-import type { Area, Action, Robot, RobotMinigame } from '../../../bundles/robot_minigame/functions';
+import { run_tests } from '../../../bundles/robot_minigame/tests';
+import type { Area, Action, Robot, RobotMinigame } from '../../../bundles/robot_minigame/types';
 
 /**
  * Calculate the acute angle between 2 angles
@@ -134,6 +135,8 @@ const RobotSimulation : React.FC<MapProps> = ({
     robot: {radius: robotSize},
     areas,
     actionLog,
+    areaLog,
+    tests,
     message
   }
 }) => {
@@ -273,7 +276,7 @@ const RobotSimulation : React.FC<MapProps> = ({
             : animationStatus === 2
               ? <button onClick={() => {setAnimationStatus(1);}}>Resume</button>
               : <button onClick={() => {setAnimationStatus(0);}}>Reset</button>}
-        {animationStatus === 3 && <span style={{marginLeft: '5px'}}>{message}</span>}
+        {animationStatus === 3 && <span style={{marginLeft: '5px'}}>{run_tests({tests, areaLog}) ? 'Success! 🎉' : message}</span>}
       </div>
       <div style={{display: 'flex', justifyContent: 'center'}}>
         <canvas ref={canvasRef}/>