add loader tests

fengmk2 · fengmk2 · commit 6adebea6c136 · 2025-01-01T19:21:02.000+08:00
diff --git a/src/lib/core/base_hook_class.ts b/src/lib/core/base_hook_class.ts
@@ -3,14 +3,14 @@ import type { ILifecycleBoot } from '@eggjs/core';
 import type { Application, Agent } from '../../index.js';
 
 export class BaseHookClass implements ILifecycleBoot {
-  fullPath?: string;
+  declare fullPath?: string;
   #instance: Application | Agent;
 
   constructor(instance: Application | Agent) {
     this.#instance = instance;
   }
 
-  get logger(): any {
+  get logger() {
     return this.#instance.logger;
   }
 
diff --git a/src/lib/egg.ts b/src/lib/egg.ts
@@ -134,6 +134,7 @@ export class EggApplicationCore extends EggCore {
   /**
    * Retrieve base boot
    * @member {Boot}
+   * @alias BaseHookClass
    */
   Boot = BaseHookClass;
 
diff --git a/test/fixtures/apps/boot-app-esm/agent.js b/test/fixtures/apps/boot-app-esm/agent.js
@@ -0,0 +1,44 @@
+import assert from 'node:assert';
+import { scheduler } from 'node:timers/promises';
+import { Boot } from '../../../../src/index.js';
+
+export default class CustomBoot extends Boot  {
+  constructor(agent) {
+    super(agent);
+    agent.bootLog = [];
+    assert(this.config);
+    agent.messenger.on('egg-ready', () => {
+      agent.messenger.sendToApp('agent2app');
+    });
+  }
+
+  configDidLoad() {
+    this.agent.bootLog.push('configDidLoad');
+  }
+
+  async didLoad() {
+    await scheduler.wait(1);
+    this.agent.bootLog.push('didLoad');
+  }
+
+  async willReady() {
+    await scheduler.wait(1);
+    this.agent.bootLog.push('willReady');
+  }
+
+  async didReady() {
+    await scheduler.wait(1);
+    this.agent.bootLog.push('didReady');
+    this.logger.info('agent is ready');
+  }
+
+  async beforeClose() {
+    await scheduler.wait(1);
+    this.agent.bootLog.push('beforeClose');
+  }
+
+  async serverDidReady() {
+    await scheduler.wait(1);
+    this.agent.bootLog.push('serverDidReady');
+  }
+}
diff --git a/test/fixtures/apps/boot-app-esm/app.js b/test/fixtures/apps/boot-app-esm/app.js
@@ -0,0 +1,45 @@
+import assert from 'node:assert';
+import { scheduler } from 'node:timers/promises';
+import { Boot } from '../../../../src/index.js';
+
+export default class CustomBoot extends Boot  {
+  constructor(app) {
+    super(app);
+    app.bootLog = [];
+    assert(this.config);
+    assert(this.fullPath);
+    app.messenger.on('agent2app', () => {
+      app.messengerLog = true;
+    });
+  }
+
+  configDidLoad() {
+    this.app.bootLog.push('configDidLoad');
+  }
+
+  async didLoad() {
+    await scheduler.wait(1);
+    this.app.bootLog.push('didLoad');
+  }
+
+  async willReady() {
+    await scheduler.wait(1);
+    this.app.bootLog.push('willReady');
+  }
+
+  async didReady() {
+    await scheduler.wait(1);
+    this.app.bootLog.push('didReady');
+    this.logger.info('app is ready');
+  }
+
+  async beforeClose() {
+    await scheduler.wait(1);
+    this.app.bootLog.push('beforeClose');
+  }
+
+  async serverDidReady() {
+    await scheduler.wait(1);
+    this.app.bootLog.push('serverDidReady');
+  }
+}
diff --git a/test/fixtures/apps/boot-app-esm/package.json b/test/fixtures/apps/boot-app-esm/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "boot-app-esm",
+  "type": "module"
+}
diff --git a/test/fixtures/apps/boot-app/agent.js b/test/fixtures/apps/boot-app/agent.js
@@ -1,12 +1,11 @@
 const assert = require('assert');
-const BaseHookClass = require('../../../../lib/core/base_hook_class');
-const { sleep } = require('../../../utils');
+const { scheduler } = require('node:timers/promises');
 
-module.exports = class extends BaseHookClass {
+module.exports = class CustomBoot {
   constructor(agent) {
-    super(agent);
+    this.agent = agent;
     agent.bootLog = [];
-    assert(this.config);
+    assert(this.agent.config);
     agent.messenger.on('egg-ready', () => {
       agent.messenger.sendToApp('agent2app');
     });
@@ -17,28 +16,28 @@ module.exports = class extends BaseHookClass {
   }
 
   async didLoad() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.agent.bootLog.push('didLoad');
   }
 
   async willReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.agent.bootLog.push('willReady');
   }
 
   async didReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.agent.bootLog.push('didReady');
-    this.logger.info('agent is ready');
+    this.agent.logger.info('agent is ready');
   }
 
   async beforeClose() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.agent.bootLog.push('beforeClose');
   }
 
   async serverDidReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.agent.bootLog.push('serverDidReady');
   }
 };
