Fix tests

src/routes/timer.tsx

@@ -5,11 +5,11 @@ import {
 } from 'react-use-precision-timer';
 import { ScrollArea } from '@/components/ui/scroll-area';
 import { cn } from '@/lib/utils';
-import TimerBar from '@/timer/TimerBar';
 import DrawScrambleCard from '@/timer/DrawScrambleCard';
 import LiveCubeCard from '@/timer/LiveCubeCard';
 import ResultsCard from '@/timer/ResultsCard';
 import ScrambleDisplay from '@/timer/ScrambleDisplay';
+import TimerBar from '@/timer/TimerBar';
 import useCubeTimer, { HOLD_DOWN_TIME, TimerState } from '@/timer/useCubeTimer';
 
 export const Route = createFileRoute('/timer')({

tests/parse.test.ts

@@ -2,8 +2,16 @@ import { expect, test, describe } from 'bun:test';
 import {
   convertToSliceMoves,
   extractAlgs,
+  makeAlgToComm,
   removeRotations,
 } from '@/lib/analysis/solutionParser';
+import { cube3x3x3 } from 'cubing/puzzles';
+
+async function extractComm(alg: string[]) {
+  const puzzle = await cube3x3x3.kpuzzle();
+  const extracted = await extractAlgs(alg);
+  return extracted.map(a => makeAlgToComm(a, puzzle));
+}
 
 describe('Slice Moves', () => {
   test('Converts slice moves M', () => {
@@ -41,59 +49,59 @@ describe('Slice Moves', () => {
 // Test algs are notated as per UFRBLD letter scheme
 describe('Extract Comms', () => {
   test('Extract valid comm (EP)', async () => {
-    const extracted = await extractAlgs(
+    const extracted = await extractComm(
       "R U' R' D' R U2 R' D R U' R'".split(' ')
     );
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[R U': [R' D' R, U2]]");
   });
 
   test('Extract valid comm (BG)', async () => {
-    const extracted = await extractAlgs("D' R' D R U R' D' R U' D".split(' '));
+    const extracted = await extractComm("D' R' D R U R' D' R U' D".split(' '));
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[D': [R' D R, U]]");
   });
 
   test('Extract invalid comm', async () => {
-    const extracted = await extractAlgs("R U' R'".split(' '));
+    const extracted = await extractComm("R U' R'".split(' '));
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("R U' R'");
   });
 
   test('Extract slice alg (FK)', async () => {
-    const extracted = await extractAlgs(
+    const extracted = await extractComm(
       "F' B L D L' R F' F' L R' D L' F B'".split(' ')
     );
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[S U L: [E', L2]]");
   });
 
   test('Extract slice alg (GJ) with double moves', async () => {
-    const extracted = await extractAlgs(
+    const extracted = await extractComm(
       "R' L F R' F' L R' D R D' L L R' R'".split(' ')
     );
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[M': [U R' U', M']]");
   });
 
   test('Extract slice alg (FK) with extra moves', async () => {
-    const extracted = await extractAlgs(
+    const extracted = await extractComm(
       "R U B D D' B' U' R' F' B L D L' R F' F' L R' D L' F B'".split(' ')
     );
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[S U L: [E', L2]]");
   });
 
   test('Extract slice alg (RI) with wide move canceling', async () => {
-    const extracted = await extractAlgs(
+    const extracted = await extractComm(
       "U' R L' B' R' B F' U B U' F B' L U".split(' ')
     );
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[U' M: [U', R' E R]]");
   });
 
   test('Extract slice alg (IM) with wide move canceling', async () => {
-    const extracted = await extractAlgs("R U R' U' R' L F R F' L'".split(' '));
+    const extracted = await extractComm("R U R' U' R' L F R F' L'".split(' '));
     expect(extracted.length).toBe(1);
     expect(extracted[0][0]).toBe("[R: [U R' U', M']]");
   });