refactor: standardize chai imports and fix module paths across test files

UrielCh · UrielCh · commit 3ee80bc46f26 · 2025-07-01T11:04:18.000+02:00
diff --git a/test/adb/command/host-serial/waitfordevice.ts b/test/adb/command/host-serial/waitfordevice.ts
@@ -1,7 +1,7 @@
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import { WaitForDeviceCommand } from '../../../../src/adb/command/host-serial/index.js';
diff --git a/test/adb/command/host-transport/Tester.ts b/test/adb/command/host-transport/Tester.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import Command from '../../../../src/adb/command.js';
diff --git a/test/adb/command/host-transport/clear.ts b/test/adb/command/host-transport/clear.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import ClearCommand from '../../../../src/adb/command/host-transport/clear.js';
diff --git a/test/adb/command/host-transport/framebuffer.ts b/test/adb/command/host-transport/framebuffer.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import FrameBufferCommand from '../../../../src/adb/command/host-transport/framebuffer.js';
diff --git a/test/adb/command/host-transport/getfeatures.ts b/test/adb/command/host-transport/getfeatures.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import GetFeaturesCommand from '../../../../src/adb/command/host-transport/getfeatures.js';
diff --git a/test/adb/command/host-transport/getpackages.ts b/test/adb/command/host-transport/getpackages.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import GetPackagesCommand from '../../../../src/adb/command/host-transport/getpackages.js';
 import Tester from './Tester.js';
 const t = new Tester(GetPackagesCommand);
diff --git a/test/adb/command/host-transport/getproperties.ts b/test/adb/command/host-transport/getproperties.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import GetPropertiesCommand from '../../../../src/adb/command/host-transport/getproperties.js';
 import Tester from './Tester.js';
 const t = new Tester(GetPropertiesCommand);
diff --git a/test/adb/command/host-transport/install.ts b/test/adb/command/host-transport/install.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import InstallCommand from '../../../../src/adb/command/host-transport/install.js';
diff --git a/test/adb/command/host-transport/ipRoute.ts b/test/adb/command/host-transport/ipRoute.ts
@@ -1,7 +1,7 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
-import { IpRouteCommand } from '../../../../src/adb/command/host-transport.js';
+use(simonChai);
+import IpRouteCommand from '../../../../src/adb/command/host-transport/ipRoute.js';
 import Tester from './Tester.js';
 
 const t = new Tester(IpRouteCommand);
diff --git a/test/adb/command/host-transport/ipRules.ts b/test/adb/command/host-transport/ipRules.ts
@@ -1,7 +1,7 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
-import { IpRuleCommand } from '../../../../src/adb/command/host-transport.js';
+use(simonChai);
+import IpRuleCommand from '../../../../src/adb/command/host-transport/ipRule.js';
 import Tester from './Tester.js';
 
 const t = new Tester(IpRuleCommand);
diff --git a/test/adb/command/host-transport/isinstalled.ts b/test/adb/command/host-transport/isinstalled.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 
diff --git a/test/adb/command/host-transport/local.ts b/test/adb/command/host-transport/local.ts
@@ -1,7 +1,7 @@
 import Stream from 'node:stream';
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import LocalCommand from '../../../../src/adb/command/host-transport/local.js';
diff --git a/test/adb/command/host-transport/log.ts b/test/adb/command/host-transport/log.ts
@@ -1,7 +1,7 @@
 import Stream from 'node:stream';
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import LogCommand from '../../../../src/adb/command/host-transport/log.js';
diff --git a/test/adb/command/host-transport/logcat.ts b/test/adb/command/host-transport/logcat.ts
@@ -1,7 +1,7 @@
 import Stream from 'node:stream';
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import Parser from '../../../../src/adb/parser.js';
diff --git a/test/adb/command/host-transport/monkey.ts b/test/adb/command/host-transport/monkey.ts
@@ -1,8 +1,8 @@
 import Stream from 'node:stream';
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import MonkeyCommand from '../../../../src/adb/command/host-transport/monkey.js';
diff --git a/test/adb/command/host-transport/ps.ts b/test/adb/command/host-transport/ps.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import PsCommand from '../../../../src/adb/command/host-transport/ps.js';
 import Tester from './Tester.js';
 const t = new Tester(PsCommand);
diff --git a/test/adb/command/host-transport/reboot.ts b/test/adb/command/host-transport/reboot.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import RebootCommand from '../../../../src/adb/command/host-transport/reboot.js';
diff --git a/test/adb/command/host-transport/remount.ts b/test/adb/command/host-transport/remount.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import RemountCommand from '../../../../src/adb/command/host-transport/remount.js';
diff --git a/test/adb/command/host-transport/root.ts b/test/adb/command/host-transport/root.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import RootCommand from '../../../../src/adb/command/host-transport/root.js';
diff --git a/test/adb/command/host-transport/screencap.ts b/test/adb/command/host-transport/screencap.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import Parser from '../../../../src/adb/parser.js';
diff --git a/test/adb/command/host-transport/serviceCall.ts b/test/adb/command/host-transport/serviceCall.ts
@@ -1,7 +1,7 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-import { ServiceCallCommand, ParcelReader } from '../../../../src/.js';
-Chai.use(simonChai);
+import { ServiceCallCommand, ParcelReader } from '../../../../src/index.js';
+use(simonChai);
 import Tester from './Tester.js';
 const t = new Tester(ServiceCallCommand);
 
