diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a55842637f8f124b4be7797d1807212808189211..cb15773894e2772fcfbdb407adfa6b15c61ec51a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,6 @@ include: - ui2abc/libarkts/.gitlab-ci.yml - ui2abc/memo-plugin/.gitlab-ci.yml - ui2abc/tests-memo/.gitlab-ci.yml + - ui2abc/ets-tests/.gitlab-ci.yml - interop/.gitlab-ci.yml - - ets-tests/.gitlab-ci.yml - tools/.gitlab-ci.yml diff --git a/arkoala-arkts/framework/native/src/tree.h b/arkoala-arkts/framework/native/src/tree.h index ca339bf096beb33a6aadc2a47d2b4be777aff07e..917686ab1cca64d8c2f6587985160a75f2cb2e58 100644 --- a/arkoala-arkts/framework/native/src/tree.h +++ b/arkoala-arkts/framework/native/src/tree.h @@ -325,8 +325,8 @@ struct TGAInfo { std::vector pixels; }; -const std::string baseGoldenPath = "../ets-tests/ets/golden-tests/golden/"; -const std::string baseBuildPath = "../ets-tests/build/golden/"; +const std::string baseGoldenPath = "../ui2abc/ets-tests/ets/golden-tests/golden/"; +const std::string baseBuildPath = "../ui2abc/ets-tests/build/golden/"; bool WriteImageTGA(std::string name, TGAInfo &info) { fprintf(stderr, "image: %s %s\n", std::filesystem::current_path().c_str(), name.c_str()); diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index ed6b923040cc1c37df7b431e1a473b58397f1ee0..7404fa184afa4acf7c7df64cef05f4b34d457e17 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -7,11 +7,11 @@ "./memo-plugin", "../ui2abc/ui-plugins", "../ui2abc/fast-arktsc", + "../ui2abc/ets-tests", "./loader", "./har", "./ets-harness", "./ets-plugin", - "../ets-tests", "../incremental/build-common", "../incremental/compiler-plugin", "../incremental/harness", diff --git a/arkoala/package.json b/arkoala/package.json index 3258e429d63fdcdc026aecb10a5e31216a1f5383..8cb43885a2d5ae6a4c661e895e3691672eaade78 100644 --- a/arkoala/package.json +++ b/arkoala/package.json @@ -14,7 +14,7 @@ "extension-component", "loader", "ets-harness", - "../ets-tests", + "../ui2abc/ets-tests", "../incremental/build-common", "../incremental/compat", "../incremental/common", diff --git a/incremental/tools/panda/arkts/ui2abc b/incremental/tools/panda/arkts/ui2abc index d8db6488cb17b5ee014d06910a5fb892f3a82606..960c3cb33a2def0c97e5bd2cf1a1be23f624a52b 100755 --- a/incremental/tools/panda/arkts/ui2abc +++ b/incremental/tools/panda/arkts/ui2abc @@ -14,5 +14,5 @@ # limitations under the License. SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"` -KOALA_WORKSPACE=${KOALA_WORKSPACE:=1} PANDA_SDK_PATH=${PANDA_SDK_PATH:=$SCRIPT_DIR/../node_modules/@panda/sdk} node $SCRIPT_DIR/../../../../ui2abc/libarkts/lib/es2panda.js "$@" +KOALA_WORKSPACE=${KOALA_WORKSPACE:=1} PANDA_SDK_PATH=${PANDA_SDK_PATH:=$SCRIPT_DIR/../node_modules/@panda/sdk} node -- $SCRIPT_DIR/../../../../ui2abc/libarkts/lib/es2panda.js "$@" diff --git a/tools/mirror.mjs b/tools/mirror.mjs index 27346d8ad29729e5e732940586644e815aa151ca..5586b43950257200a471a48e670d8617d504313b 100644 --- a/tools/mirror.mjs +++ b/tools/mirror.mjs @@ -6,7 +6,7 @@ import { execSync } from 'child_process' const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) const KOALA_HOME = path.resolve(path.join(__dirname, "..")) -const USE_MIRROR_BUNDLE = process.env.USE_MIRROR_BUNDLE ? true : false +const USE_MIRROR_BUNDLE = !!process.env.USE_MIRROR_BUNDLE const args = process.argv.slice(2) const outPath = args[0] ?? path.join(KOALA_HOME, USE_MIRROR_BUNDLE ? "koala_tools" : "koala_mirror") diff --git a/tools/release.mjs b/tools/release.mjs index 6d8b6fc3368bdf7da788c592bcd857e5f5d7e1b8..91ef28871de524193be2ba1662a30ef14d23be75 100644 --- a/tools/release.mjs +++ b/tools/release.mjs @@ -75,12 +75,12 @@ const all_packages = [ new Package(path.join(EXTERNAL_HOME, "ui2abc/libarkts")), new Package(path.join(EXTERNAL_HOME, "ui2abc/memo-plugin")), new Package(path.join(EXTERNAL_HOME, "ui2abc/tests-memo")), + new Package(path.join(EXTERNAL_HOME, "ui2abc/ets-tests")), new Package(path.join(EXTERNAL_HOME, "arkoala-arkts/ets-plugin")), new Package(path.join(EXTERNAL_HOME, "arkoala/arkui")), new Package(path.join(EXTERNAL_HOME, "interop")), new Package(path.join(EXTERNAL_HOME, "arkoala-arkts/ets-harness")), - new Package(path.join(EXTERNAL_HOME, "arkoala/ets-harness")), - new Package(path.join(EXTERNAL_HOME, "ets-tests")) + new Package(path.join(EXTERNAL_HOME, "arkoala/ets-harness")) ] const exclude_packages = [ diff --git a/ets-tests/.gitlab-ci.yml b/ui2abc/ets-tests/.gitlab-ci.yml similarity index 78% rename from ets-tests/.gitlab-ci.yml rename to ui2abc/ets-tests/.gitlab-ci.yml index 1ac2bce0cbb8b7f0b437f5eb3378b98a1d9a9dd6..d122c8f97889b4aa638dd0f9d56bb0e284b49d41 100644 --- a/ets-tests/.gitlab-ci.yml +++ b/ui2abc/ets-tests/.gitlab-ci.yml @@ -6,10 +6,10 @@ install node modules (ets-tests): before_script: - !reference [.setup, script] script: - - npm i --no-audit --no-fund --prefix ets-tests + - npm i --no-audit --no-fund --prefix ui2abc/ets-tests artifacts: paths: - - ets-tests/node_modules + - ui2abc/ets-tests/node_modules expire_in: 1 day build ets-tests.abc: @@ -21,11 +21,11 @@ build ets-tests.abc: - build ui2abc-all M3 - annotate all script: - - npm run build --prefix ets-tests - - ls -l ets-tests/build/ets-tests.abc + - npm run build --prefix ui2abc/ets-tests + - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: - - ets-tests/build/ets-tests.abc + - ui2abc/ets-tests/build/ets-tests.abc expire_in: 1 day build ets-tests.abc (golden): @@ -37,11 +37,11 @@ build ets-tests.abc (golden): - build ui2abc-all M3 - annotate all script: - - npm run build:golden --prefix ets-tests - - ls -l ets-tests/build/ets-tests.abc + - npm run build:golden --prefix ui2abc/ets-tests + - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: - - ets-tests/build/ets-tests.abc + - ui2abc/ets-tests/build/ets-tests.abc expire_in: 1 day run ets-tests M3 (linux, node): @@ -53,7 +53,7 @@ build ets-tests.abc (golden): script: - mkdir -p arkoala-arkts/build/userPandaFiles - cp incremental/harness/build/harness.abc arkoala-arkts/build/bootPandaFiles/ - - cp ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ + - cp ui2abc/ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ - cp arkoala-arkts/framework/native/build-node-host-vmloader/libvmloader.so arkoala-arkts/build/userPandaFiles/ - cd arkoala-arkts - npm run build:loader:node @@ -73,10 +73,10 @@ build ets-tests.abc (golden): before_script: - !reference [.setup, script] script: - - mkdir -p ets-tests/build/golden + - mkdir -p ui2abc/ets-tests/build/golden - mkdir -p arkoala-arkts/build/userPandaFiles - cp incremental/harness/build/harness.abc arkoala-arkts/build/bootPandaFiles/ - - cp ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ + - cp ui2abc/ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ - cp arkoala-arkts/framework/native/build-node-host-vmloader/libvmloader.so arkoala-arkts/build/userPandaFiles/ - cd arkoala-arkts - npm run build:loader:node @@ -90,5 +90,5 @@ build ets-tests.abc (golden): - build ArkoalaNative (linux, linux, node+panda) artifacts: paths: - - ets-tests/build/golden + - ui2abc/ets-tests/build/golden expire_in: 1 day diff --git a/ets-tests/README.md b/ui2abc/ets-tests/README.md similarity index 88% rename from ets-tests/README.md rename to ui2abc/ets-tests/README.md index 55d86dcb2d9cc78469325e047f301baaab2fcbbb..fe0bf973e0399dd82d0264a2d9974dc1007bdae5 100644 --- a/ets-tests/README.md +++ b/ui2abc/ets-tests/README.md @@ -16,16 +16,16 @@ npm i -C ui2abc/libarkts/ npm run reinstall:regenerate -C ui2abc/libarkts/ npm run compile -C ui2abc/libarkts/ npm run build:all -C ui2abc/ -npm run build:deps -C ets-tests/ +npm run build:deps -C ui2abc/ets-tests/ ``` ### Running tests ``` // Build deps and run tests: -npm run run -C ets-tests/ +npm run run -C ui2abc/ets-tests // Run tests: -npm run run -C ets-tests/ +npm run run -C ui2abc/ets-tests ``` ### How to write tests @@ -49,7 +49,7 @@ uiLog(message: string) // memo function, invokes only if message was changed nLog(message: string) // non memo function to save log records on native side ``` -Example of the test case page (could be found `ets-tests/ets/environment-tests/pages/states/StateIncrement.ets`): +Example of the test case page (could be found `ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets`): ``` import { TestComponent, uiLog } from '@ohos.arkui' @@ -65,7 +65,7 @@ struct StateIncrement { } ``` Here we set `id` for `TestComponent`, increment state (in `onChange` callback) `this.x` and record log after each state changes. -Let's look at the test (can be found `ets-tests/ets/environment-tests/suites/StateManagement.ets`): +Let's look at the test (can be found `ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets`): ``` import { testPageOnChange } from "../entry" suite("State Management", () => { @@ -79,7 +79,7 @@ suite("State Management", () => { ... -// testPageOnChange body (could be found ets-tests/ets/utils.ets): +// testPageOnChange body (could be found ui2abc/ets-tests/ets/utils.ets): export function testPageOnChange(control: AppControl, page: string, targetId: int32 | int32[], expected: string, message: string | undefined = undefined) { // apply changes for child components of all nested levels control.loadPage(page).nextFrame().nextFrame().nextFrame() @@ -107,7 +107,7 @@ Here we can send following commands to test environment via `control`: ### Register case pages Every case we add to the import and to the `cases` switcher: ``` -ets-tests/ets/ets-tests/Pages.ets +ui2abc/ets-tests/ets/ets-tests/Pages.ets ``` Example: ``` @@ -126,7 +126,7 @@ function pageByName(name: string): void { ### Register suites Every suite we add to the import and into the common suite named "ETS_TESTS": ``` -ets-tests/ets/ets-tests/Pages.ets +ui2abc/ets-tests/ets/ets-tests/Pages.ets ``` Example: ``` @@ -147,11 +147,11 @@ Running specified suite or tests: //EXAMPLES: // runs [State Management] suite and one test [StateChange:Increment] inside that suite -npm run run "State Management|StateChange:Increment" -C ets-tests/ +npm run run "State Management|StateChange:Increment" -C ui2abc/ets-tests/ // runs [State Management] suite and two tests [StateChange:Increment, StateChange:Decrement] inside that suite -npm run run "State Management|StateChange:Increment|StateChange:Decrement" -C ets-tests/ +npm run run "State Management|StateChange:Increment|StateChange:Decrement" -C ui2abc/ets-tests/ // runs tests independently from any suites (leave first reserved for suite place empty) -npm run run "|StateChange:Increment|StateChange:Decrement|attributeModifier" -C ets-tests/ +npm run run "|StateChange:Increment|StateChange:Decrement|attributeModifier" -C ui2abc/ets-tests/ ``` diff --git a/ets-tests/ets/TestHarness.ets b/ui2abc/ets-tests/ets/TestHarness.ets similarity index 100% rename from ets-tests/ets/TestHarness.ets rename to ui2abc/ets-tests/ets/TestHarness.ets diff --git a/ets-tests/ets/environment-tests/Pages.ets b/ui2abc/ets-tests/ets/environment-tests/Pages.ets similarity index 100% rename from ets-tests/ets/environment-tests/Pages.ets rename to ui2abc/ets-tests/ets/environment-tests/Pages.ets diff --git a/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets diff --git a/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/DrawModifierTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets diff --git a/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets diff --git a/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets diff --git a/ets-tests/ets/environment-tests/pages/StartPage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/StartPage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/StartPage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/StartPage.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets diff --git a/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropDateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropStringTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets diff --git a/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableDate.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableMap.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableSet.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets diff --git a/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/StateDecrement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets diff --git a/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/StateIncrement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets diff --git a/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/styles.ets b/ui2abc/ets-tests/ets/environment-tests/pages/styles.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/styles.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/styles.ets diff --git a/ets-tests/ets/environment-tests/pages/track/TrackObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/track/TrackObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/track/TrackObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/track/TrackObject.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchProp.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchState.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchState.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchState.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchState.ets diff --git a/ets-tests/ets/environment-tests/suites/AttributeModifier.ets b/ui2abc/ets-tests/ets/environment-tests/suites/AttributeModifier.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/AttributeModifier.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/AttributeModifier.ets diff --git a/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets diff --git a/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets diff --git a/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets diff --git a/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/DrawModifier.ets b/ui2abc/ets-tests/ets/environment-tests/suites/DrawModifier.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/DrawModifier.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/DrawModifier.ets diff --git a/ets-tests/ets/environment-tests/suites/LinkDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/suites/LinkDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/LinkDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/LinkDecorator.ets diff --git a/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/ObservedTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ObservedTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ObservedTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ObservedTest.ets diff --git a/ets-tests/ets/environment-tests/suites/PropDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/suites/PropDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/PropDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/PropDecorator.ets diff --git a/ets-tests/ets/environment-tests/suites/ProvideConsume.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ProvideConsume.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ProvideConsume.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ProvideConsume.ets diff --git a/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets diff --git a/ets-tests/ets/environment-tests/suites/ScreenshotService.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ScreenshotService.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ScreenshotService.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ScreenshotService.ets diff --git a/ets-tests/ets/environment-tests/suites/StateManagement.ets b/ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/StateManagement.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets diff --git a/ets-tests/ets/environment-tests/suites/StorageTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/StorageTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/StorageTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/StorageTests.ets diff --git a/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets diff --git a/ets-tests/ets/golden-tests/Pages.ets b/ui2abc/ets-tests/ets/golden-tests/Pages.ets similarity index 100% rename from ets-tests/ets/golden-tests/Pages.ets rename to ui2abc/ets-tests/ets/golden-tests/Pages.ets diff --git a/ets-tests/ets/golden-tests/golden/golden-base.tga b/ui2abc/ets-tests/ets/golden-tests/golden/golden-base.tga similarity index 100% rename from ets-tests/ets/golden-tests/golden/golden-base.tga rename to ui2abc/ets-tests/ets/golden-tests/golden/golden-base.tga diff --git a/ets-tests/ets/golden-tests/pages/StateChangePage.ets b/ui2abc/ets-tests/ets/golden-tests/pages/StateChangePage.ets similarity index 100% rename from ets-tests/ets/golden-tests/pages/StateChangePage.ets rename to ui2abc/ets-tests/ets/golden-tests/pages/StateChangePage.ets diff --git a/ets-tests/ets/golden-tests/suites/StateChange.ets b/ui2abc/ets-tests/ets/golden-tests/suites/StateChange.ets similarity index 100% rename from ets-tests/ets/golden-tests/suites/StateChange.ets rename to ui2abc/ets-tests/ets/golden-tests/suites/StateChange.ets diff --git a/ets-tests/ets/utils.ets b/ui2abc/ets-tests/ets/utils.ets similarity index 100% rename from ets-tests/ets/utils.ets rename to ui2abc/ets-tests/ets/utils.ets diff --git a/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json similarity index 36% rename from ets-tests/golden-test-ui2abcconfig.json rename to ui2abc/ets-tests/golden-test-ui2abcconfig.json index 7c36dfeb3dec9a2a136574acc4c5cbb8c6e53422..79725c99f5375637f5f91634c75b122a1c503bea 100644 --- a/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -4,29 +4,29 @@ "outDir": "build/ets/abc", "baseUrl": ".", "paths": { - "arkui": ["../arkoala-arkts/arkui/sdk/prepared"], - "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], - "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], - "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], - "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos/src/multimedia.image"], - "@ohos.data.uniformTypeDescriptor": ["../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], - "@ohos.data.unifiedDataChannel": ["../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], - "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], - "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], - "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], - "@ohos.arkui.node": ["../arkoala-arkts/arkui/@ohos.arkui.node"], - "@ohos.arkui.dragController": ["../arkoala-arkts/arkui/@ohos.arkui.dragController"], - "@ohos.arkui.UIContext": ["../arkoala-arkts/arkui/@ohos.arkui.UIContext"], - "@ohos.arkui": ["../arkoala-arkts/arkui/@ohos.arkui"], - "@ohos.router": ["../arkoala-arkts/arkui/@ohos.router"], - "@koalaui/builderLambda": ["../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], - "@koalaui/interop": ["../interop/src/arkts"], - "@koalaui/harness": ["../incremental/harness/src/arkts"], - "@koalaui/compat": [ "../incremental/compat/src/arkts" ], - "#platform": [ "../incremental/compat/src/arkts" ], - "@koalaui/common": [ "../incremental/common/src" ], - "@koalaui/runtime": [ "../incremental/runtime/ets" ], - "@koalaui/runtime/annotations": [ "../incremental/runtime/annotations" ], + "arkui": ["../../arkoala-arkts/arkui/sdk/prepared"], + "@ohos.arkui.component": ["../../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../../arkoala-arkts/modules/global.resource/src/resource"], + "@ohos.font": ["../../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../arkoala-arkts/modules/ohos/src/multimedia.image"], + "@ohos.data.uniformTypeDescriptor": ["../../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], + "@ohos.data.unifiedDataChannel": ["../../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], + "@ohos.arkui.stateManagement": ["../../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], + "@ohos.arkui.inspector": ["../../arkoala-arkts/arkui/@ohos.arkui.inspector"], + "@ohos.arkui.theme": ["../../arkoala-arkts/arkui/@ohos.arkui.theme"], + "@ohos.arkui.node": ["../../arkoala-arkts/arkui/@ohos.arkui.node"], + "@ohos.arkui.dragController": ["../../arkoala-arkts/arkui/@ohos.arkui.dragController"], + "@ohos.arkui.UIContext": ["../../arkoala-arkts/arkui/@ohos.arkui.UIContext"], + "@ohos.arkui": ["../../arkoala-arkts/arkui/@ohos.arkui"], + "@ohos.router": ["../../arkoala-arkts/arkui/@ohos.router"], + "@koalaui/builderLambda": ["../../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], + "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/harness": ["../../incremental/harness/src/arkts"], + "@koalaui/compat": [ "../../incremental/compat/src/arkts" ], + "#platform": [ "../../incremental/compat/src/arkts" ], + "@koalaui/common": [ "../../incremental/common/src" ], + "@koalaui/runtime": [ "../../incremental/runtime/ets" ], + "@koalaui/runtime/annotations": [ "../../incremental/runtime/annotations" ], "@test/pages": [ "./ets/golden-tests/Pages.ets" ] }, "plugins": [ diff --git a/ets-tests/hap/.gitignore b/ui2abc/ets-tests/hap/.gitignore similarity index 100% rename from ets-tests/hap/.gitignore rename to ui2abc/ets-tests/hap/.gitignore diff --git a/ets-tests/hap/application/AppScope/app.json5 b/ui2abc/ets-tests/hap/application/AppScope/app.json5 similarity index 100% rename from ets-tests/hap/application/AppScope/app.json5 rename to ui2abc/ets-tests/hap/application/AppScope/app.json5 diff --git a/ets-tests/hap/application/AppScope/resources/base/element/string.json b/ui2abc/ets-tests/hap/application/AppScope/resources/base/element/string.json similarity index 100% rename from ets-tests/hap/application/AppScope/resources/base/element/string.json rename to ui2abc/ets-tests/hap/application/AppScope/resources/base/element/string.json diff --git a/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png b/ui2abc/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ets-tests/hap/application/AppScope/resources/base/media/app_icon.png rename to ui2abc/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png diff --git a/ets-tests/hap/application/build-profile.json5 b/ui2abc/ets-tests/hap/application/build-profile.json5 similarity index 100% rename from ets-tests/hap/application/build-profile.json5 rename to ui2abc/ets-tests/hap/application/build-profile.json5 diff --git a/ets-tests/hap/application/code-linter.json5 b/ui2abc/ets-tests/hap/application/code-linter.json5 similarity index 100% rename from ets-tests/hap/application/code-linter.json5 rename to ui2abc/ets-tests/hap/application/code-linter.json5 diff --git a/ets-tests/hap/application/entry/.gitignore b/ui2abc/ets-tests/hap/application/entry/.gitignore similarity index 100% rename from ets-tests/hap/application/entry/.gitignore rename to ui2abc/ets-tests/hap/application/entry/.gitignore diff --git a/ets-tests/hap/application/entry/build-profile.json5 b/ui2abc/ets-tests/hap/application/entry/build-profile.json5 similarity index 100% rename from ets-tests/hap/application/entry/build-profile.json5 rename to ui2abc/ets-tests/hap/application/entry/build-profile.json5 diff --git a/ets-tests/hap/application/entry/hvigorfile.ts b/ui2abc/ets-tests/hap/application/entry/hvigorfile.ts similarity index 100% rename from ets-tests/hap/application/entry/hvigorfile.ts rename to ui2abc/ets-tests/hap/application/entry/hvigorfile.ts diff --git a/ets-tests/hap/application/entry/obfuscation-rules.txt b/ui2abc/ets-tests/hap/application/entry/obfuscation-rules.txt similarity index 100% rename from ets-tests/hap/application/entry/obfuscation-rules.txt rename to ui2abc/ets-tests/hap/application/entry/obfuscation-rules.txt diff --git a/ets-tests/hap/application/entry/oh-package.json5 b/ui2abc/ets-tests/hap/application/entry/oh-package.json5 similarity index 100% rename from ets-tests/hap/application/entry/oh-package.json5 rename to ui2abc/ets-tests/hap/application/entry/oh-package.json5 diff --git a/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/pages/Index.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets diff --git a/ets-tests/hap/application/entry/src/main/module.json5 b/ui2abc/ets-tests/hap/application/entry/src/main/module.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/main/module.json5 rename to ui2abc/ets-tests/hap/application/entry/src/main/module.json5 diff --git a/ets-tests/hap/application/entry/src/main/resources/base/element/color.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/color.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/element/color.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/color.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/string.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/background.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/background.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/background.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/background.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json diff --git a/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json diff --git a/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png diff --git a/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json diff --git a/ets-tests/hap/application/entry/src/mock/mock-config.json5 b/ui2abc/ets-tests/hap/application/entry/src/mock/mock-config.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/mock/mock-config.json5 rename to ui2abc/ets-tests/hap/application/entry/src/mock/mock-config.json5 diff --git a/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets diff --git a/ets-tests/hap/application/entry/src/ohosTest/module.json5 b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/module.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/module.json5 rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/module.json5 diff --git a/ets-tests/hap/application/entry/src/test/List.test.ets b/ui2abc/ets-tests/hap/application/entry/src/test/List.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/test/List.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/test/List.test.ets diff --git a/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets b/ui2abc/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/test/LocalUnit.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets diff --git a/ets-tests/hap/application/hvigor/hvigor-config.json5 b/ui2abc/ets-tests/hap/application/hvigor/hvigor-config.json5 similarity index 100% rename from ets-tests/hap/application/hvigor/hvigor-config.json5 rename to ui2abc/ets-tests/hap/application/hvigor/hvigor-config.json5 diff --git a/ets-tests/hap/application/hvigorfile.ts b/ui2abc/ets-tests/hap/application/hvigorfile.ts similarity index 100% rename from ets-tests/hap/application/hvigorfile.ts rename to ui2abc/ets-tests/hap/application/hvigorfile.ts diff --git a/ets-tests/hap/application/local.properties b/ui2abc/ets-tests/hap/application/local.properties similarity index 100% rename from ets-tests/hap/application/local.properties rename to ui2abc/ets-tests/hap/application/local.properties diff --git a/ets-tests/hap/application/oh-package-lock.json5 b/ui2abc/ets-tests/hap/application/oh-package-lock.json5 similarity index 100% rename from ets-tests/hap/application/oh-package-lock.json5 rename to ui2abc/ets-tests/hap/application/oh-package-lock.json5 diff --git a/ets-tests/hap/application/oh-package.json5 b/ui2abc/ets-tests/hap/application/oh-package.json5 similarity index 100% rename from ets-tests/hap/application/oh-package.json5 rename to ui2abc/ets-tests/hap/application/oh-package.json5 diff --git a/ets-tests/hap/package.json b/ui2abc/ets-tests/hap/package.json similarity index 64% rename from ets-tests/hap/package.json rename to ui2abc/ets-tests/hap/package.json index d6befb48e3299070b34414b5ef2d63f9b7a7b731..1546ef4b8066fd804bc608d6e7b062c2be280b98 100644 --- a/ets-tests/hap/package.json +++ b/ui2abc/ets-tests/hap/package.json @@ -10,23 +10,23 @@ "scripts": { "clean": "rimraf application/entry/build application/generated application/oh_modules application/.hvigor", "clean:user": "npm run clean --prefix ./user", - "clean:arkoala": "npm run clean --prefix ../../arkoala-arkts/har", + "clean:arkoala": "npm run clean --prefix ../../../arkoala-arkts/har", "clean:all": "npm run clean && npm run clean:arkoala && npm run clean:user", - "prerequisites:node": "npm run prerequisites:node --prefix ../../arkoala-arkts", - "prerequisites:all": "npm run prerequisites:all --prefix ../../arkoala-arkts", + "prerequisites:node": "npm run prerequisites:node --prefix ../../../arkoala-arkts", + "prerequisites:all": "npm run prerequisites:all --prefix ../../../arkoala-arkts", - "arkoala:har:arm32": "npm run arkoala:har-arm32 --prefix ../../arkoala-arkts", - "arkoala:har:arm64": "npm run arkoala:har-arm64 --prefix ../../arkoala-arkts", - "arkoala:har:universal": "npm run arkoala:har-universal --prefix ../../arkoala-arkts", + "arkoala:har:arm32": "npm run arkoala:har-arm32 --prefix ../../../arkoala-arkts", + "arkoala:har:arm64": "npm run arkoala:har-arm64 --prefix ../../../arkoala-arkts", + "arkoala:har:universal": "npm run arkoala:har-universal --prefix ../../../arkoala-arkts", - "arkoala:har:arm64:aot": "npm run arkoala:har-arm64:aot --prefix ../../arkoala-arkts", - "arkoala:har:universal:aot": "npm run arkoala:har-universal:aot --prefix ../../arkoala-arkts", + "arkoala:har:arm64:aot": "npm run arkoala:har-arm64:aot --prefix ../../../arkoala-arkts", + "arkoala:har:universal:aot": "npm run arkoala:har-universal:aot --prefix ../../../arkoala-arkts", "user:har:arm64:aot": "npm run user:aot:arm64 && npm run har-arm64 --prefix ./user", - "user:aot:arm64": "npm run build:abc && npm run arkoala:aot:arm64 --prefix ../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../arkoala-arkts/build/arkoala.abc --aot-target arm64", + "user:aot:arm64": "npm run build:abc && npm run arkoala:aot:arm64 --prefix ../../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../../arkoala-arkts/build/arkoala.abc --aot-target arm64", "user:har:universal:aot": "npm run user:aot:universal && npm run har-universal --prefix ./user", - "user:aot:universal": "npm run build:abc && npm run arkoala:aot:host --prefix ../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../arkoala-arkts/build/arkoala.abc", + "user:aot:universal": "npm run build:abc && npm run arkoala:aot:host --prefix ../../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../../arkoala-arkts/build/arkoala.abc", "install": "cd application && DEVECO_TOOLS_HOME=../$npm_package_config_clt_path node ../$npm_package_config_ohos_app_cli_path oh-build --install-ohpm-deps-only", @@ -42,23 +42,23 @@ "relaunch": "npm run clean && npm run launch", "log": "cd application && DEVECO_TOOLS_HOME=../$npm_package_config_clt_path node ../$npm_package_config_ohos_app_cli_path oh-log", - "build:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts && npm run build --prefix ../../arkoala-arkts && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run build:abc", - - "build:user:abc": "cd user && npm run build && mkdir -p ../../arkoala-arkts/build ../../arkoala-arkts/trivial/build && cp build/user.abc ../build/user.abc && cp build/user.abc ../../arkoala-arkts/trivial/build/user.abc", + "build:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts && npm run build --prefix ../../../arkoala-arkts && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run build:abc", + + "build:user:abc": "cd user && npm run build && mkdir -p ../../../arkoala-arkts/build ../../../arkoala-arkts/trivial/build && cp build/user.abc ../build/user.abc && cp build/user.abc ../../../arkoala-arkts/trivial/build/user.abc", "run:node:ets": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda-ets:ComExampleTrivialApplication 10", "run:node:ani": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda-ani:ComExampleTrivialApplication 10", "run:node": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda:ComExampleTrivialApplication", "run:node:routing": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda:ComExampleRoutingApplication", - "all:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts/ && npm run build --prefix ../../arkoala-arkts && npm run build:abc && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run run:node", - "all:node:ci": "npm run clean:all && npm run prerequisites:node --prefix ../../arkoala-arkts && npm run compile:native:node-host --prefix ../../arkoala-arkts && npm run build --prefix ../../arkoala-arkts && npm run build:user:abc && npm run build:loader:node --prefix ../../arkoala-arkts && npm run run:node:ci --prefix ../../arkoala-arkts", - "all:node:routing": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts/ && npm run build --prefix ../../arkoala-arkts/ && npm run build:abc && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run run:node:routing", - "all:arm32": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm32 --prefix ../../arkoala-arkts && npm run har-arm32 --prefix user && npm run launch", - "all:arm64": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64 --prefix ../../arkoala-arkts && npm run har-arm64 --prefix user && npm run launch", - "all:universal": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal --prefix ../../arkoala-arkts && npm run har-universal --prefix user && npm run launch", + "all:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts/ && npm run build --prefix ../../../arkoala-arkts && npm run build:abc && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run run:node", + "all:node:ci": "npm run clean:all && npm run prerequisites:node --prefix ../../../arkoala-arkts && npm run compile:native:node-host --prefix ../../../arkoala-arkts && npm run build --prefix ../../../arkoala-arkts && npm run build:user:abc && npm run build:loader:node --prefix ../../../arkoala-arkts && npm run run:node:ci --prefix ../../../arkoala-arkts", + "all:node:routing": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts/ && npm run build --prefix ../../../arkoala-arkts/ && npm run build:abc && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run run:node:routing", + "all:arm32": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm32 --prefix ../../../arkoala-arkts && npm run har-arm32 --prefix user && npm run launch", + "all:arm64": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64 --prefix ../../../arkoala-arkts && npm run har-arm64 --prefix user && npm run launch", + "all:universal": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal --prefix ../../../arkoala-arkts && npm run har-universal --prefix user && npm run launch", - "all:arm64:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64:aot --prefix ../../arkoala-arkts && npm run user:har:arm64:aot && npm run launch", - "all:universal:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal:aot --prefix ../../arkoala-arkts && npm run user:har:universal:aot && npm run launch" + "all:arm64:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64:aot --prefix ../../../arkoala-arkts && npm run user:har:arm64:aot && npm run launch", + "all:universal:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal:aot --prefix ../../../arkoala-arkts && npm run user:har:universal:aot && npm run launch" } } diff --git a/ets-tests/hap/user/app/AppScope/app.json5 b/ui2abc/ets-tests/hap/user/app/AppScope/app.json5 similarity index 100% rename from ets-tests/hap/user/app/AppScope/app.json5 rename to ui2abc/ets-tests/hap/user/app/AppScope/app.json5 diff --git a/ets-tests/hap/user/app/build-profile.json5 b/ui2abc/ets-tests/hap/user/app/build-profile.json5 similarity index 100% rename from ets-tests/hap/user/app/build-profile.json5 rename to ui2abc/ets-tests/hap/user/app/build-profile.json5 diff --git a/ets-tests/hap/user/app/hvigor/hvigor-config.json5 b/ui2abc/ets-tests/hap/user/app/hvigor/hvigor-config.json5 similarity index 100% rename from ets-tests/hap/user/app/hvigor/hvigor-config.json5 rename to ui2abc/ets-tests/hap/user/app/hvigor/hvigor-config.json5 diff --git a/ets-tests/hap/user/app/hvigorfile.ts b/ui2abc/ets-tests/hap/user/app/hvigorfile.ts similarity index 100% rename from ets-tests/hap/user/app/hvigorfile.ts rename to ui2abc/ets-tests/hap/user/app/hvigorfile.ts diff --git a/ets-tests/hap/user/app/oh-package-lock.json5 b/ui2abc/ets-tests/hap/user/app/oh-package-lock.json5 similarity index 100% rename from ets-tests/hap/user/app/oh-package-lock.json5 rename to ui2abc/ets-tests/hap/user/app/oh-package-lock.json5 diff --git a/ets-tests/hap/user/app/oh-package.json5 b/ui2abc/ets-tests/hap/user/app/oh-package.json5 similarity index 100% rename from ets-tests/hap/user/app/oh-package.json5 rename to ui2abc/ets-tests/hap/user/app/oh-package.json5 diff --git a/ets-tests/hap/user/app/user/BuildProfile.ets b/ui2abc/ets-tests/hap/user/app/user/BuildProfile.ets similarity index 100% rename from ets-tests/hap/user/app/user/BuildProfile.ets rename to ui2abc/ets-tests/hap/user/app/user/BuildProfile.ets diff --git a/ets-tests/hap/user/app/user/build-profile.json5 b/ui2abc/ets-tests/hap/user/app/user/build-profile.json5 similarity index 100% rename from ets-tests/hap/user/app/user/build-profile.json5 rename to ui2abc/ets-tests/hap/user/app/user/build-profile.json5 diff --git a/ets-tests/hap/user/app/user/hvigorfile.ts b/ui2abc/ets-tests/hap/user/app/user/hvigorfile.ts similarity index 100% rename from ets-tests/hap/user/app/user/hvigorfile.ts rename to ui2abc/ets-tests/hap/user/app/user/hvigorfile.ts diff --git a/ets-tests/hap/user/app/user/obfuscation-rules.txt b/ui2abc/ets-tests/hap/user/app/user/obfuscation-rules.txt similarity index 100% rename from ets-tests/hap/user/app/user/obfuscation-rules.txt rename to ui2abc/ets-tests/hap/user/app/user/obfuscation-rules.txt diff --git a/ets-tests/hap/user/app/user/oh-package.json5 b/ui2abc/ets-tests/hap/user/app/user/oh-package.json5 similarity index 100% rename from ets-tests/hap/user/app/user/oh-package.json5 rename to ui2abc/ets-tests/hap/user/app/user/oh-package.json5 diff --git a/ets-tests/hap/user/app/user/src/main/module.json5 b/ui2abc/ets-tests/hap/user/app/user/src/main/module.json5 similarity index 100% rename from ets-tests/hap/user/app/user/src/main/module.json5 rename to ui2abc/ets-tests/hap/user/app/user/src/main/module.json5 diff --git a/ets-tests/hap/user/package.json b/ui2abc/ets-tests/hap/user/package.json similarity index 100% rename from ets-tests/hap/user/package.json rename to ui2abc/ets-tests/hap/user/package.json diff --git a/ets-tests/hap/user/scripts/build-har-universal.mjs b/ui2abc/ets-tests/hap/user/scripts/build-har-universal.mjs similarity index 100% rename from ets-tests/hap/user/scripts/build-har-universal.mjs rename to ui2abc/ets-tests/hap/user/scripts/build-har-universal.mjs diff --git a/ets-tests/hap/user/scripts/build-har.mjs b/ui2abc/ets-tests/hap/user/scripts/build-har.mjs similarity index 100% rename from ets-tests/hap/user/scripts/build-har.mjs rename to ui2abc/ets-tests/hap/user/scripts/build-har.mjs diff --git a/ets-tests/hap/user/src/ets/entry.ets b/ui2abc/ets-tests/hap/user/src/ets/entry.ets similarity index 100% rename from ets-tests/hap/user/src/ets/entry.ets rename to ui2abc/ets-tests/hap/user/src/ets/entry.ets diff --git a/ets-tests/hap/user/src/ets/etsconfig.json b/ui2abc/ets-tests/hap/user/src/ets/etsconfig.json similarity index 100% rename from ets-tests/hap/user/src/ets/etsconfig.json rename to ui2abc/ets-tests/hap/user/src/ets/etsconfig.json diff --git a/ets-tests/hap/user/ui2abcconfig.json b/ui2abc/ets-tests/hap/user/ui2abcconfig.json similarity index 100% rename from ets-tests/hap/user/ui2abcconfig.json rename to ui2abc/ets-tests/hap/user/ui2abcconfig.json diff --git a/ets-tests/package.json b/ui2abc/ets-tests/package.json similarity index 44% rename from ets-tests/package.json rename to ui2abc/ets-tests/package.json index e90f9edb987b107904bc99f00a4fcbaa3bc7234a..0d774a4d8f8728bcd64600e57192dd0cf62e2eb5 100644 --- a/ets-tests/package.json +++ b/ui2abc/ets-tests/package.json @@ -14,22 +14,22 @@ ], "scripts": { "clean": "rimraf build", - "clean:all": "npm run clean && npm run clean:all --prefix ../arkoala-arkts", - "copy:deps": "mkdir -p ../arkoala-arkts/build/bootPandaFiles && cp ../incremental/harness/build/harness.abc ../arkoala-arkts/build/bootPandaFiles/", - "build:deps": "npm run compile:native:node-host -C ../arkoala-arkts && npm run build -C ../arkoala-arkts && npm run build -C ../incremental/harness && npm run build -C ../arkoala-arkts/arkui && npm run build:loader:node -C ../arkoala-arkts && npm run copy:deps", - "run:ets": "npm run build:ets && mkdir -p ../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../arkoala-arkts/build/userPandaFiles/ && cd ../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", - "run:golden": "npm run build:golden && mkdir -p ../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../arkoala-arkts/build/userPandaFiles/ && cd ../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", + "clean:all": "npm run clean && npm run clean:all --prefix ../../arkoala-arkts", + "copy:deps": "mkdir -p ../../arkoala-arkts/build/bootPandaFiles && cp ../../incremental/harness/build/harness.abc ../../arkoala-arkts/build/bootPandaFiles/", + "build:deps": "npm run compile:native:node-host -C ../../arkoala-arkts && npm run build -C ../../arkoala-arkts && npm run build -C ../../incremental/harness && npm run build -C ../../arkoala-arkts/arkui && npm run build:loader:node -C ../../arkoala-arkts && npm run copy:deps", + "run:ets": "npm run build:ets && mkdir -p ../../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../../arkoala-arkts/build/userPandaFiles/ && cd ../../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", + "run:golden": "npm run build:golden && mkdir -p ../../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../../arkoala-arkts/build/userPandaFiles/ && cd ../../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", "run": "npm run run:ets", "all:ets": "npm run build:deps && npm run run:ets", "all:golden": "npm run build:deps && npm run run:golden", "all": "npm run all:ets", - "check": "npm run compile --prefix ../ui2abc/ui-plugins && npm run run", - "build:ets": "npm run prepare:arkui && node ../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja", - "build:golden": "npm run prepare:arkui && node ../ui2abc/fast-arktsc --config ./golden-test-ui2abcconfig.json --compiler ../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja && mkdir -p build/golden", + "check": "npm run compile --prefix ../ui-plugins && npm run run", + "build:ets": "npm run prepare:arkui && node ../fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja", + "build:golden": "npm run prepare:arkui && node ../fast-arktsc --config ./golden-test-ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja && mkdir -p build/golden", "build": "npm run build:ets", "hap:golden": "npm run all:universal -C ./hap", "hap": "cp ./ets/{TestHarness.ets,utils.ets} ./hap/user/src/ets/ && cp -a ./ets/golden-tests ./hap/user/src/ets/ && npm run hap:golden", - "prepare:arkui": "npm run prepare:sdk --prefix ../arkoala-arkts/arkui" + "prepare:arkui": "npm run prepare:sdk --prefix ../../arkoala-arkts/arkui" }, "keywords": [], "dependencies": { @@ -48,4 +48,4 @@ "minimist": "1.2.8", "source-map-support": "^0.5.21" } -} \ No newline at end of file +} diff --git a/ets-tests/src/AppControl.ts b/ui2abc/ets-tests/src/AppControl.ts similarity index 100% rename from ets-tests/src/AppControl.ts rename to ui2abc/ets-tests/src/AppControl.ts diff --git a/ets-tests/src/Page.ts b/ui2abc/ets-tests/src/Page.ts similarity index 100% rename from ets-tests/src/Page.ts rename to ui2abc/ets-tests/src/Page.ts diff --git a/ets-tests/src/entry.ts b/ui2abc/ets-tests/src/entry.ts similarity index 100% rename from ets-tests/src/entry.ts rename to ui2abc/ets-tests/src/entry.ts diff --git a/ets-tests/src/index.ts b/ui2abc/ets-tests/src/index.ts similarity index 100% rename from ets-tests/src/index.ts rename to ui2abc/ets-tests/src/index.ts diff --git a/ets-tests/src/suites/AttributeModifier.ts b/ui2abc/ets-tests/src/suites/AttributeModifier.ts similarity index 100% rename from ets-tests/src/suites/AttributeModifier.ts rename to ui2abc/ets-tests/src/suites/AttributeModifier.ts diff --git a/ets-tests/src/suites/BuilderDecoratorTest.ts b/ui2abc/ets-tests/src/suites/BuilderDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/BuilderDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/BuilderDecoratorTest.ts diff --git a/ets-tests/src/suites/BuilderParamDecoratorTest.ts b/ui2abc/ets-tests/src/suites/BuilderParamDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/BuilderParamDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/BuilderParamDecoratorTest.ts diff --git a/ets-tests/src/suites/ComponentLifeCycle.ts b/ui2abc/ets-tests/src/suites/ComponentLifeCycle.ts similarity index 100% rename from ets-tests/src/suites/ComponentLifeCycle.ts rename to ui2abc/ets-tests/src/suites/ComponentLifeCycle.ts diff --git a/ets-tests/src/suites/LinkDecorator.ts b/ui2abc/ets-tests/src/suites/LinkDecorator.ts similarity index 100% rename from ets-tests/src/suites/LinkDecorator.ts rename to ui2abc/ets-tests/src/suites/LinkDecorator.ts diff --git a/ets-tests/src/suites/PropDecorator.ts b/ui2abc/ets-tests/src/suites/PropDecorator.ts similarity index 100% rename from ets-tests/src/suites/PropDecorator.ts rename to ui2abc/ets-tests/src/suites/PropDecorator.ts diff --git a/ets-tests/src/suites/ProvideConsume.ts b/ui2abc/ets-tests/src/suites/ProvideConsume.ts similarity index 100% rename from ets-tests/src/suites/ProvideConsume.ts rename to ui2abc/ets-tests/src/suites/ProvideConsume.ts diff --git a/ets-tests/src/suites/StateManagement.ts b/ui2abc/ets-tests/src/suites/StateManagement.ts similarity index 100% rename from ets-tests/src/suites/StateManagement.ts rename to ui2abc/ets-tests/src/suites/StateManagement.ts diff --git a/ets-tests/src/suites/StorageTests.ts b/ui2abc/ets-tests/src/suites/StorageTests.ts similarity index 100% rename from ets-tests/src/suites/StorageTests.ts rename to ui2abc/ets-tests/src/suites/StorageTests.ts diff --git a/ets-tests/src/suites/Styles.ts b/ui2abc/ets-tests/src/suites/Styles.ts similarity index 100% rename from ets-tests/src/suites/Styles.ts rename to ui2abc/ets-tests/src/suites/Styles.ts diff --git a/ets-tests/src/suites/WatchDecoratorTest.ts b/ui2abc/ets-tests/src/suites/WatchDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/WatchDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/WatchDecoratorTest.ts diff --git a/ets-tests/tsconfig.json b/ui2abc/ets-tests/tsconfig.json similarity index 100% rename from ets-tests/tsconfig.json rename to ui2abc/ets-tests/tsconfig.json diff --git a/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json similarity index 48% rename from ets-tests/ui2abcconfig.json rename to ui2abc/ets-tests/ui2abcconfig.json index 8a0f2c6a30a65e0a9de87e4b3df27d871c2d72fd..cbace643e19a05fea31ead3b0526d04062afbb66 100644 --- a/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -4,29 +4,29 @@ "outDir": "build/ets/abc", "baseUrl": ".", "paths": { - "arkui": ["../arkoala-arkts/arkui/sdk/prepared"], - "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], - "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], - "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], - "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos/src/multimedia.image"], - "@ohos.data.uniformTypeDescriptor": ["../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], - "@ohos.data.unifiedDataChannel": ["../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], - "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], - "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], - "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], - "@ohos.arkui.node": ["../arkoala-arkts/arkui/@ohos.arkui.node"], - "@ohos.arkui.dragController": ["../arkoala-arkts/arkui/@ohos.arkui.dragController"], - "@ohos.arkui.UIContext": ["../arkoala-arkts/arkui/@ohos.arkui.UIContext"], - "@ohos.arkui": ["../arkoala-arkts/arkui/@ohos.arkui"], - "@ohos.router": ["../arkoala-arkts/arkui/@ohos.router"], - "@koalaui/builderLambda": ["../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], - "@koalaui/interop": ["../interop/src/arkts"], - "@koalaui/harness": ["../incremental/harness/src/arkts"], - "@koalaui/compat": [ "../incremental/compat/src/arkts" ], - "#platform": [ "../incremental/compat/src/arkts" ], - "@koalaui/common": [ "../incremental/common/src" ], - "@koalaui/runtime": [ "../incremental/runtime/ets" ], - "@koalaui/runtime/annotations": [ "../incremental/runtime/annotations" ], + "arkui": ["../../arkoala-arkts/arkui/sdk/prepared"], + "@ohos.arkui.component": ["../../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../../arkoala-arkts/modules/global.resource/src/resource"], + "@ohos.font": ["../../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../arkoala-arkts/modules/ohos/src/multimedia.image"], + "@ohos.data.uniformTypeDescriptor": ["../../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], + "@ohos.data.unifiedDataChannel": ["../../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], + "@ohos.arkui.stateManagement": ["../../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], + "@ohos.arkui.inspector": ["../../arkoala-arkts/arkui/@ohos.arkui.inspector"], + "@ohos.arkui.theme": ["../../arkoala-arkts/arkui/@ohos.arkui.theme"], + "@ohos.arkui.node": ["../../arkoala-arkts/arkui/@ohos.arkui.node"], + "@ohos.arkui.dragController": ["../../arkoala-arkts/arkui/@ohos.arkui.dragController"], + "@ohos.arkui.UIContext": ["../../arkoala-arkts/arkui/@ohos.arkui.UIContext"], + "@ohos.arkui": ["../../arkoala-arkts/arkui/@ohos.arkui"], + "@ohos.router": ["../../arkoala-arkts/arkui/@ohos.router"], + "@koalaui/builderLambda": ["../../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], + "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/harness": ["../../incremental/harness/src/arkts"], + "@koalaui/compat": [ "../../incremental/compat/src/arkts" ], + "#platform": [ "../../incremental/compat/src/arkts" ], + "@koalaui/common": [ "../../incremental/common/src" ], + "@koalaui/runtime": [ "../../incremental/runtime/ets" ], + "@koalaui/runtime/annotations": [ "../../incremental/runtime/annotations" ], "@test/pages": [ "./ets/environment-tests/Pages.ets" ] }, "plugins": [ diff --git a/ui2abc/perf-tests/package.json b/ui2abc/perf-tests/package.json index f6969528b1a821888decdca0d0709894dda65bbd..a8db5caef99285af0ec752dec904cca86d27153f 100644 --- a/ui2abc/perf-tests/package.json +++ b/ui2abc/perf-tests/package.json @@ -4,8 +4,8 @@ "description": "ui2abc performance tests", "scripts": { "clean": "rimraf build", - "prepare": "npm run -C ../../ets-tests build:deps", - "recheck:inc": "node ../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/out-recheck.abc && time ninja ${NINJA_OPTIONS} -f build/build.ninja", + "prepare": "npm run -C ../ets-tests build:deps", + "recheck:inc": "node ../fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/out-recheck.abc && time ninja ${NINJA_OPTIONS} -f build/build.ninja", "recheck": "npm run clean && npm run recheck:inc" } } \ No newline at end of file