@ohos-ports/floss 5.0.1-beta.3 → 5.0.1-beta.5

package/lib/browser-runner.js

@@ -42,31 +42,32 @@ const DISABLED_FEATURES = [
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
-// ─── HDC utilities ────────────────────────────────────────────────────
+// ─── Native system command utilities ────────────────────────────────
 
-function getHdcPath() {
-    if (process.platform === "openharmony") {
-        try {
-            fs.accessSync("/data/service/hnp/bin/hdc");
-            return "/data/service/hnp/bin/hdc";
-        } catch {}
-    }
-    return process.env.HDC_PATH || "hdc";
-}
+const OHOS_AA_PATH = "/system/bin/cli_tool/executable/ohos-aa";
+const OHOS_BM_PATH = "/system/bin/cli_tool/executable/ohos-bm";
 
-function execHdc(args, timeout) {
+function execCmd(binPath, args, timeout) {
     const { execFileSync } = require("child_process");
     try {
-        return execFileSync(getHdcPath(), args, {
+        return execFileSync(binPath, args, {
             timeout: timeout || 30000,
             encoding: "utf-8",
             stdio: ["pipe", "pipe", "pipe"],
         }).trim();
     } catch (e) {
-        throw new Error("hdc " + args.join(" ") + " failed: " + e.message);
+        throw new Error(binPath + " " + args.join(" ") + " failed: " + e.message);
     }
 }
 
+function execOhosAa(args, timeout) {
+    return execCmd(OHOS_AA_PATH, args, timeout);
+}
+
+function execOhosBm(args, timeout) {
+    return execCmd(OHOS_BM_PATH, args, timeout);
+}
+
 // ─── Browser launch / close ───────────────────────────────────────────
 
 function buildLaunchArgs() {
@@ -87,25 +88,25 @@ async function launchBrowser() {
     // 1. Check if browser is installed
     var installedApps;
     try {
-        installedApps = execHdc(["shell", "bm", "dump", "-a"], 10000);
+        installedApps = execOhosBm(["dump", "--all"], 10000);
     } catch (e) {
-        throw new Error("Cannot query installed apps via hdc. Is hdc available? " + e.message);
+        throw new Error("Cannot query installed apps via ohos-bm. " + e.message);
     }
     if (!installedApps.includes(BROWSER_PKG)) {
         throw new Error('Browser "' + BROWSER_PKG + '" is not installed on this device.');
     }
 
     // 2. Kill existing browser process
-    try { execHdc(["shell", "aa", "force-stop", BROWSER_PKG], 10000); } catch {}
+    try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
     await sleep(1000);
 
     // 3. Start browser with CDP enabled
     var cmdArgs = buildLaunchArgs();
-    execHdc([
-        "shell", "aa", "start",
-        "-b", BROWSER_PKG,
-        "-a", BROWSER_ABILITY,
-        "--ps", "cmdArgs", cmdArgs,
+    execOhosAa([
+        "start",
+        "--bundlename", BROWSER_PKG,
+        "--abilityname", BROWSER_ABILITY,
+        "--ps", JSON.stringify({ cmdArgs: cmdArgs }),
     ], 15000);
 
     // 4. Wait for CDP endpoint
@@ -114,7 +115,7 @@ async function launchBrowser() {
 }
 
 async function closeBrowser() {
-    try { execHdc(["shell", "aa", "force-stop", BROWSER_PKG], 10000); } catch {}
+    try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
 }
 
 // ─── CDP endpoint discovery ──────────────────────────────────────────
@@ -293,7 +294,7 @@ function resolveFiles(files) {
  * Run tests in a real Chromium browser (海泰浏览器) via CDP.
  *
  * This provides full browser capabilities: DOM, Canvas, WebGL, CSS layout.
- * Browser is launched via hdc, controlled via Chrome DevTools Protocol.
+ * Browser is launched via ohos-aa, controlled via Chrome DevTools Protocol.
  *
  * @param {Object} opts - Floss options (path, reporter, require, quiet, etc.)
  * @returns {Promise<void>} Resolves on success, rejects on failure
@@ -305,7 +306,7 @@ function runInBrowser(opts) {
         var sessionId = null;
 
         try {
-            // ── 1. Launch browser via hdc ──
+            // ── 1. Launch browser via ohos-aa ──
             var wsUrl = await launchBrowser();
             browserLaunched = true;
 

package/lib/node-runner.js

@@ -89,6 +89,8 @@ function runInNode(opts) {
             }
             // Add resolved files to Mocha
             resolvedFiles.forEach((file) => mochaInst.addFile(file));
+            // Set global.options for test files that depend on it (same as renderer.js)
+            global.options = opts;
             // Run tests
             mochaInst.run((errorCount) => {
                 if (errorCount > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/floss",
-  "version": "5.0.1-beta.3",
+  "version": "5.0.1-beta.5",
   "description": "Unit-testing for those hard to reach places",
   "bin": "./lib/floss.js",
   "main": "./lib/index.js",
@@ -13,29 +13,7 @@
   "files": [
     "lib"
   ],
-  "scripts": {
-    "lint": "eslint src/*.ts --fix",
-    "types": "tsc -noEmit",
-    "copy": "copyfiles -f src/index.html lib",
-    "clean": "rimraf lib/*",
-    "prebuild": "run-s clean lint copy",
-    "build": "tsc",
-    "prewatch": "run-s copy",
-    "watch": "tsc -w --incremental --tsBuildInfoFile .tsbuildinfo",
-    "test": "run-s test:*",
-    "test:basic": "node lib/floss.js -p test/basic",
-    "test:failure": "node lib/floss.js -p test/failure || true",
-    "test:multiple": "node lib/floss.js -p \"test/multiple/*.js\"",
-    "test:typescript": "node lib/floss.js -p test/typescript -r ts-node/register",
-    "test:coverage": "nyc node lib/floss.js -p test/coverage",
-    "test:options": "node lib/floss.js -p test/options -- --foo=bar",
-    "test:args": "node lib/floss.js -p test/args -- --autoplay-policy=no-user-gesture-required",
-    "preversion": "run-s build test",
-    "postpublish": "git push && git push --tags",
-    "publish:patch": "npm version patch && npm publish",
-    "publish:minor": "npm version minor && npm publish",
-    "publish:major": "npm version major && npm publish"
-  },
+  "scripts": {},
   "repository": {
     "type": "git",
     "url": "git@github.com:pixijs/floss.git"
@@ -75,19 +53,5 @@
     "electron": ">=12 <14",
     "nyc": ">=13"
   },
-  "devDependencies": {
-    "@pixi/eslint-config": "^2.0.1",
-    "@types/glob": "^7.1.3",
-    "@types/mocha": "^8.0.0",
-    "@types/resolve": "^1.17.1",
-    "chai": "^4.2.0",
-    "copyfiles": "^2.4.1",
-    "electron": "^12.0.0",
-    "eslint": "^7.18.0",
-    "npm-run-all": "^4.1.5",
-    "nyc": "^14.0.0",
-    "rimraf": "^3.0.2",
-    "ts-node": "^9.1.1",
-    "typescript": "^3.9.0"
-  }
+  "devDependencies": {}
 }