diff --git a/test/fixtures/apps/boot-app/app.js b/test/fixtures/apps/boot-app/app.js
@@ -1,12 +1,11 @@
 const assert = require('assert');
-const BaseHookClass = require('../../../../lib/core/base_hook_class');
-const { sleep } = require('../../../utils');
+const { scheduler } = require('node:timers/promises');
 
-module.exports = class extends BaseHookClass {
+module.exports = class CustomBoot {
   constructor(app) {
-    super(app);
+    this.app = app;
     app.bootLog = [];
-    assert(this.config);
+    assert(this.app.config);
     app.messenger.on('agent2app', () => {
       app.messengerLog = true;
     });
@@ -17,28 +16,28 @@ module.exports = class extends BaseHookClass {
   }
 
   async didLoad() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.app.bootLog.push('didLoad');
   }
 
   async willReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.app.bootLog.push('willReady');
   }
 
   async didReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.app.bootLog.push('didReady');
-    this.logger.info('app is ready');
+    this.app.logger.info('app is ready');
   }
 
   async beforeClose() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.app.bootLog.push('beforeClose');
   }
 
   async serverDidReady() {
-    await sleep(1);
+    await scheduler.wait(1);
     this.app.bootLog.push('serverDidReady');
   }
 };
diff --git a/test/fixtures/apps/demo/config/config.default.js b/test/fixtures/apps/demo/config/config.default.js
@@ -20,12 +20,12 @@ exports.mysql = {
 };
 
 exports.logger = {
-  consoleLevel: 'NONE',
-  coreLogger: {
-    consoleLevel: 'NONE',
-  },
-  concentrateError: 'ignore',
-  level: 'NONE',
+  // consoleLevel: 'NONE',
+  // coreLogger: {
+  //   consoleLevel: 'NONE',
+  // },
+  // concentrateError: 'ignore',
+  // level: 'NONE',
 };
 
 exports.tips = 'hello egg';
diff --git a/test/fixtures/apps/demo/config/config.unittest.js b/test/fixtures/apps/demo/config/config.unittest.js
@@ -1,8 +1,8 @@
 exports.logger = {
-  consoleLevel: 'NONE',
-  coreLogger: {
-    consoleLevel: 'NONE',
-  },
-  concentrateError: 'ignore',
-  level: 'NONE',
+  // consoleLevel: 'NONE',
+  // coreLogger: {
+  //   consoleLevel: 'NONE',
+  // },
+  // concentrateError: 'ignore',
+  // level: 'NONE',
 };
diff --git a/test/fixtures/apps/subdir-services/app/service/foo/subdir2/sub2.js b/test/fixtures/apps/subdir-services/app/service/foo/subdir2/sub2.js
@@ -6,7 +6,7 @@ module.exports = app => {
       super(ctx);
     }
 
