Move test utils into separate folder

1001mei · 1001mei · commit 0ee7aa6ee6a0 · 2024-04-09T20:04:48.000+08:00
diff --git a/src/compiler/__tests__/__utils__/test-utils.ts b/src/compiler/__tests__/__utils__/test-utils.ts
@@ -1,7 +1,7 @@
 import { inspect } from "util";
-import { Compiler } from "../compiler";
-import { BinaryWriter } from "../binary-writer";
-import { AST } from "../../ast/types/packages-and-modules";
+import { Compiler } from "../../compiler";
+import { BinaryWriter } from "../../binary-writer";
+import { AST } from "../../../ast/types/packages-and-modules";
 import { execSync } from "child_process";
 
 import * as peggy from "peggy";
@@ -44,6 +44,6 @@ export function runTest(program: string, expectedLines: string[]) {
   expect(actualLines).toStrictEqual(expectedLines);
 }
 
-describe("compiler's test utils", () => {
-  it("Prevent jest from complaining", () => { });
-});
+//describe("compiler's test utils", () => {
+//  it("Prevent jest from complaining", () => { });
+//});
diff --git a/src/compiler/__tests__/tests/arithmeticExpression.test.ts b/src/compiler/__tests__/tests/arithmeticExpression.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -85,4 +85,4 @@ export const arithmeticExpressionTest = () => describe("arithmetic expression",
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/array.test.ts b/src/compiler/__tests__/tests/array.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -207,4 +207,4 @@ export const arrayTest = () => describe("arrays", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/class.test.ts b/src/compiler/__tests__/tests/class.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -151,4 +151,4 @@ export const classTest = () => describe("fields and methods of class", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/for.test.ts b/src/compiler/__tests__/tests/for.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -165,4 +165,4 @@ export const forTest = () => describe("for statements", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/ifElse.test.ts b/src/compiler/__tests__/tests/ifElse.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -321,4 +321,4 @@ export const ifElseTest = () => describe("if else statements", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/import.test.ts b/src/compiler/__tests__/tests/import.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -50,4 +50,4 @@ export const importTest = () => describe("imports", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/methodInvocation.test.ts b/src/compiler/__tests__/tests/methodInvocation.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -159,4 +159,4 @@ export const methodInvocationTest = () => describe("method invocations", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/println.test.ts b/src/compiler/__tests__/tests/println.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -119,4 +119,4 @@ export const printlnTest = () => describe("println", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/unaryExpression.test.ts b/src/compiler/__tests__/tests/unaryExpression.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
diff --git a/src/compiler/__tests__/tests/variableDeclaration.test.ts b/src/compiler/__tests__/tests/variableDeclaration.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -98,4 +98,4 @@ export const variableDeclarationTest = () => describe("variable declaration", ()
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});
diff --git a/src/compiler/__tests__/tests/while.test.ts b/src/compiler/__tests__/tests/while.test.ts
@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import {`
`2`	`2`	`runTest,`
`3`	`3`	`testCase,`
`4`		`-} from "../test-utils";`
	`4`	`+} from "../__utils__/test-utils";`
`5`	`5`
`6`	`6`	`const testCases: testCase[] = [`
`7`	`7`	`{`
`@@ -85,4 +85,4 @@ export const arithmeticExpressionTest = () => describe("arithmetic expression",`
`85`	`85`	`const { comment: comment, program: program, expectedLines: expectedLines } = testCase;`
`86`	`86`	`it(comment, () => runTest(program, expectedLines));`
`87`	`87`	`}`
`88`		`-});`
	`88`	`+});`