test: move test folder to src (#1661)

inversify · Nov 30, 2024 · 756d338 · 756d338
1 parent 66ebe9a
commit 756d338
Show file tree

Hide file tree

Showing 62 changed files with 197 additions and 211 deletions.
diff --git a/.auditignore b/.auditignore
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,3 @@
-.auditignore
 .github
 .gitignore
 .nyc_output
@@ -14,6 +13,7 @@ ISSUE_TEMPLATE.md
 lib/esm/**/*.d.ts.map
 !lib/esm/index.d.ts
 !lib/esm/index.d.ts.map
+lib/*/test/**
 mocha.opts
 prettier.config.mjs
 PULL_REQUEST_TEMPLATE.md
@@ -22,7 +22,6 @@ rollup.config.mjs
 scripts
 src
 temp
-test
 tsconfig.json
 tsconfig.base.cjs.json
 tsconfig.base.esm.json

diff --git a/mocha.opts b/mocha.opts
diff --git a/package.json b/package.json
@@ -72,7 +72,8 @@
     "lint": "eslint ./src",
     "prebuild": "npm run build:clean",
     "prepublish": "npm run build",
-    "test": "nyc --reporter=lcov --require ts-node/register mocha ./test/*.test.ts test/**/*.test.ts --reporter spec --retries 3 --require 'node_modules/reflect-metadata/Reflect.js' --exit"
+    "test": "nyc --reporter=lcov --require ts-node/register mocha src/test/*.test.ts src/test/**/*.test.ts --reporter spec --require 'node_modules/reflect-metadata/Reflect.js' --exit",
+    "test:cjs": "nyc --reporter=lcov mocha lib/cjs/test/*.test.js lib/cjs/test/**/*.test.js --reporter spec --require 'node_modules/reflect-metadata/Reflect.js'"
   },
   "sideEffects": false,
   "version": "6.1.5"

