refactor: harmonize barrel usage across all test files

Redirect all direct module imports (utils/Logger, utils/Constants,
worker/WorkerTypes, types/*, charging-station/ChargingStation) to
their respective barrel index.js in test files. Unit tests of the
module itself retain direct imports per convention.

diff --git a/tests/charging-station/AutomaticTransactionGenerator.test.ts b/tests/charging-station/AutomaticTransactionGenerator.test.ts
index 1fa13994f090cf242198e8dbd11a73083ca5fc27..fa8b420b8710fc65b860e986fe8d297bc0af120d 100644 (file)
--- a/tests/charging-station/AutomaticTransactionGenerator.test.ts
+++ b/tests/charging-station/AutomaticTransactionGenerator.test.ts
@@ -17,7 +17,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { AutomaticTransactionGenerator } from '../../src/charging-station/AutomaticTransactionGenerator.js'
 import { BaseError } from '../../src/exception/index.js'

diff --git a/tests/charging-station/ChargingStation-Configuration.test.ts b/tests/charging-station/ChargingStation-Configuration.test.ts
index 9cb521206c69ccbfd13587b9689a5156d9bd6c50..4fa0224addff9b8c3bc498ee6e26ca541ced74e0 100644 (file)
--- a/tests/charging-station/ChargingStation-Configuration.test.ts
+++ b/tests/charging-station/ChargingStation-Configuration.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { AvailabilityType, RegistrationStatusEnumType } from '../../src/types/index.js'
 import { standardCleanup, withMockTimers } from '../helpers/TestLifecycleHelpers.js'

diff --git a/tests/charging-station/ChargingStation-Connectors.test.ts b/tests/charging-station/ChargingStation-Connectors.test.ts
index adfd2747f012601b7e91293f685a9dd0e8d9f890..d342f95e5e6605ce2c0a1cfe8f89e98f3dc4aed2 100644 (file)
--- a/tests/charging-station/ChargingStation-Connectors.test.ts
+++ b/tests/charging-station/ChargingStation-Connectors.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { RegistrationStatusEnumType } from '../../src/types/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'

diff --git a/tests/charging-station/ChargingStation-Lifecycle.test.ts b/tests/charging-station/ChargingStation-Lifecycle.test.ts
index 1f2536d648e48602119f316b5f423b85da3d0482..589fa193db48db36e1d764a3c1842ca3f8d8fb15 100644 (file)
--- a/tests/charging-station/ChargingStation-Lifecycle.test.ts
+++ b/tests/charging-station/ChargingStation-Lifecycle.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 import { cleanupChargingStation, createMockChargingStation } from './ChargingStationTestUtils.js'

diff --git a/tests/charging-station/ChargingStation-Resilience.test.ts b/tests/charging-station/ChargingStation-Resilience.test.ts
index 525c168fa76f523d78b32d3e1d3ddb00b6587368..b77779fc72ca01b8b0a41cb55a73e4149e19bf2f 100644 (file)
--- a/tests/charging-station/ChargingStation-Resilience.test.ts
+++ b/tests/charging-station/ChargingStation-Resilience.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { RegistrationStatusEnumType, RequestCommand } from '../../src/types/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'

diff --git a/tests/charging-station/ChargingStation-Transactions.test.ts b/tests/charging-station/ChargingStation-Transactions.test.ts
index 37ea1bc814f1ea9fcc78b9cfbe4a38d90107fed9..2ee122d790808490d037f5f8a35fd7ed42227e22 100644 (file)
--- a/tests/charging-station/ChargingStation-Transactions.test.ts
+++ b/tests/charging-station/ChargingStation-Transactions.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { OCPPVersion } from '../../src/types/index.js'
 import { standardCleanup, withMockTimers } from '../helpers/TestLifecycleHelpers.js'

diff --git a/tests/charging-station/ChargingStation.test.ts b/tests/charging-station/ChargingStation.test.ts
index d1fa3ad0cd5619d574c434dc5071168039a73a0a..829eabababd774c120b15732e301748a8165fcf3 100644 (file)
--- a/tests/charging-station/ChargingStation.test.ts
+++ b/tests/charging-station/ChargingStation.test.ts
@@ -11,7 +11,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { RegistrationStatusEnumType } from '../../src/types/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'

diff --git a/tests/charging-station/ConfigurationKeyUtils.test.ts b/tests/charging-station/ConfigurationKeyUtils.test.ts
index 65a93d5a01c4ec6391435a6c7547b68aae690828..c61c956659b89a094104e3a11ec333b4fe5d1af1 100644 (file)
--- a/tests/charging-station/ConfigurationKeyUtils.test.ts
+++ b/tests/charging-station/ConfigurationKeyUtils.test.ts
@@ -13,7 +13,7 @@ import {
   getConfigurationKey,
   setConfigurationKeyValue,
 } from '../../src/charging-station/ConfigurationKeyUtils.js'
-import { logger } from '../../src/utils/Logger.js'
+import { logger } from '../../src/utils/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 import { createMockChargingStation } from './ChargingStationTestUtils.js'
 

diff --git a/tests/charging-station/Helpers.test.ts b/tests/charging-station/Helpers.test.ts
index 8ff2332cb69e97b01e189cea8474fe53d323239c..3bba97cff875cf0956a7011a22c444c163e7757f 100644 (file)
--- a/tests/charging-station/Helpers.test.ts
+++ b/tests/charging-station/Helpers.test.ts
@@ -31,7 +31,7 @@ import {
   OCPPVersion,
   type Reservation,
 } from '../../src/types/index.js'
-import { logger } from '../../src/utils/Logger.js'
+import { logger } from '../../src/utils/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 import { TEST_CHARGING_STATION_BASE_NAME } from './ChargingStationTestConstants.js'
 import {

diff --git a/tests/charging-station/IdTagsCache.test.ts b/tests/charging-station/IdTagsCache.test.ts
index 6ff8d73b13d1dec48f0148484efd8634baf19a07..5e5bf08167af3fefc85e74c1d80db54c4938eea1 100644 (file)
--- a/tests/charging-station/IdTagsCache.test.ts
+++ b/tests/charging-station/IdTagsCache.test.ts
@@ -15,7 +15,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { getIdTagsFile } from '../../src/charging-station/Helpers.js'
 import { IdTagsCache } from '../../src/charging-station/IdTagsCache.js'

diff --git a/tests/charging-station/helpers/StationHelpers.ts b/tests/charging-station/helpers/StationHelpers.ts
index 3622e790305cc92fbbcb62a3395f5db56e9a50c8..5010a709fd2e652c38817537f6a31d3f3c088977 100644 (file)
--- a/tests/charging-station/helpers/StationHelpers.ts
+++ b/tests/charging-station/helpers/StationHelpers.ts
@@ -4,7 +4,7 @@
  * Factory functions to create mock ChargingStation instances with isolated dependencies.
  */
 
-import type { ChargingStation } from '../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../src/charging-station/index.js'
 import type {
   ChargingStationInfo,
   ChargingStationOcppConfiguration,

diff --git a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-ChangeAvailability.test.ts b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-ChangeAvailability.test.ts
index 426785aca23f2fa8ac294dcf58a417ad13140f61..e438b68e3efdf5556b3409938211404cee477956 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-ChangeAvailability.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-ChangeAvailability.test.ts
@@ -8,7 +8,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { TestableOCPP16IncomingRequestService } from '../../../../src/charging-station/ocpp/1.6/__testable__/index.js'
 
 import {

diff --git a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStartTransaction.test.ts b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStartTransaction.test.ts
index d3ddeeef5ed63f5c7fd85484e86bb38a9eec7dbf..4fb6e6adf197049666dfdb52c2dd82c28919eb5f 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStartTransaction.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStartTransaction.test.ts
@@ -8,7 +8,7 @@ import type { mock } from 'node:test'
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { RemoteStartTransactionRequest } from '../../../../src/types/index.js'
 
 import { OCPP16IncomingRequestService } from '../../../../src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.js'

diff --git a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStopUnlock.test.ts b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStopUnlock.test.ts
index 56d2e609d3af34f80411b00bc38771c741a06e44..f6b3c1f565c440c9a45c255d29ad3b1cd96bbaa0 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStopUnlock.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-RemoteStopUnlock.test.ts
@@ -8,7 +8,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it, mock } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { TestableOCPP16IncomingRequestService } from '../../../../src/charging-station/ocpp/1.6/__testable__/index.js'
 import type { GenericResponse, RemoteStopTransactionRequest } from '../../../../src/types/index.js'
 

diff --git a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-Reservation.test.ts b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-Reservation.test.ts
index 44b2b04449c8894c8f320f9ec3c7f7395ebf8065..9c0a3a2f22d067d0d9b1385483ef2c4cc0f3a939 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-Reservation.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16IncomingRequestService-Reservation.test.ts
@@ -7,7 +7,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type {
   OCPP16CancelReservationRequest,
   OCPP16ReserveNowRequest,

diff --git a/tests/charging-station/ocpp/1.6/OCPP16Integration-Reservations.test.ts b/tests/charging-station/ocpp/1.6/OCPP16Integration-Reservations.test.ts
index 19f2952f8b0c854103e18be364434c58dbd8dee6..7f33970f54bcb912e50c9b5f610836e3ea698b4f 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16Integration-Reservations.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16Integration-Reservations.test.ts
@@ -8,7 +8,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type {
   OCPP16CancelReservationRequest,
   OCPP16ReserveNowRequest,

diff --git a/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts b/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
index 9b9e5d0de7aa14368964f876112dd03e5fbc898e..63cff80ef765d6edfff6ba73559dddcfd98cf036 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
@@ -9,7 +9,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { TestableOCPP16IncomingRequestService } from '../../../../src/charging-station/ocpp/1.6/__testable__/index.js'
 import type { OCPP16ResponseService } from '../../../../src/charging-station/ocpp/1.6/OCPP16ResponseService.js'
 import type {

diff --git a/tests/charging-station/ocpp/1.6/OCPP16ResponseService-Transactions.test.ts b/tests/charging-station/ocpp/1.6/OCPP16ResponseService-Transactions.test.ts
index f87d80dde73e609289c35fc028bf67a00b325f00..45da19619690cc961edf0e27e3fe34d8c5368e32 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16ResponseService-Transactions.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16ResponseService-Transactions.test.ts
@@ -8,7 +8,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { OCPP16ResponseService } from '../../../../src/charging-station/ocpp/1.6/OCPP16ResponseService.js'
 import type {
   OCPP16StartTransactionRequest,

diff --git a/tests/charging-station/ocpp/1.6/OCPP16TestUtils.ts b/tests/charging-station/ocpp/1.6/OCPP16TestUtils.ts
index b456dff699be98d5968852322ce35d9e64b308aa..9cbc5a752abb4620838a489bc19a7bfd43ed7ffc 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16TestUtils.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16TestUtils.ts
@@ -6,9 +6,8 @@
 
 import { mock } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
-import type { ChargingStationInfo } from '../../../../src/types/ChargingStationInfo.js'
-import type { ConfigurationKey } from '../../../../src/types/ChargingStationOcppConfiguration.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
+import type { ChargingStationInfo, ConfigurationKey } from '../../../../src/types/index.js'
 import type {
   IncomingRequestCommand,
   OCPP16ChargingProfile,
@@ -16,8 +15,7 @@ import type {
   OCPP16SampledValue,
   RequestCommand,
 } from '../../../../src/types/index.js'
-import type { JsonObject } from '../../../../src/types/JsonType.js'
-import type { SampledValueTemplate } from '../../../../src/types/MeasurandPerPhaseSampledValueTemplates.js'
+import type { JsonObject, SampledValueTemplate } from '../../../../src/types/index.js'
 
 import {
   createTestableIncomingRequestService,

diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RemoteStartAuth.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RemoteStartAuth.test.ts
index 97c3f34754a9d3cc4a232ac4f082a25f6af5414f..8df12ffadb882197f66165e88c340f3cc5d1a1f7 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RemoteStartAuth.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RemoteStartAuth.test.ts
@@ -6,8 +6,8 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
-import type { ConnectorStatus } from '../../../../src/types/ConnectorStatus.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
+import type { ConnectorStatus } from '../../../../src/types/index.js'
 
 import { OCPP20IncomingRequestService } from '../../../../src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.js'
 import {

diff --git a/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
index 2ccc4b041490fb11c6aa6b719a6d256e23af1cb3..492fa10599b392c08c26973df80aefc5b1cc6efa 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
@@ -12,7 +12,7 @@ import type {
   OCPP20TransactionEventRequest,
   OCPP20TransactionEventResponse,
 } from '../../../../src/types/index.js'
-import type { UUIDv4 } from '../../../../src/types/UUID.js'
+import type { UUIDv4 } from '../../../../src/types/index.js'
 
 import { OCPP20ResponseService } from '../../../../src/charging-station/ocpp/2.0/OCPP20ResponseService.js'
 import { OCPP20ServiceUtils } from '../../../../src/charging-station/ocpp/2.0/OCPP20ServiceUtils.js'

diff --git a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts
index e54e8f94a621d3009ed15b12a381bfe52e73e0aa..2db7c17a21c703352cd971dbc548a92227f5c185 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts
@@ -13,7 +13,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it, mock } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { EmptyObject } from '../../../../src/types/index.js'
 
 import {

diff --git a/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts b/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
index 4f85642978bc7ede4a45dbc022332a4079a7466c..72529a7ee6e1571a730e794967ef22b45b501f84 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
@@ -4,13 +4,13 @@
  */
 import { mock } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { ChargingStationWithCertificateManager } from '../../../../src/charging-station/ocpp/2.0/OCPP20CertificateManager.js'
-import type { ConfigurationKey } from '../../../../src/types/ChargingStationOcppConfiguration.js'
-import type { EmptyObject } from '../../../../src/types/EmptyObject.js'
 import type {
   CertificateHashDataChainType,
   CertificateHashDataType,
+  ConfigurationKey,
+  EmptyObject,
   GetCertificateIdUseEnumType,
   JsonType,
   OCPP20IdTokenType,

diff --git a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
index 0b8fb2282557688715a2505f7964578c85d67aeb..e85094ec3c23c571349026886c75c5e4720d7bf8 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
@@ -7,7 +7,7 @@ import { millisecondsToSeconds } from 'date-fns'
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 
 import {
   deleteConfigurationKey,

diff --git a/tests/charging-station/ocpp/OCPPServiceUtils-connectorStatus.test.ts b/tests/charging-station/ocpp/OCPPServiceUtils-connectorStatus.test.ts
index 27e92439f2792fee4ba0ba63da186ba7d66dba26..b196e5d59872383d63d46b7c2b70b58692c4e6f3 100644 (file)
--- a/tests/charging-station/ocpp/OCPPServiceUtils-connectorStatus.test.ts
+++ b/tests/charging-station/ocpp/OCPPServiceUtils-connectorStatus.test.ts
@@ -10,7 +10,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, describe, it, mock } from 'node:test'
 
-import type { ChargingStation } from '../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../src/charging-station/index.js'
 import type { Reservation } from '../../../src/types/index.js'
 import type { MockChargingStationOptions } from '../helpers/StationHelpers.js'
 

diff --git a/tests/charging-station/ocpp/OCPPServiceUtils-pure.test.ts b/tests/charging-station/ocpp/OCPPServiceUtils-pure.test.ts
index ac097306c626d428560392cf091ab1d795fc8fb2..f74b6c098c636867c12d6234bc1939e4fdb63bf7 100644 (file)
--- a/tests/charging-station/ocpp/OCPPServiceUtils-pure.test.ts
+++ b/tests/charging-station/ocpp/OCPPServiceUtils-pure.test.ts
@@ -14,7 +14,7 @@ import type { ErrorObject } from 'ajv'
 import assert from 'node:assert/strict'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../src/charging-station/index.js'
 
 import {
   ajvErrorsToErrorType,

diff --git a/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts b/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
index 5ecc8d354d01b5ba633e93dc7e8dfc22ba5991e3..c2c155709463a9c4bf01ac74e79e5616edf066e5 100644 (file)
--- a/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
+++ b/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
@@ -12,7 +12,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../src/charging-station/index.js'
 
 import { OCPPServiceUtils } from '../../../src/charging-station/ocpp/OCPPServiceUtils.js'
 import { IncomingRequestCommand, MessageTrigger, RequestCommand } from '../../../src/types/index.js'

diff --git a/tests/charging-station/ocpp/auth/OCPPAuthIntegration.test.ts b/tests/charging-station/ocpp/auth/OCPPAuthIntegration.test.ts
index ae45818f8caaf6aa9fc836139e06dc335dd71cb5..4c3ed7d6a10d84938d76f2a65ba0629524e56d17 100644 (file)
--- a/tests/charging-station/ocpp/auth/OCPPAuthIntegration.test.ts
+++ b/tests/charging-station/ocpp/auth/OCPPAuthIntegration.test.ts
@@ -6,7 +6,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { LocalAuthEntry } from '../../../../src/charging-station/ocpp/auth/interfaces/OCPPAuthService.js'
 
 import { InMemoryAuthCache } from '../../../../src/charging-station/ocpp/auth/cache/InMemoryAuthCache.js'

diff --git a/tests/charging-station/ocpp/auth/adapters/OCPP16AuthAdapter.test.ts b/tests/charging-station/ocpp/auth/adapters/OCPP16AuthAdapter.test.ts
index be453597459a577e10b48120d278999351334406..b7f22f2af34bd8ead6211f0177a7ebb7412fdd8b 100644 (file)
--- a/tests/charging-station/ocpp/auth/adapters/OCPP16AuthAdapter.test.ts
+++ b/tests/charging-station/ocpp/auth/adapters/OCPP16AuthAdapter.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 import type { OCPP16AuthorizeResponse } from '../../../../../src/types/index.js'
 
 import { OCPP16AuthAdapter } from '../../../../../src/charging-station/ocpp/auth/adapters/OCPP16AuthAdapter.js'

diff --git a/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts b/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
index 1619637c8009ffbc2b7d2f01379af8063ef8b2d9..3805b2f31695a8bd6b1ab20df3d5ea619d93dc3a 100644 (file)
--- a/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
+++ b/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it, mock } from 'node:test'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 
 import { OCPP20ServiceUtils } from '../../../../../src/charging-station/ocpp/2.0/OCPP20ServiceUtils.js'
 import { OCPP20AuthAdapter } from '../../../../../src/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.js'

diff --git a/tests/charging-station/ocpp/auth/helpers/MockFactories.ts b/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
index 1a100b58085ac034637fcea57de9f59f1d0a4899..ebf53db33971e4a3ee674f18f875346d4658cf77 100644 (file)
--- a/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
+++ b/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
@@ -4,7 +4,7 @@
  */
 import assert from 'node:assert/strict'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 import type {
   AuthCache,
   LocalAuthEntry,

diff --git a/tests/charging-station/ocpp/auth/services/OCPPAuthServiceFactory.test.ts b/tests/charging-station/ocpp/auth/services/OCPPAuthServiceFactory.test.ts
index 645a7292005bc9a8dc214808c3a381a7534bfa62..93ca23e72461d91ac9149a5fbadbd19e77e7cb2e 100644 (file)
--- a/tests/charging-station/ocpp/auth/services/OCPPAuthServiceFactory.test.ts
+++ b/tests/charging-station/ocpp/auth/services/OCPPAuthServiceFactory.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 
 import { OCPPAuthServiceFactory } from '../../../../../src/charging-station/ocpp/auth/services/OCPPAuthServiceFactory.js'
 import { OCPPVersion } from '../../../../../src/types/index.js'

diff --git a/tests/charging-station/ocpp/auth/services/OCPPAuthServiceImpl.test.ts b/tests/charging-station/ocpp/auth/services/OCPPAuthServiceImpl.test.ts
index 5285371be8ca9841598392ce9fc8b5ed10189312..b3ec246495e062e2b05630e62c8b8148f12bce41 100644 (file)
--- a/tests/charging-station/ocpp/auth/services/OCPPAuthServiceImpl.test.ts
+++ b/tests/charging-station/ocpp/auth/services/OCPPAuthServiceImpl.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 import type { OCPPAuthService } from '../../../../../src/charging-station/ocpp/auth/interfaces/OCPPAuthService.js'
 
 import { OCPPAuthServiceImpl } from '../../../../../src/charging-station/ocpp/auth/services/OCPPAuthServiceImpl.js'

diff --git a/tests/charging-station/ocpp/auth/strategies/CertificateAuthStrategy.test.ts b/tests/charging-station/ocpp/auth/strategies/CertificateAuthStrategy.test.ts
index 40258482639ea7f3ea7b6ed8a7ad18cd6c23cffc..b45da9a299494c5fbb8fa9adb474def64a0772c0 100644 (file)
--- a/tests/charging-station/ocpp/auth/strategies/CertificateAuthStrategy.test.ts
+++ b/tests/charging-station/ocpp/auth/strategies/CertificateAuthStrategy.test.ts
@@ -5,7 +5,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../../../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../../../../src/charging-station/index.js'
 import type { OCPPAuthAdapter } from '../../../../../src/charging-station/ocpp/auth/interfaces/OCPPAuthService.js'
 
 import { CertificateAuthStrategy } from '../../../../../src/charging-station/ocpp/auth/strategies/CertificateAuthStrategy.js'

diff --git a/tests/exception/OCPPError.test.ts b/tests/exception/OCPPError.test.ts
index 4c97b2dc017aa08d0c88354e38c72ddbb958e97a..a3b8cdadeb3aac24adfa97d2f1d6c86b688f5fda 100644 (file)
--- a/tests/exception/OCPPError.test.ts
+++ b/tests/exception/OCPPError.test.ts
@@ -8,7 +8,7 @@ import { afterEach, describe, it } from 'node:test'
 import { BaseError } from '../../src/exception/BaseError.js'
 import { OCPPError } from '../../src/exception/OCPPError.js'
 import { ErrorType, RequestCommand } from '../../src/types/index.js'
-import { Constants } from '../../src/utils/Constants.js'
+import { Constants } from '../../src/utils/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 
 await describe('OCPPError', async () => {

diff --git a/tests/helpers/OCPPAuthIntegrationTest.ts b/tests/helpers/OCPPAuthIntegrationTest.ts
index 0f0b38522f352909c7f57411f0b56f752aefb6e9..e2afb74981377101178a68b2dac0575d41b9cf08 100644 (file)
--- a/tests/helpers/OCPPAuthIntegrationTest.ts
+++ b/tests/helpers/OCPPAuthIntegrationTest.ts
@@ -1,4 +1,4 @@
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 import type {
   AuthConfiguration,
   AuthorizationResult,
@@ -14,7 +14,7 @@ import {
   IdentifierType,
 } from '../../src/charging-station/ocpp/auth/types/AuthTypes.js'
 import { OCPPVersion } from '../../src/types/index.js'
-import { logger } from '../../src/utils/Logger.js'
+import { logger } from '../../src/utils/index.js'
 
 export class OCPPAuthIntegrationTest {
   private authService: OCPPAuthServiceImpl

diff --git a/tests/helpers/TestLifecycleHelpers.ts b/tests/helpers/TestLifecycleHelpers.ts
index 883c063969e8ac754e591f45deadb6c188ab0bbe..85102971f3969ffb179ec7e458160ba224d65b09 100644 (file)
--- a/tests/helpers/TestLifecycleHelpers.ts
+++ b/tests/helpers/TestLifecycleHelpers.ts
@@ -27,7 +27,7 @@
 
 import { mock } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import { MockIdTagsCache, MockSharedLRUCache } from '../charging-station/mocks/MockCaches.js'
 

diff --git a/tests/performance/storage/MikroOrmStorage.test.ts b/tests/performance/storage/MikroOrmStorage.test.ts
index 494d070e9ab7d08504519890dce5aef6352d5bb1..5a0fc6d264e953bd09e4543d0a4e2a12d62cd19a 100644 (file)
--- a/tests/performance/storage/MikroOrmStorage.test.ts
+++ b/tests/performance/storage/MikroOrmStorage.test.ts
@@ -10,8 +10,7 @@ import { afterEach, beforeEach, describe, it } from 'node:test'
 import { MikroOrmStorage } from '../../../src/performance/storage/MikroOrmStorage.js'
 import { StorageType } from '../../../src/types/index.js'
 import { PerformanceRecord } from '../../../src/types/orm/entities/PerformanceRecord.js'
-import { Constants } from '../../../src/utils/index.js'
-import { logger } from '../../../src/utils/Logger.js'
+import { Constants, logger } from '../../../src/utils/index.js'
 import { standardCleanup } from '../../helpers/TestLifecycleHelpers.js'
 import { buildTestStatistics } from './StorageTestHelpers.js'
 

diff --git a/tests/performance/storage/MongoDBStorage.test.ts b/tests/performance/storage/MongoDBStorage.test.ts
index c65bdfd593788335b626535743cdf0edebff46ea..d365fce7e0ab5445bb29805e132c5030d47825fd 100644 (file)
--- a/tests/performance/storage/MongoDBStorage.test.ts
+++ b/tests/performance/storage/MongoDBStorage.test.ts
@@ -6,8 +6,7 @@ import assert from 'node:assert/strict'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
 import { MongoDBStorage } from '../../../src/performance/storage/MongoDBStorage.js'
-import { Constants } from '../../../src/utils/index.js'
-import { logger } from '../../../src/utils/Logger.js'
+import { Constants, logger } from '../../../src/utils/index.js'
 import { standardCleanup } from '../../helpers/TestLifecycleHelpers.js'
 import { buildTestStatistics } from './StorageTestHelpers.js'
 

diff --git a/tests/utils/ChargingStationConfigurationUtils.test.ts b/tests/utils/ChargingStationConfigurationUtils.test.ts
index b3d6bafa12b95f0a51ad073612a8882c4f3f28c0..aa32c7c01101055b30c1bc1d82028f0fb836e30e 100644 (file)
--- a/tests/utils/ChargingStationConfigurationUtils.test.ts
+++ b/tests/utils/ChargingStationConfigurationUtils.test.ts
@@ -8,7 +8,7 @@
 import assert from 'node:assert/strict'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 import type { ConnectorStatus, EvseStatus } from '../../src/types/index.js'
 
 import { AvailabilityType } from '../../src/types/index.js'

diff --git a/tests/utils/Configuration.test.ts b/tests/utils/Configuration.test.ts
index 281278e6e6c2223d1e7e49c588ae594c2cc6b082..4917bd5a83011ce645f091f9b8ae1fd8bfcf455a 100644 (file)
--- a/tests/utils/Configuration.test.ts
+++ b/tests/utils/Configuration.test.ts
@@ -29,7 +29,7 @@ import {
   SupervisionUrlDistribution,
 } from '../../src/types/index.js'
 import { Configuration } from '../../src/utils/index.js'
-import { WorkerProcessType } from '../../src/worker/WorkerTypes.js'
+import { WorkerProcessType } from '../../src/worker/index.js'
 import { standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 
 /**

diff --git a/tests/utils/ErrorUtils.test.ts b/tests/utils/ErrorUtils.test.ts
index 8976c3d8b629bd7c917810a5968409c65cd50540..efd50a59dda220b6cdd54f460ce8fd654aa447b3 100644 (file)
--- a/tests/utils/ErrorUtils.test.ts
+++ b/tests/utils/ErrorUtils.test.ts
@@ -6,7 +6,7 @@ import assert from 'node:assert/strict'
 import process from 'node:process'
 import { afterEach, beforeEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 
 import {
   FileType,
@@ -22,7 +22,7 @@ import {
   handleUncaughtException,
   handleUnhandledRejection,
 } from '../../src/utils/ErrorUtils.js'
-import { logger } from '../../src/utils/Logger.js'
+import { logger } from '../../src/utils/index.js'
 import { TEST_CHARGING_STATION_BASE_NAME } from '../charging-station/ChargingStationTestConstants.js'
 import { createMockChargingStation } from '../charging-station/ChargingStationTestUtils.js'
 import {

diff --git a/tests/utils/FileUtils.test.ts b/tests/utils/FileUtils.test.ts
index ef9eb051c08731b45a39b5d2febee43c0a3dbef8..519d95c2488c5ce4eb6cd67daa4aea39500f95e5 100644 (file)
--- a/tests/utils/FileUtils.test.ts
+++ b/tests/utils/FileUtils.test.ts
@@ -10,7 +10,7 @@ import { afterEach, describe, it } from 'node:test'
 
 import { FileType } from '../../src/types/index.js'
 import { watchJsonFile } from '../../src/utils/FileUtils.js'
-import { logger } from '../../src/utils/Logger.js'
+import { logger } from '../../src/utils/index.js'
 import { createLoggerMocks, standardCleanup } from '../helpers/TestLifecycleHelpers.js'
 
 const noop: WatchListener<string> = () => {

diff --git a/tests/utils/MessageChannelUtils.test.ts b/tests/utils/MessageChannelUtils.test.ts
index 480f29c7a4803271e438de3f6a2eecc0ec69ad32..293fec2f8f501656bdc0e801df3a7dca538cc6a7 100644 (file)
--- a/tests/utils/MessageChannelUtils.test.ts
+++ b/tests/utils/MessageChannelUtils.test.ts
@@ -7,7 +7,7 @@ import { CircularBuffer } from 'mnemonist'
 import assert from 'node:assert/strict'
 import { afterEach, describe, it } from 'node:test'
 
-import type { ChargingStation } from '../../src/charging-station/ChargingStation.js'
+import type { ChargingStation } from '../../src/charging-station/index.js'
 import type { Statistics, TimestampedData } from '../../src/types/index.js'
 
 import { ChargingStationWorkerMessageEvents } from '../../src/types/index.js'

diff --git a/tests/utils/Utils.test.ts b/tests/utils/Utils.test.ts
index 38cc477847dfff37e53324e3732aeb3a0f66c633..eda6abb6deeea6ff1c5f9a814d84e24c17f60206 100644 (file)
--- a/tests/utils/Utils.test.ts
+++ b/tests/utils/Utils.test.ts
@@ -16,7 +16,7 @@ import type { TimestampedData } from '../../src/types/index.js'
 
 import { JSRuntime, runtime } from '../../scripts/runtime.js'
 import { MapStringifyFormat } from '../../src/types/index.js'
-import { Constants } from '../../src/utils/Constants.js'
+import { Constants } from '../../src/utils/index.js'
 import {
   clampToSafeTimerValue,
   clone,