@iobroker/testing 2.5.0 → 2.5.4

package/CHANGELOG.md

@@ -4,7 +4,16 @@
 	PLACEHOLDER for next version:
 	## __WORK IN PROGRESS__
 -->
-## 2.5.0 (2021-09-05)
+## 2.5.4 (2022-02-02)
+* Modifying ioBroker databases now uses the same methods that JS-Controller uses internally. This ensures that the testing is compatible with the `jsonl` database format.
+* Testing adapters with adapter dependencies that try to access the databases during installation now works.
+
+## 2.5.2 (2021-09-18)
+* Fix: `adminUI.config` is now respected for the config UI check and JSON config is allowed too
+* Updated dependencies
+* Modernized build process
+
+## 2.5.1 (2021-09-05)
 * We now use the nightly js-controller dev builds instead of GitHub installation
 
 ## 2.4.4 (2021-03-14)

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 AlCalzone <d.griesel@gmx.net>
+Copyright (c) 2022 AlCalzone <d.griesel@gmx.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/lib/adapterTools.js

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,7 +28,7 @@ const typeguards_1 = require("alcalzone-shared/typeguards");
 const debug_1 = __importDefault(require("debug"));
 const fs_extra_1 = require("fs-extra");
 const path = __importStar(require("path"));
-const debug = debug_1.default("testing:unit:adapterTools");
+const debug = (0, debug_1.default)("testing:unit:adapterTools");
 /**
  * Loads an adapter's package.json
  * @param adapterDir The directory the adapter resides in
@@ -64,32 +55,30 @@ exports.adapterShouldSupportCompactMode = adapterShouldSupportCompactMode;
  * Locates an adapter's main file
  * @param adapterDir The directory the adapter resides in
  */