diff --git a/test/annotation/decorator_utils.test.ts → src/test/annotation/decorator_utils.test.ts b/test/annotation/decorator_utils.test.ts → src/test/annotation/decorator_utils.test.ts
@@ -6,10 +6,10 @@ import {
   DecoratorTarget,
   tagParameter,
   tagProperty,
-} from '../../src/annotation/decorator_utils';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import { Container, inject, injectable, interfaces } from '../../src/index';
-import { Metadata } from '../../src/planning/metadata';
+} from '../../annotation/decorator_utils';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import { Container, inject, injectable, interfaces } from '../../index';
+import { Metadata } from '../../planning/metadata';
 
 describe('createTaggedDecorator', () => {
   let sandbox: sinon.SinonSandbox;

diff --git a/test/annotation/inject.test.ts → src/test/annotation/inject.test.ts b/test/annotation/inject.test.ts → src/test/annotation/inject.test.ts
@@ -14,12 +14,12 @@ declare function __param(
 import { LazyServiceIdentifier } from '@inversifyjs/common';
 import { expect } from 'chai';
 
-import { decorate } from '../../src/annotation/decorator_utils';
-import { inject } from '../../src/annotation/inject';
-import { multiInject } from '../../src/annotation/multi_inject';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import type { interfaces } from '../../src/interfaces/interfaces';
+import { decorate } from '../../annotation/decorator_utils';
+import { inject } from '../../annotation/inject';
+import { multiInject } from '../../annotation/multi_inject';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import type { interfaces } from '../../interfaces/interfaces';
 
 class Katana {}
 class Shuriken {}

diff --git a/test/annotation/injectable.test.ts → src/test/annotation/injectable.test.ts b/test/annotation/injectable.test.ts → src/test/annotation/injectable.test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
-import * as ERRORS_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import { decorate, injectable } from '../../src/index';
+import * as ERRORS_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import { decorate, injectable } from '../../index';
 
 describe('@injectable', () => {
   it('Should generate metadata if declared injections', () => {

diff --git a/test/annotation/multi_inject.test.ts → src/test/annotation/multi_inject.test.ts b/test/annotation/multi_inject.test.ts → src/test/annotation/multi_inject.test.ts
@@ -13,11 +13,11 @@ declare function __param(
 
 import { expect } from 'chai';
 
-import { decorate } from '../../src/annotation/decorator_utils';
-import { multiInject } from '../../src/annotation/multi_inject';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import type { interfaces } from '../../src/interfaces/interfaces';
+import { decorate } from '../../annotation/decorator_utils';
+import { multiInject } from '../../annotation/multi_inject';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import type { interfaces } from '../../interfaces/interfaces';
 
 type Weapon = object;
 

diff --git a/test/annotation/named.test.ts → src/test/annotation/named.test.ts b/test/annotation/named.test.ts → src/test/annotation/named.test.ts
@@ -13,11 +13,11 @@ declare function __param(
 
 import { expect } from 'chai';
 
-import { decorate } from '../../src/annotation/decorator_utils';
-import { named } from '../../src/annotation/named';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import type { interfaces } from '../../src/interfaces/interfaces';
+import { decorate } from '../../annotation/decorator_utils';
+import { named } from '../../annotation/named';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import type { interfaces } from '../../interfaces/interfaces';
 
 type Weapon = unknown;
 

diff --git a/test/annotation/optional.test.ts → src/test/annotation/optional.test.ts b/test/annotation/optional.test.ts → src/test/annotation/optional.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { Container, inject, injectable, optional } from '../../src/index';
+import { Container, inject, injectable, optional } from '../../index';
 
 describe('@optional', () => {
   it('Should allow to flag dependencies as optional', () => {

diff --git a/test/annotation/post_construct.test.ts → src/test/annotation/post_construct.test.ts b/test/annotation/post_construct.test.ts → src/test/annotation/post_construct.test.ts
@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 
-import { postConstruct } from '../../src/annotation/post_construct';
-import * as ERRORS_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import { decorate } from '../../src/index';
-import { Metadata } from '../../src/planning/metadata';
+import { postConstruct } from '../../annotation/post_construct';
+import * as ERRORS_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import { decorate } from '../../index';
+import { Metadata } from '../../planning/metadata';
 
 describe('@postConstruct', () => {
   it('Should generate metadata for the decorated method', () => {

diff --git a/test/annotation/tagged.test.ts → src/test/annotation/tagged.test.ts b/test/annotation/tagged.test.ts → src/test/annotation/tagged.test.ts
@@ -13,11 +13,11 @@ declare function __param(
 
 import { expect } from 'chai';
 
-import { decorate } from '../../src/annotation/decorator_utils';
-import { tagged } from '../../src/annotation/tagged';
-import * as ERRORS_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import type { interfaces } from '../../src/interfaces/interfaces';
+import { decorate } from '../../annotation/decorator_utils';
+import { tagged } from '../../annotation/tagged';
+import * as ERRORS_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import type { interfaces } from '../../interfaces/interfaces';
 
 type Weapon = unknown;
 

diff --git a/test/annotation/target_name.test.ts → src/test/annotation/target_name.test.ts b/test/annotation/target_name.test.ts → src/test/annotation/target_name.test.ts
@@ -1,11 +1,11 @@
 import { expect } from 'chai';
 
-import { decorate } from '../../src/annotation/decorator_utils';
-import { injectable } from '../../src/annotation/injectable';
-import { targetName } from '../../src/annotation/target_name';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
-import type { interfaces } from '../../src/index';
-import { Metadata } from '../../src/planning/metadata';
+import { decorate } from '../../annotation/decorator_utils';
+import { injectable } from '../../annotation/injectable';
+import { targetName } from '../../annotation/target_name';
+import * as METADATA_KEY from '../../constants/metadata_keys';
+import type { interfaces } from '../../index';
+import { Metadata } from '../../planning/metadata';
 import * as Stubs from '../utils/stubs';
 
 describe('@targetName', () => {

diff --git a/test/bindings/binding.test.ts → src/test/bindings/binding.test.ts b/test/bindings/binding.test.ts → src/test/bindings/binding.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import { Binding } from '../../src/bindings/binding';
-import { BindingScopeEnum } from '../../src/constants/literal_types';
+import { Binding } from '../../bindings/binding';
+import { BindingScopeEnum } from '../../constants/literal_types';
 import * as Stubs from '../utils/stubs';
 
 describe('Binding', () => {

diff --git a/test/bugs/bugs.test.ts → src/test/bugs/bugs.test.ts b/test/bugs/bugs.test.ts → src/test/bugs/bugs.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import * as METADATA_KEY from '../../src/constants/metadata_keys';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import * as METADATA_KEY from '../../constants/metadata_keys';
 import {
   Container,
   decorate,
@@ -13,14 +13,14 @@ import {
   tagged,
   targetName,
   unmanaged,
-} from '../../src/index';
-import { Metadata } from '../../src/planning/metadata';
-import { MetadataReader } from '../../src/planning/metadata_reader';
-import { getDependencies } from '../../src/planning/reflection_utils';
+} from '../../index';
+import { Metadata } from '../../planning/metadata';
+import { MetadataReader } from '../../planning/metadata_reader';
+import { getDependencies } from '../../planning/reflection_utils';
 import {
   getFunctionName,
   getServiceIdentifierAsString,
-} from '../../src/utils/serialization';
+} from '../../utils/serialization';
 
 describe('Bugs', () => {
   it('Should throw when args length of base and derived class not match', () => {

diff --git a/test/bugs/issue_1190.test.ts → src/test/bugs/issue_1190.test.ts b/test/bugs/issue_1190.test.ts → src/test/bugs/issue_1190.test.ts
@@ -1,12 +1,6 @@
 import { expect } from 'chai';
 
-import {
-  Container,
-  inject,
-  injectable,
-  named,
-  optional,
-} from '../../src/index';
+import { Container, inject, injectable, named, optional } from '../../index';
 
 describe('Issue 1190', () => {
   it('should inject a katana as default weapon to ninja', () => {

diff --git a/test/bugs/issue_1297.test.ts → src/test/bugs/issue_1297.test.ts b/test/bugs/issue_1297.test.ts → src/test/bugs/issue_1297.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { Container, injectable, interfaces } from '../../src/index';
+import { Container, injectable, interfaces } from '../../index';
 
 describe('Issue 1297', () => {
   it('should call onActivation once if the service is a constant value binding', () => {

diff --git a/test/bugs/issue_1416.test.ts → src/test/bugs/issue_1416.test.ts b/test/bugs/issue_1416.test.ts → src/test/bugs/issue_1416.test.ts
@@ -1,7 +1,7 @@
 import { describe, it } from 'mocha';
 import sinon from 'sinon';
 
-import { Container, injectable, preDestroy } from '../../src/index';
+import { Container, injectable, preDestroy } from '../../index';
 
 describe('Issue 1416', () => {
   it('should allow providing default values on optional bindings', async () => {

diff --git a/test/bugs/issue_1515.test.ts → src/test/bugs/issue_1515.test.ts b/test/bugs/issue_1515.test.ts → src/test/bugs/issue_1515.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { Container, inject, injectable, multiInject } from '../../src/index';
+import { Container, inject, injectable, multiInject } from '../../index';
 
 describe('Issue 1515', () => {
   it('should properly throw on circular dependency', () => {

diff --git a/test/bugs/issue_1518.test.ts → src/test/bugs/issue_1518.test.ts b/test/bugs/issue_1518.test.ts → src/test/bugs/issue_1518.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { Container } from '../../src/index';
+import { Container } from '../../index';
 
 describe('Issue 1518', () => {
   it('should not throw on deactivating undefined singleton values', () => {

diff --git a/test/bugs/issue_1564.test.ts → src/test/bugs/issue_1564.test.ts b/test/bugs/issue_1564.test.ts → src/test/bugs/issue_1564.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { Container, inject, injectable } from '../../src/index';
+import { Container, inject, injectable } from '../../index';
 
 describe('Issue 1564', () => {
   it('should not throw on getting async services bound using "toService"', async () => {

diff --git a/test/bugs/issue_543.test.ts → src/test/bugs/issue_543.test.ts b/test/bugs/issue_543.test.ts → src/test/bugs/issue_543.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import { Container, inject, injectable } from '../../src/index';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import { Container, inject, injectable } from '../../index';
 
 describe('Issue 543', () => {
   it('Should throw correct circular dependency path', () => {

diff --git a/test/bugs/issue_549.test.ts → src/test/bugs/issue_549.test.ts b/test/bugs/issue_549.test.ts → src/test/bugs/issue_549.test.ts
@@ -1,5 +1,5 @@
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import { Container, inject, injectable, interfaces } from '../../src/index';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import { Container, inject, injectable, interfaces } from '../../index';
 
 describe('Issue 549', () => {
   it('Should throw if circular dependencies found with dynamics', () => {

diff --git a/test/bugs/issue_633.test.ts → src/test/bugs/issue_633.test.ts b/test/bugs/issue_633.test.ts → src/test/bugs/issue_633.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { Container, injectable, interfaces } from '../../src/index';
+import { Container, injectable, interfaces } from '../../index';
 
 describe('Issue 633', () => {
   it('Should expose metadata through context', () => {

diff --git a/test/bugs/issue_706.test.ts → src/test/bugs/issue_706.test.ts b/test/bugs/issue_706.test.ts → src/test/bugs/issue_706.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { BindingScopeEnum, Container, injectable } from '../../src/index';
+import { BindingScopeEnum, Container, injectable } from '../../index';
 
 describe('Issue 706', () => {
   it('Should expose BindingScopeEnum as part of the public API', () => {

diff --git a/test/bugs/issue_928.test.ts → src/test/bugs/issue_928.test.ts b/test/bugs/issue_928.test.ts → src/test/bugs/issue_928.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { Container, inject, injectable, optional } from '../../src/index';
+import { Container, inject, injectable, optional } from '../../index';
 
 describe('Issue 928', () => {
   it('should inject the right instances', () => {

diff --git a/test/constants/error_message.test.ts → src/test/constants/error_message.test.ts b/test/constants/error_message.test.ts → src/test/constants/error_message.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
+import * as ERROR_MSGS from '../../constants/error_msgs';
 
 describe('ERROR_MSGS', () => {
   it('Should be able to customize POST_CONSTRUCT_ERROR', () => {

diff --git a/test/container/container.test.ts → src/test/container/container.test.ts b/test/container/container.test.ts → src/test/container/container.test.ts
@@ -1,17 +1,17 @@
 import { assert, expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { inject } from '../../src/annotation/inject';
-import { injectable } from '../../src/annotation/injectable';
-import { postConstruct } from '../../src/annotation/post_construct';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import { BindingScopeEnum } from '../../src/constants/literal_types';
-import { Container } from '../../src/container/container';
-import { ContainerModule } from '../../src/container/container_module';
-import { ModuleActivationStore } from '../../src/container/module_activation_store';
-import type { interfaces } from '../../src/interfaces/interfaces';
-import { getBindingDictionary } from '../../src/planning/planner';
-import { getServiceIdentifierAsString } from '../../src/utils/serialization';
+import { inject } from '../../annotation/inject';
+import { injectable } from '../../annotation/injectable';
+import { postConstruct } from '../../annotation/post_construct';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import { BindingScopeEnum } from '../../constants/literal_types';
+import { Container } from '../../container/container';
+import { ContainerModule } from '../../container/container_module';
+import { ModuleActivationStore } from '../../container/module_activation_store';
+import type { interfaces } from '../../interfaces/interfaces';
+import { getBindingDictionary } from '../../planning/planner';
+import { getServiceIdentifierAsString } from '../../utils/serialization';
 
 type Dictionary = Map<
   interfaces.ServiceIdentifier,

diff --git a/test/container/container_module.test.ts → src/test/container/container_module.test.ts b/test/container/container_module.test.ts → src/test/container/container_module.test.ts
@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { NOT_REGISTERED } from '../../src/constants/error_msgs';
-import { Container } from '../../src/container/container';
+import { NOT_REGISTERED } from '../../constants/error_msgs';
+import { Container } from '../../container/container';
 import {
   AsyncContainerModule,
   ContainerModule,
-} from '../../src/container/container_module';
-import type { interfaces } from '../../src/interfaces/interfaces';
+} from '../../container/container_module';
+import type { interfaces } from '../../interfaces/interfaces';
 
 describe('ContainerModule', () => {
   it('Should be able to set the registry of a container module', () => {

diff --git a/test/container/lookup.test.ts → src/test/container/lookup.test.ts b/test/container/lookup.test.ts → src/test/container/lookup.test.ts
@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 
-import { Binding } from '../../src/bindings/binding';
-import * as ERROR_MSGS from '../../src/constants/error_msgs';
-import { BindingScopeEnum } from '../../src/constants/literal_types';
-import { Lookup } from '../../src/container/lookup';
-import type { interfaces } from '../../src/interfaces/interfaces';
+import { Binding } from '../../bindings/binding';
+import * as ERROR_MSGS from '../../constants/error_msgs';
+import { BindingScopeEnum } from '../../constants/literal_types';
+import { Lookup } from '../../container/lookup';
+import type { interfaces } from '../../interfaces/interfaces';
 
 class ClonableValue<T> implements interfaces.Clonable<ClonableValue<T>> {
   public readonly val: T;

diff --git a/...container/module_activation_store.test.ts → ...container/module_activation_store.test.ts b/...container/module_activation_store.test.ts → ...container/module_activation_store.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import { ModuleActivationStore } from '../../src/container/module_activation_store';
-import type { interfaces } from '../../src/index';
+import { ModuleActivationStore } from '../../container/module_activation_store';
+import type { interfaces } from '../../index';
 
 describe('ModuleActivationStore', () => {
   it('should remove handlers added by the module', () => {