From b3b342aa15184ada1fa180f1ed7181332cc66fa0 Mon Sep 17 00:00:00 2001 From: "David P. Caldwell" Date: Thu, 12 Sep 2024 12:59:13 -0400 Subject: [PATCH 1/2] Resolve #1657: Migrate loader/jrunscript JSAPI -> Fifty --- contributor/jrunscript.fifty.ts | 1 + contributor/jrunscript.jsh.js | 7 - jrunscript/io/api.html | 2 +- jrunscript/jsh/etc/api.js | 1 - loader/jrunscript/api.html | 163 ------------------ loader/jrunscript/expression.fifty.ts | 21 ++- loader/jrunscript/java/api.html | 68 -------- loader/jrunscript/test/suite.jsh.js | 3 - .../inonit/script/runtime/io/Streams.fifty.ts | 70 ++++++++ .../inonit/script/runtime/io/Streams.java | 1 + 10 files changed, 91 insertions(+), 246 deletions(-) delete mode 100644 loader/jrunscript/api.html delete mode 100644 loader/jrunscript/java/api.html diff --git a/contributor/jrunscript.fifty.ts b/contributor/jrunscript.fifty.ts index 4e2331e7f..0a79decdc 100644 --- a/contributor/jrunscript.fifty.ts +++ b/contributor/jrunscript.fifty.ts @@ -35,6 +35,7 @@ fifty.load("../loader/jrunscript/expression.fifty.ts"); fifty.load("../loader/api/old/unit.fifty.ts"); fifty.load("../rhino/system/test/Packages.inonit.system.fifty.ts"); + fifty.load("../rhino/system/java/inonit/script/runtime/io/Streams.fifty.ts"); fifty.load("../rhino/jrunscript/api.fifty.ts"); if (hasJsoup) fifty.load("../loader/document/module.fifty.ts"); fifty.load("../js/web/module.fifty.ts"); diff --git a/contributor/jrunscript.jsh.js b/contributor/jrunscript.jsh.js index 703791611..9c9df045d 100644 --- a/contributor/jrunscript.jsh.js +++ b/contributor/jrunscript.jsh.js @@ -66,16 +66,9 @@ pathname: SRC.getRelativePath("loader/api.html") })); - suite.add("internal/jrunscript/main", new jsh.unit.html.Part({ - // Test cases of loader implementation - // TODO redundant; now tested per-engine in contributor/suite.jsh.js - pathname: SRC.getRelativePath("loader/jrunscript/api.html") - })); - suite.add("internal/other", new jsh.unit.html.Part({ // Test cases involving the HTML test runner itself pathname: SRC.getRelativePath("loader/api/test/data/1/api.html") - // TODO loader/jrunscript/java has some tests // TODO loader/jrunscript/test/data/2/ has some tests but they require some classes in classpath })); diff --git a/jrunscript/io/api.html b/jrunscript/io/api.html index 0450cb3a5..30e9c97b9 100644 --- a/jrunscript/io/api.html +++ b/jrunscript/io/api.html @@ -71,7 +71,7 @@

Context

Exports