test: 将 db 端口及文件名改为随机

LokiSharp · Oct 31, 2023 · 4a7c472 · 4a7c472
1 parent 288c604
commit 4a7c472
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 60 deletions.
diff --git a/common/tests/Rpc/Rpc.test.ts b/common/tests/Rpc/Rpc.test.ts
@@ -8,9 +8,10 @@ const OLD_ENV = process.env;
 let server: Server;
 beforeAll(() => {
   process.env = { ...OLD_ENV }; // Make a copy
-  process.env.STORAGE_PORT = "8080";
-  process.env.STORAGE_HOST = "localhost";
-
+});
+beforeAll(() => {
+  const PORT = (Math.random() * (20000 - 10000) + 10000).toFixed();
+  process.env.STORAGE_PORT = PORT;
   server = createServer((socket) => {
     const pubSub = new PubSub();
     const pubSubConnection = pubSub.create();

diff --git a/common/tests/Storage.test.ts b/common/tests/Storage.test.ts
@@ -11,11 +11,11 @@ let db: DataBase;
 const storage = new Storage();
 beforeAll(() => {
   process.env = { ...OLD_ENV }; // Make a copy
-  process.env.STORAGE_PORT = "8080";
-  process.env.STORAGE_HOST = "localhost";
-  process.env.DB_PATH = "tmp/db.json";
 });
 beforeEach(() => {
+  const PORT = (Math.random() * (20000 - 10000) + 10000).toFixed();
+  process.env.STORAGE_PORT = PORT;
+  process.env.DB_PATH = "tmp/db" + PORT + ".json";
   fs.mkdirSync("tmp/", { recursive: true });
 
   server = createServer((socket) => {
@@ -39,7 +39,7 @@ beforeEach(() => {
 afterEach(async () => {
   db.db!.close();
   server.close();
-  fs.rmSync("tmp/db.json", { recursive: true, force: true });
+  fs.rmSync("tmp/" + process.env.DB_PATH, { recursive: true, force: true });
 }, 5000);
 
 afterAll(() => {

diff --git a/common/tests/common.test.ts b/common/tests/common.test.ts
@@ -1,49 +1,4 @@
-import { Common, RpcServer } from "@/index";
-import { createServer, Server } from "net";
-import { DataBase, PubSub, Queue } from "@neo-screeps/storage";
-import fs from "fs";
-import _ from "lodash";
-
-const OLD_ENV = process.env;
-let server: Server;
-let db: DataBase;
-beforeAll(() => {
-  process.env = { ...OLD_ENV }; // Make a copy
-  process.env.STORAGE_PORT = "8080";
-  process.env.STORAGE_HOST = "localhost";
-  process.env.DB_PATH = "tmp/db.json";
-});
-beforeEach(() => {
-  fs.mkdirSync("tmp/", { recursive: true });
-
-  server = createServer((socket) => {
-    const pubSub = new PubSub();
-    const pubSubConnection = pubSub.create();
-    db = new DataBase();
-    db.loadDb();
-    const queue = new Queue();
-    new RpcServer(
-      socket,
-      _.extend({}, pubSubConnection.methods, db.toObject(), queue.toObject()),
-    );
-  });
-
-  server.listen(
-    parseInt(process.env.STORAGE_PORT!),
-    process.env.STORAGE_HOST || "localhost",
-  );
-});
-
-afterEach(async () => {
-  db.db!.close();
-  server.close();
-  fs.rmSync("tmp/db.json", { recursive: true, force: true });
-}, 5000);
-
-afterAll(() => {
-  process.env = OLD_ENV; // Restore old environment
-  fs.rmSync("tmp/", { recursive: true, force: true });
-});
+import { Common } from "@/index";
 
 test("findPort", async () => {
   const common = new Common();
@@ -73,10 +28,3 @@ test("checkTerrain", async () => {
   const result = common.checkTerrain(terrainString, 0, 0, 1);
   expect(result).toBe(true);
 });
-
-test("getGameTime", () => {
-  const common = new Common();
-  common.storage.storageConnect();
-  const result = common.getGameTime();
-  expect(result).toBe(true);
-});