-function locateAdapterMainFile(adapterDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        debug(`locating adapter main file in ${adapterDir}...`);
-        const ioPackage = loadIoPackage(adapterDir);
-        const npmPackage = loadNpmPackage(adapterDir);
-        // First look for the file defined in io-package.json or package.json or use "main.js" as a fallback
-        const mainFile = typeof ioPackage.common.main === "string"
-            ? ioPackage.common.main
-            : typeof npmPackage.main === "string"
-                ? npmPackage.main
-                : "main.js";
-        let ret = path.join(adapterDir, mainFile);
-        debug(`  => trying ${ret}`);
-        if (yield fs_extra_1.pathExists(ret)) {
-            debug(`  => found ${mainFile}`);
-            return ret;
-        }
-        // If both don't exist, JS-Controller uses <adapter name>.js as another fallback
-        ret = path.join(adapterDir, ioPackage.common.name + ".js");
-        debug(`  => trying ${ret}`);
-        if (yield fs_extra_1.pathExists(ret)) {
-            debug(`  => found ${mainFile}`);
-            return ret;
-        }
-        throw new Error(`The adapter main file was not found in ${adapterDir}`);
-    });
+async function locateAdapterMainFile(adapterDir) {
+    debug(`locating adapter main file in ${adapterDir}...`);
+    const ioPackage = loadIoPackage(adapterDir);
+    const npmPackage = loadNpmPackage(adapterDir);
+    // First look for the file defined in io-package.json or package.json or use "main.js" as a fallback
+    const mainFile = typeof ioPackage.common.main === "string"
+        ? ioPackage.common.main
+        : typeof npmPackage.main === "string"
+            ? npmPackage.main
+            : "main.js";
+    let ret = path.join(adapterDir, mainFile);
+    debug(`  => trying ${ret}`);
+    if (await (0, fs_extra_1.pathExists)(ret)) {
+        debug(`  => found ${mainFile}`);
+        return ret;
+    }
+    // If both don't exist, JS-Controller uses <adapter name>.js as another fallback
+    ret = path.join(adapterDir, ioPackage.common.name + ".js");
+    debug(`  => trying ${ret}`);
+    if (await (0, fs_extra_1.pathExists)(ret)) {
+        debug(`  => found ${mainFile}`);
+        return ret;
+    }
+    throw new Error(`The adapter main file was not found in ${adapterDir}`);
 }
 exports.locateAdapterMainFile = locateAdapterMainFile;
 /**
@@ -141,12 +130,12 @@ exports.getAdapterFullName = getAdapterFullName;
 function getAdapterDependencies(adapterDir) {
     const ioPackage = loadIoPackage(adapterDir);
     const ret = {};
-    if (typeguards_1.isArray(ioPackage.common.dependencies)) {
+    if ((0, typeguards_1.isArray)(ioPackage.common.dependencies)) {
         for (const dep of ioPackage.common.dependencies) {
             if (typeof dep === "string") {
                 ret[dep] = "latest";
             }
-            else if (typeguards_1.isObject(dep)) {
+            else if ((0, typeguards_1.isObject)(dep)) {
                 const key = Object.keys(dep)[0];
                 if (key)
                     ret[key] = dep[key] || "latest";

package/build/lib/executeCommand.js

@@ -7,10 +7,10 @@ const isWindows = /^win/.test(process.platform);
 function executeCommand(command, argsOrOptions, options) {
     return new Promise((resolve) => {
         let args;
-        if (typeguards_1.isArray(argsOrOptions)) {
+        if ((0, typeguards_1.isArray)(argsOrOptions)) {
             args = argsOrOptions;
         }
-        else if (typeguards_1.isObject(argsOrOptions)) {
+        else if ((0, typeguards_1.isObject)(argsOrOptions)) {
             // no args were given
             options = argsOrOptions;
         }
@@ -24,7 +24,6 @@ function executeCommand(command, argsOrOptions, options) {
                 options.stdout || process.stdout,
                 options.stderr || process.stderr,
             ],
-            // @ts-ignore This option exists starting with NodeJS 8
             windowsHide: true,
         };
         if (options.cwd != null)
@@ -45,7 +44,7 @@ function executeCommand(command, argsOrOptions, options) {
         try {
             let bufferedStdout;
             let bufferedStderr;
-            const cmd = child_process_1.spawn(command, args, spawnOptions).on("close", (code, signal) => {
+            const cmd = (0, child_process_1.spawn)(command, args, spawnOptions).on("close", (code, signal) => {
                 resolve({
                     exitCode: code !== null && code !== void 0 ? code : undefined,
                     signal: signal !== null && signal !== void 0 ? signal : undefined,

package/build/tests/index.js

@@ -8,6 +8,7 @@ const createMocks_1 = require("./unit/harness/createMocks");
 const mockDatabase_1 = require("./unit/mocks/mockDatabase");
 var harness_1 = require("./integration/lib/harness");
 Object.defineProperty(exports, "IntegrationTestHarness", { enumerable: true, get: function () { return harness_1.TestHarness; } });
+var mockAdapter_1 = require("./unit/mocks/mockAdapter");
 var mockDatabase_2 = require("./unit/mocks/mockDatabase");
 Object.defineProperty(exports, "MockDatabase", { enumerable: true, get: function () { return mockDatabase_2.MockDatabase; } });
 /** Predefined test sets */

package/build/tests/integration/index.js

@@ -18,118 +18,101 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testAdapter = void 0;
 const async_1 = require("alcalzone-shared/async");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const adapterTools_1 = require("../../lib/adapterTools");