diff --git a/test/adb/command/host-transport/shell.ts b/test/adb/command/host-transport/shell.ts
@@ -1,8 +1,7 @@
 import { setImmediate } from "node:timers";
-
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import { AdbFailError } from '../../../../src/index.js';
diff --git a/test/adb/command/host-transport/startactivity.ts b/test/adb/command/host-transport/startactivity.ts
@@ -1,7 +1,7 @@
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import StartActivityCommand from '../../../../src/adb/command/host-transport/startactivity.js';
diff --git a/test/adb/command/host-transport/startservice.ts b/test/adb/command/host-transport/startservice.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import StartServiceCommand from '../../../../src/adb/command/host-transport/startservice.js';
diff --git a/test/adb/command/host-transport/sync.ts b/test/adb/command/host-transport/sync.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import SyncCommand from '../../../../src/adb/command/host-transport/sync.js';
diff --git a/test/adb/command/host-transport/tcp.ts b/test/adb/command/host-transport/tcp.ts
@@ -1,7 +1,7 @@
 import Stream from 'node:stream';
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import TcpCommand from '../../../../src/adb/command/host-transport/tcp.js';
diff --git a/test/adb/command/host-transport/tcpip.ts b/test/adb/command/host-transport/tcpip.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import TcpIpCommand from '../../../../src/adb/command/host-transport/tcpip.js';
diff --git a/test/adb/command/host-transport/uninstall.ts b/test/adb/command/host-transport/uninstall.ts
@@ -1,7 +1,7 @@
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import { AdbPrematureEOFError } from '../../../../src/index.js';
diff --git a/test/adb/command/host-transport/usb.ts b/test/adb/command/host-transport/usb.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import UsbCommand from '../../../../src/adb/command/host-transport/usb.js';
diff --git a/test/adb/command/host-transport/waitbootcomplete.ts b/test/adb/command/host-transport/waitbootcomplete.ts
@@ -1,6 +1,6 @@
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import { AdbPrematureEOFError } from '../../../../src/index.js';
diff --git a/test/adb/command/host/connect.ts b/test/adb/command/host/connect.ts
@@ -1,7 +1,7 @@
-import Chai, { expect } from 'chai';
+import {use, expect } from 'chai';
 import simonChai from 'sinon-chai';
 import { setImmediate } from "node:timers";
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import HostConnectCommand from '../../../../src/adb/command/host/HostConnectCommand.js';
diff --git a/test/adb/command/host/disconnect.ts b/test/adb/command/host/disconnect.ts
@@ -1,7 +1,7 @@
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import {use, expect } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import HostDisconnectCommand from '../../../../src/adb/command/host/HostDisconnectCommand.js';
diff --git a/test/adb/command/host/version.ts b/test/adb/command/host/version.ts
@@ -1,7 +1,7 @@
 import { setImmediate } from "node:timers";
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import MockConnection from '../../../mock/connection.js';
 import Protocol from '../../../../src/adb/protocol.js';
 import HostVersionCommand from '../../../../src/adb/command/host/HostVersionCommand.js';
diff --git a/test/adb/framebuffer/rgbtransform.ts b/test/adb/framebuffer/rgbtransform.ts
@@ -1,9 +1,9 @@
 import Stream from 'node:stream';
-import Chai, { expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
-Chai.use(simonChai);
+use(simonChai);
 import RgbTransform from '../../../src/adb/framebuffer/rgbtransform.js';
-import { FramebufferMeta } from '../../../src.js';
+import { FramebufferMeta } from '../../../src/index.js';
 
 describe('RgbTransform', () => {
     it('should transform BGRA into RGB', (done) => {
diff --git a/test/adb/linetransform.ts b/test/adb/linetransform.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer';
 import Stream from 'node:stream';
 import simonChai from 'sinon-chai';
-import { use, expect } from 'chai';
+import { expect, use } from 'chai';
 import LineTransform from '../../src/adb/linetransform.js';
 import MockDuplex from '../mock/duplex.js';
 use(simonChai);
diff --git a/test/adb/parser.ts b/test/adb/parser.ts
@@ -1,5 +1,5 @@
 import Stream from 'node:stream';
-import { use, expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
 import Parser from '../../src/adb/parser';
 import { AdbFailError, AdbPrematureEOFError, AdbUnexpectedDataError } from '../../src/adb/errors';
diff --git a/test/adb/tracker.ts b/test/adb/tracker.ts
@@ -1,6 +1,6 @@
 import Stream, { Transform } from 'node:stream';
 import Sinon from 'sinon';
-import { use, expect } from 'chai';
+import { expect, use } from 'chai';
 import sinonChai from 'sinon-chai';
 import Parser from '../../src/adb/parser.ts';
 import Tracker from '../../src/adb/tracker.ts';
diff --git a/test/adb/util.ts b/test/adb/util.ts
@@ -1,5 +1,5 @@
 import Stream from 'node:stream';
-import { use, expect } from 'chai';
+import { expect, use } from 'chai';
 import simonChai from 'sinon-chai';
 import Utils from '../../src/adb/utils.ts';
 use(simonChai); 