-    * get(name) {
+    async get(name) {
       return {
         name: name,
         bar: 'bar3',
diff --git a/test/fixtures/apps/subdir-services/app/service/ok.js b/test/fixtures/apps/subdir-services/app/service/ok.js
@@ -1,12 +1,10 @@
-'use strict';
-
 module.exports = app => {
   return class OK extends app.Service {
     constructor(ctx) {
       super(ctx);
     }
 
-    * get() {
+    async get() {
       return {
         ok: true,
       };
diff --git a/test/fixtures/apps/subdir-services/app/service/old_style.js b/test/fixtures/apps/subdir-services/app/service/old_style.js
@@ -1,3 +1,3 @@
-exports.url = function* (ctx) {
+exports.url = async (ctx) => {
   return ctx.url;
 };
diff --git a/test/fixtures/apps/subdir-services/config/config.default.js b/test/fixtures/apps/subdir-services/config/config.default.js
@@ -1,3 +1 @@
-'use strict';
-
 exports.keys = 'test key';
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -14,10 +14,12 @@ describe('test/index.test.ts', () => {
       'ClusterWorkerExceptionError',
       'Context',
       'Controller',
+      'CookieLimitExceedError',
       'EggApplicationCore',
       'EggLogger',
       'Helper',
       'Master',
+      'MessageUnhandledRejectionError',
       'Request',
       'Response',
       'Router',
diff --git a/test/lib/core/config/config.cookies.test.ts b/test/lib/core/config/config.cookies.test.ts
@@ -1,19 +1,14 @@
-'use strict';
+import { strict as assert } from 'node:assert';
+import { MockApplication, createApp } from '../../../utils.js';
 
-const assert = require('assert');
-const mm = require('egg-mock');
-const utils = require('../../../utils');
-
-describe('test/lib/core/config/config.cookies.test.js', () => {
-  let app;
+describe('test/lib/core/config/config.cookies.test.ts', () => {
+  let app: MockApplication;
   before(() => {
-    app = utils.app('apps/app-config-cookies');
+    app = createApp('apps/app-config-cookies');
     return app.ready();
   });
   after(() => app.close());
 
-  afterEach(mm.restore);
-
   it('should auto set sameSite cookie', async () => {
     const res = await app.httpRequest()
       .get('/');
diff --git a/test/lib/core/config/config.test.js b/test/lib/core/config/config.test.js
diff --git a/test/lib/core/config/config.test.ts b/test/lib/core/config/config.test.ts
@@ -0,0 +1,16 @@
+import { strict as assert } from 'node:assert';
+import { MockApplication, createApp } from '../../../utils.js';
+
+describe('test/lib/core/config/config.test.ts', () => {
+  let app: MockApplication;
+  before(() => {
+    app = createApp('apps/demo');
+    return app.ready();
+  });
+  after(() => app.close());
+
+  it('should return config.name', () => {
+    assert.equal(app.config.name, 'demo');
+    assert.equal(app.config.logger.disableConsoleAfterReady, false);
+  });
+});
diff --git a/test/lib/core/loader/config_loader.test.ts b/test/lib/core/loader/config_loader.test.ts
diff --git a/test/lib/core/loader/load_app.test.ts b/test/lib/core/loader/load_app.test.ts
diff --git a/test/lib/core/loader/load_boot.test.js b/test/lib/core/loader/load_boot.test.js
diff --git a/test/lib/core/loader/load_boot.test.ts b/test/lib/core/loader/load_boot.test.ts
diff --git a/test/lib/core/loader/load_plugin.test.ts b/test/lib/core/loader/load_plugin.test.ts
diff --git a/test/lib/core/loader/load_service.test.ts b/test/lib/core/loader/load_service.test.ts

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@ import type { ILifecycleBoot } from '@eggjs/core';`
`3`	`3`	`import type { Application, Agent } from '../../index.js';`
`4`	`4`
`5`	`5`	`export class BaseHookClass implements ILifecycleBoot {`
`6`		`- fullPath?: string;`
	`6`	`+ declare fullPath?: string;`
`7`	`7`	`#instance: Application \| Agent;`
`8`	`8`
`9`	`9`	`constructor(instance: Application \| Agent) {`
`10`	`10`	`this.#instance = instance;`
`11`	`11`	`}`
`12`	`12`
`13`		`- get logger(): any {`
	`13`	`+ get logger() {`
`14`	`14`	`return this.#instance.logger;`
`15`	`15`	`}`
`16`	`16`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "boot-app-esm",
 +  "type": "module"
 +}
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ module.exports = app => {`
`6`	`6`	`super(ctx);`
`7`	`7`	`}`
`8`	`8`
`9`		`- * get(name) {`
	`9`	`+ async get(name) {`
`10`	`10`	`return {`
`11`	`11`	`name: name,`
`12`	`12`	`bar: 'bar3',`