-const executeCommand_1 = require("../../lib/executeCommand");
 const adapterSetup_1 = require("./lib/adapterSetup");
 const controllerSetup_1 = require("./lib/controllerSetup");
 const dbConnection_1 = require("./lib/dbConnection");
 const harness_1 = require("./lib/harness");
 function testAdapter(adapterDir, options = {}) {
-    const appName = adapterTools_1.getAppName(adapterDir);
-    const adapterName = adapterTools_1.getAdapterName(adapterDir);
+    const appName = (0, adapterTools_1.getAppName)(adapterDir);
+    const adapterName = (0, adapterTools_1.getAdapterName)(adapterDir);
     const testDir = path.join(os.tmpdir(), `test-${appName}.${adapterName}`);
+    /** This db connection is only used for the lifetime of a test and then re-created */
+    let dbConnection;
     let harness;
-    const dbConnection = new dbConnection_1.DBConnection(appName, testDir);
-    const controllerSetup = new controllerSetup_1.ControllerSetup(adapterDir, testDir, dbConnection);
+    const controllerSetup = new controllerSetup_1.ControllerSetup(adapterDir, testDir);
     console.log();
     console.log(`Running tests in ${testDir}`);
     console.log();
     describe(`Test the adapter (in a live environment)`, () => {
         let objectsBackup;
         let statesBackup;
-        before(function () {
-            return __awaiter(this, void 0, void 0, function* () {
-                // Installation may take a while - especially if rsa-compat needs to be installed
-                const oneMinute = 60000;
-                this.timeout(30 * oneMinute);
-                if (yield controllerSetup.isJsControllerRunning()) {
-                    throw new Error("JS-Controller is already running! Stop it for the first test run and try again!");
-                }
-                const adapterSetup = new adapterSetup_1.AdapterSetup(adapterDir, testDir, dbConnection);
-                // First we need to copy all files and execute an npm install
-                yield controllerSetup.prepareTestDir();
-                yield adapterSetup.copyAdapterFilesToTestDir();
-                // Remember if JS-Controller is installed already. If so, we need to call setup first later
-                const wasJsControllerInstalled = yield controllerSetup.isJsControllerInstalled();
-                // Call npm install
-                yield executeCommand_1.executeCommand("npm", ["i", "--production"], {
-                    cwd: testDir,
-                });
-                // Prepare/clean the databases and config
-                if (wasJsControllerInstalled)
-                    yield controllerSetup.setupJsController();
-                yield controllerSetup.setupSystemConfig();
-                yield controllerSetup.disableAdminInstances();
-                yield adapterSetup.deleteOldInstances();
-                yield adapterSetup.addAdapterInstance();
-                // Create a copy of the databases that we can restore later
-                ({ objects: objectsBackup, states: statesBackup } =
-                    yield dbConnection.readDB());
-            });
+        before(async function () {
+            // Installation may take a while - especially if rsa-compat needs to be installed
+            const oneMinute = 60000;
+            this.timeout(30 * oneMinute);
+            if (await controllerSetup.isJsControllerRunning()) {
+                throw new Error("JS-Controller is already running! Stop it for the first test run and try again!");
+            }
+            const adapterSetup = new adapterSetup_1.AdapterSetup(adapterDir, testDir);
+            // Installation happens in two steps:
+            // First we need to set up JS Controller, so the databases etc. can be created
+            // First we need to copy all files and execute an npm install
+            await controllerSetup.prepareTestDir();
+            // Only then we can install the adapter, because some (including VIS) try to access
+            // the databases if JS Controller is installed
+            await adapterSetup.installAdapterInTestDir();
+            const dbConnection = new dbConnection_1.DBConnection(appName, testDir);
+            await dbConnection.start();
+            controllerSetup.setupSystemConfig(dbConnection);
+            await controllerSetup.disableAdminInstances(dbConnection);
+            await adapterSetup.deleteOldInstances(dbConnection);
+            await adapterSetup.addAdapterInstance();
+            await dbConnection.stop();
+            // Create a copy of the databases that we can restore later
+            ({ objects: objectsBackup, states: statesBackup } =
+                await dbConnection.backup());
         });
-        beforeEach(function () {
-            return __awaiter(this, void 0, void 0, function* () {
-                this.timeout(30000);
-                // Clean up before every single test
-                yield Promise.all([
-                    controllerSetup.clearDBDir(),
-                    controllerSetup.clearLogDir(),
-                    dbConnection.writeDB(objectsBackup, statesBackup),
-                ]);
-                // Create a new test harness
-                harness = new harness_1.TestHarness(adapterDir, testDir);
-                // Enable the adapter and set its loglevel to debug
-                yield harness.changeAdapterConfig(appName, testDir, adapterName, {
-                    common: {
-                        enabled: true,
-                        loglevel: "debug",
-                    },
-                });
-                // Start the controller instance
-                yield harness.startController();
-                // And enable the sendTo emulation
-                yield harness.enableSendTo();
+        beforeEach(async function () {
+            this.timeout(30000);
+            dbConnection = new dbConnection_1.DBConnection(appName, testDir);
+            // Clean up before every single test
+            await Promise.all([
+                controllerSetup.clearDBDir(),
+                controllerSetup.clearLogDir(),
+                dbConnection.restore(objectsBackup, statesBackup),
+            ]);
+            // Create a new test harness
+            await dbConnection.start();
+            harness = new harness_1.TestHarness(adapterDir, testDir, dbConnection);
+            // Enable the adapter and set its loglevel to debug
+            await harness.changeAdapterConfig(adapterName, {
+                common: {
+                    enabled: true,
+                    loglevel: "debug",
+                },
             });
+            // And enable the sendTo emulation
+            await harness.enableSendTo();
         });
-        afterEach(function () {
-            return __awaiter(this, void 0, void 0, function* () {
-                // Stopping the processes may take a while
-                this.timeout(30000);
-                // Stop the controller again
-                yield harness.stopController();
-                harness.removeAllListeners();
-            });
+        afterEach(async function () {
+            // Stopping the processes may take a while
+            this.timeout(30000);
+            // Stop the controller again
+            await harness.stopController();
+            harness.removeAllListeners();
         });
         it("The adapter starts", function () {
             this.timeout(60000);
             return new Promise((resolve, reject) => {
                 // Register a handler to check the alive state and exit codes
                 harness
-                    .on("stateChange", (id, state) => __awaiter(this, void 0, void 0, function* () {
+                    .on("stateChange", async (id, state) => {
                     if (id === `system.adapter.${adapterName}.0.alive` &&
                         state &&
                         state.val === true) {
                         // Wait a bit so we can catch errors that do not happen immediately
-                        yield async_1.wait(options.waitBeforeStartupSuccess != undefined
+                        await (0, async_1.wait)(options.waitBeforeStartupSuccess != undefined
                             ? options.waitBeforeStartupSuccess
                             : 5000);
                         resolve(`The adapter started successfully.`);
                     }
-                }))
+                })
                     .on("failed", (code) => {
                     if (options.allowedExitCodes == undefined ||
                         options.allowedExitCodes.indexOf(code) === -1) {

package/build/tests/integration/lib/adapterSetup.d.ts

@@ -1,9 +1,8 @@
-import { DBConnection } from "./dbConnection";
+import type { DBConnection } from "./dbConnection";
 export declare class AdapterSetup {
     private adapterDir;
     private testDir;
-    private dbConnection;
-    constructor(adapterDir: string, testDir: string, dbConnection: DBConnection);
+    constructor(adapterDir: string, testDir: string);
     private testAdapterDir;
     private adapterName;
     private adapterFullName;
@@ -14,10 +13,10 @@ export declare class AdapterSetup {
      */
     isAdapterInstalled(): Promise<boolean>;
     /** Copies all adapter files (except a few) to the test directory */
-    copyAdapterFilesToTestDir(): Promise<void>;
+    installAdapterInTestDir(): Promise<void>;
     /**
      * Adds an instance for an already installed adapter in the test directory
      */
     addAdapterInstance(): Promise<void>;
-    deleteOldInstances(): Promise<void>;
+    deleteOldInstances(dbConnection: DBConnection): Promise<void>;
 }

package/build/tests/integration/lib/adapterSetup.js

@@ -18,20 +18,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterSetup = void 0;
+/* eslint-disable @typescript-eslint/no-empty-function */
 // Add debug logging for tests
 const objects_1 = require("alcalzone-shared/objects");
 const debug_1 = __importDefault(require("debug"));
@@ -40,18 +32,17 @@ const path = __importStar(require("path"));
 const adapterTools_1 = require("../../../lib/adapterTools");
 const executeCommand_1 = require("../../../lib/executeCommand");
 const tools_1 = require("./tools");
-const debug = debug_1.default("testing:integration:AdapterSetup");
+const debug = (0, debug_1.default)("testing:integration:AdapterSetup");
 class AdapterSetup {
-    constructor(adapterDir, testDir, dbConnection) {
+    constructor(adapterDir, testDir) {
         this.adapterDir = adapterDir;
         this.testDir = testDir;
-        this.dbConnection = dbConnection;
         debug("Creating AdapterSetup...");
-        this.adapterName = adapterTools_1.getAdapterName(this.adapterDir);
-        this.adapterFullName = adapterTools_1.getAdapterFullName(this.adapterDir);
-        this.appName = adapterTools_1.getAppName(this.adapterDir);
-        this.testAdapterDir = tools_1.getTestAdapterDir(this.adapterDir, this.testDir);
-        this.testControllerDir = tools_1.getTestControllerDir(this.appName, this.testDir);
+        this.adapterName = (0, adapterTools_1.getAdapterName)(this.adapterDir);
+        this.adapterFullName = (0, adapterTools_1.getAdapterFullName)(this.adapterDir);
+        this.appName = (0, adapterTools_1.getAppName)(this.adapterDir);
+        this.testAdapterDir = (0, tools_1.getTestAdapterDir)(this.adapterDir, this.testDir);
+        this.testControllerDir = (0, tools_1.getTestControllerDir)(this.appName, this.testDir);
         debug(`  directories:`);
         debug(`    controller: ${this.testControllerDir}`);
         debug(`    adapter:    ${this.testAdapterDir}`);
@@ -61,95 +52,88 @@ class AdapterSetup {
     /**
      * Tests if the adapter is already installed in the test directory
      */
-    isAdapterInstalled() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // We expect the adapter to be installed if the dir in <testDir>/node_modules exists
-            return fs_extra_1.pathExists(this.testAdapterDir);
-        });
+    async isAdapterInstalled() {
+        // We expect the adapter to be installed if the dir in <testDir>/node_modules exists
+        return (0, fs_extra_1.pathExists)(this.testAdapterDir);
     }
     /** Copies all adapter files (except a few) to the test directory */
-    copyAdapterFilesToTestDir() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Copying adapter files to test directory...");
-            // We install the adapter almost like it would be installed in the real world
-            // Therefore pack it into a tarball and put it in the test dir for installation
-            const packResult = yield executeCommand_1.executeCommand("npm", ["pack", "--loglevel", "silent"], {
-                stdout: "pipe",
-            });
-            if (packResult.exitCode !== 0 || typeof packResult.stdout !== "string")
-                throw new Error(`Packing the adapter tarball failed!`);
-            // The last non-empty line of `npm pack`s STDOUT contains the tarball path
-            const stdoutLines = packResult.stdout.trim().split(/[\r\n]+/);
-            const tarballName = stdoutLines[stdoutLines.length - 1].trim();
-            const tarballPath = path.resolve(this.adapterDir, tarballName);
-            yield fs_extra_1.copy(tarballPath, path.resolve(this.testDir, tarballName));
-            yield fs_extra_1.unlink(tarballPath);
-            // Complete the package.json, so npm can do it's magic
-            debug("Saving the adapter in package.json");
-            const packageJsonPath = path.join(this.testDir, "package.json");
-            const packageJson = yield fs_extra_1.readJSON(packageJsonPath);
-            packageJson.dependencies[this.adapterFullName] = `file:./${tarballName}`;
-            for (const [dep, version] of objects_1.entries(adapterTools_1.getAdapterDependencies(this.adapterDir))) {
-                // Don't overwrite the js-controller github dependency with a probably lower one
-                if (dep === "js-controller")
-                    continue;
-                packageJson.dependencies[`${this.appName}.${dep}`] = version;
-            }
-            yield fs_extra_1.writeJSON(packageJsonPath, packageJson, { spaces: 2 });
-            debug("Deleting old remains of this adapter");
-            if (yield fs_extra_1.pathExists(this.testAdapterDir))
-                yield fs_extra_1.remove(this.testAdapterDir);
-            debug("  => done!");
+    async installAdapterInTestDir() {
+        debug("Copying adapter files to test directory...");
+        // We install the adapter almost like it would be installed in the real world
+        // Therefore pack it into a tarball and put it in the test dir for installation
+        const packResult = await (0, executeCommand_1.executeCommand)("npm", ["pack", "--loglevel", "silent"], {
+            stdout: "pipe",
         });
+        if (packResult.exitCode !== 0 || typeof packResult.stdout !== "string")
+            throw new Error(`Packing the adapter tarball failed!`);
+        // The last non-empty line of `npm pack`s STDOUT contains the tarball path
+        const stdoutLines = packResult.stdout.trim().split(/[\r\n]+/);
+        const tarballName = stdoutLines[stdoutLines.length - 1].trim();
+        const tarballPath = path.resolve(this.adapterDir, tarballName);
+        await (0, fs_extra_1.copy)(tarballPath, path.resolve(this.testDir, tarballName));
+        await (0, fs_extra_1.unlink)(tarballPath);
+        // Complete the package.json, so npm can do it's magic
+        debug("Saving the adapter in package.json");
+        const packageJsonPath = path.join(this.testDir, "package.json");
+        const packageJson = await (0, fs_extra_1.readJSON)(packageJsonPath);
+        packageJson.dependencies[this.adapterFullName] = `file:./${tarballName}`;
+        for (const [dep, version] of (0, objects_1.entries)((0, adapterTools_1.getAdapterDependencies)(this.adapterDir))) {
+            // Don't overwrite the js-controller github dependency with a probably lower one
+            if (dep === "js-controller")
+                continue;
+            packageJson.dependencies[`${this.appName}.${dep}`] = version;
+        }
+        await (0, fs_extra_1.writeJSON)(packageJsonPath, packageJson, { spaces: 2 });
+        debug("Deleting old remains of this adapter");
+        if (await (0, fs_extra_1.pathExists)(this.testAdapterDir))
+            await (0, fs_extra_1.remove)(this.testAdapterDir);
+        debug("Installing adapter");
+        // Defer to npm to install the controller (if it wasn't already)
+        await (0, executeCommand_1.executeCommand)("npm", ["i", "--production"], {
+            cwd: this.testDir,
+        });
+        debug("  => done!");
     }
     /**
      * Adds an instance for an already installed adapter in the test directory
      */
-    addAdapterInstance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Adding adapter instance...");
-            // execute iobroker add <adapter> -- This also installs missing dependencies
-            const addResult = yield executeCommand_1.executeCommand("node", [
-                `${this.appName}.js`,
-                "add",
-                this.adapterName,
-                "--enabled",
-                "false",
-            ], {
-                cwd: this.testControllerDir,
-                stdout: "ignore",
-            });
-            if (addResult.exitCode !== 0)
-                throw new Error(`Adding the adapter instance failed!`);
-            debug("  => done!");
+    async addAdapterInstance() {
+        debug("Adding adapter instance...");
+        // execute iobroker add <adapter> -- This also installs missing dependencies
+        const addResult = await (0, executeCommand_1.executeCommand)("node", [
+            `${this.appName}.js`,
+            "add",
+            this.adapterName,
+            "--enabled",
+            "false",
+        ], {
+            cwd: this.testControllerDir,
+            stdout: "ignore",
         });
+        if (addResult.exitCode !== 0)
+            throw new Error(`Adding the adapter instance failed!`);
+        debug("  => done!");
     }
-    deleteOldInstances() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Removing old adapter instances...");
-            const { objects, states } = yield this.dbConnection.readDB();
-            const instanceRegex = new RegExp(`^system\\.adapter\\.${this.adapterName}\\.\\d+`);
-            const instanceObjsRegex = new RegExp(`^${this.adapterName}\\.\\d+\.`);
-            const belongsToAdapter = (id) => {
-                return (instanceRegex.test(id) ||
-                    instanceObjsRegex.test(id) ||
-                    id === this.adapterName ||
-                    id === `${this.adapterName}.admin`);
-            };
-            if (objects) {
-                for (const id of Object.keys(objects)) {
-                    if (belongsToAdapter(id))
-                        delete objects[id];
-                }
-            }
-            if (states) {
-                for (const id of Object.keys(states)) {
-                    if (belongsToAdapter(id))
-                        delete states[id];
-                }
-            }
-            yield this.dbConnection.writeDB(objects, states);
-        });
+    async deleteOldInstances(dbConnection) {
+        debug("Removing old adapter instances...");
+        const allKeys = new Set([
+            ...(await dbConnection.getObjectIDs()),
+            ...(await dbConnection.getStateIDs()),
+        ]);
+        const instanceRegex = new RegExp(`^system\\.adapter\\.${this.adapterName}\\.\\d+`);
+        const instanceObjsRegex = new RegExp(`^${this.adapterName}\\.\\d+\.`);
+        const belongsToAdapter = (id) => {
+            return (instanceRegex.test(id) ||
+                instanceObjsRegex.test(id) ||
+                id === this.adapterName ||
+                id === `${this.adapterName}.admin`);
+        };
+        const idsToDelete = [...allKeys].filter((id) => belongsToAdapter(id));
+        for (const id of idsToDelete) {
+            await dbConnection.delObject(id).catch(() => { });
+            await dbConnection.delState(id).catch(() => { });
+        }
+        debug("  => done!");
     }
 }
 exports.AdapterSetup = AdapterSetup;

package/build/tests/integration/lib/controllerSetup.d.ts

@@ -1,9 +1,8 @@
-import { DBConnection } from "./dbConnection";
+import type { DBConnection } from "./dbConnection";
 export declare class ControllerSetup {
     private adapterDir;
     private testDir;
-    private dbConnection;
-    constructor(adapterDir: string, testDir: string, dbConnection: DBConnection);
+    constructor(adapterDir: string, testDir: string);
     private appName;
     private adapterName;
     private testAdapterDir;
@@ -22,8 +21,6 @@ export declare class ControllerSetup {
     isJsControllerRunning(): Promise<boolean>;
     /**
      * Sets up an existing JS-Controller instance for testing by executing "iobroker setup first"
-     * @param appName The branded name of "iobroker"
-     * @param testDir The directory the integration tests are executed in
      */
     setupJsController(): Promise<void>;
     /**
@@ -31,7 +28,7 @@ export declare class ControllerSetup {
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
      */
-    setupSystemConfig(): Promise<void>;
+    setupSystemConfig(dbConnection: DBConnection): void;
     /**
      * Clears the log dir for integration tests (and creates it if it doesn't exist)
      * @param appName The branded name of "iobroker"
@@ -48,5 +45,5 @@ export declare class ControllerSetup {
      * Disables all admin instances in the objects DB
      * @param objects The contents of objects.json
      */
-    disableAdminInstances(): Promise<void>;
+    disableAdminInstances(dbConnection: DBConnection): Promise<void>;
 }