diff --git a/distributeddatamgr/BUILD.gn b/distributeddatamgr/BUILD.gn index 13262e64259d525ae46649ec45f21e60517c8c17..44251c1c06241033f80bd6c56094ec816ce6a654 100644 --- a/distributeddatamgr/BUILD.gn +++ b/distributeddatamgr/BUILD.gn @@ -29,3 +29,8 @@ group("distributeddatamgr") { ] } } + +group("pasteboard") { + testonly = true + deps = [ "Pasteboardjsapitest:ActsPasteBoardJSApiTest" ] +} diff --git a/miscservices/actspasteboardjsapitest/BUILD.gn b/distributeddatamgr/Pasteboardjsapitest/BUILD.gn similarity index 100% rename from miscservices/actspasteboardjsapitest/BUILD.gn rename to distributeddatamgr/Pasteboardjsapitest/BUILD.gn diff --git a/miscservices/actspasteboardjsapitest/Test.json b/distributeddatamgr/Pasteboardjsapitest/Test.json similarity index 100% rename from miscservices/actspasteboardjsapitest/Test.json rename to distributeddatamgr/Pasteboardjsapitest/Test.json diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/config.json b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/config.json similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/config.json rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/config.json diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/app.js b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/app.js similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/app.js rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/app.js diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/i18n/en-US.json b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/i18n/en-US.json rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/en-US.json diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/i18n/zh-CN.json b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/i18n/zh-CN.json rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.css b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.css rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.css diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.hml b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.hml rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.hml diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.js b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/pages/index/index.js rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.js diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/test/List.test.js b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/test/List.test.js similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/test/List.test.js rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/test/List.test.js diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/test/PasteBoardJsunit.test.js b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/test/PasteBoardJsunit.test.js similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/test/PasteBoardJsunit.test.js rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/test/PasteBoardJsunit.test.js diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/resources/base/element/string.json b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/resources/base/element/string.json rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/resources/base/element/string.json diff --git a/miscservices/InputMethodTest_ets/entry/src/main/resources/base/media/icon.png b/distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/resources/base/media/icon.png rename to distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/resources/base/media/icon.png diff --git a/miscservices/InputMethodTest_ets/local.properties b/distributeddatamgr/Pasteboardjsapitest/local.properties similarity index 100% rename from miscservices/InputMethodTest_ets/local.properties rename to distributeddatamgr/Pasteboardjsapitest/local.properties diff --git a/miscservices/InputMethodTest_ets/package-lock.json b/distributeddatamgr/Pasteboardjsapitest/package-lock.json similarity index 100% rename from miscservices/InputMethodTest_ets/package-lock.json rename to distributeddatamgr/Pasteboardjsapitest/package-lock.json diff --git a/miscservices/InputMethodTest_ets/signature/openharmony_sx.p7b b/distributeddatamgr/Pasteboardjsapitest/signature/openharmony_sx.p7b similarity index 100% rename from miscservices/InputMethodTest_ets/signature/openharmony_sx.p7b rename to distributeddatamgr/Pasteboardjsapitest/signature/openharmony_sx.p7b diff --git a/inputmethod/BUILD.gn b/inputmethod/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..621923e1c1e31e117351a00a9843987e24155314 --- /dev/null +++ b/inputmethod/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright (C) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos_var.gni") +group("inputmethod") { + testonly = true + deps = [ "InputMethodTest_ets:ActsInputMethodEtsTest" ] +} diff --git a/miscservices/InputMethodTest_ets/.idea/.deveco/project.cache.json b/inputmethod/InputMethodTest_ets/.idea/.deveco/project.cache.json similarity index 100% rename from miscservices/InputMethodTest_ets/.idea/.deveco/project.cache.json rename to inputmethod/InputMethodTest_ets/.idea/.deveco/project.cache.json diff --git a/miscservices/InputMethodTest_ets/.idea/.gitignore b/inputmethod/InputMethodTest_ets/.idea/.gitignore similarity index 100% rename from miscservices/InputMethodTest_ets/.idea/.gitignore rename to inputmethod/InputMethodTest_ets/.idea/.gitignore diff --git a/miscservices/InputMethodTest_ets/.idea/InputMethodTest_ets.iml b/inputmethod/InputMethodTest_ets/.idea/InputMethodTest_ets.iml similarity index 100% rename from miscservices/InputMethodTest_ets/.idea/InputMethodTest_ets.iml rename to inputmethod/InputMethodTest_ets/.idea/InputMethodTest_ets.iml diff --git a/miscservices/InputMethodTest_ets/.idea/modules.xml b/inputmethod/InputMethodTest_ets/.idea/modules.xml similarity index 100% rename from miscservices/InputMethodTest_ets/.idea/modules.xml rename to inputmethod/InputMethodTest_ets/.idea/modules.xml diff --git a/miscservices/InputMethodTest_ets/.idea/vcs.xml b/inputmethod/InputMethodTest_ets/.idea/vcs.xml similarity index 100% rename from miscservices/InputMethodTest_ets/.idea/vcs.xml rename to inputmethod/InputMethodTest_ets/.idea/vcs.xml diff --git a/miscservices/InputMethodTest_ets/BUILD.gn b/inputmethod/InputMethodTest_ets/BUILD.gn similarity index 100% rename from miscservices/InputMethodTest_ets/BUILD.gn rename to inputmethod/InputMethodTest_ets/BUILD.gn diff --git a/miscservices/InputMethodTest_ets/Test.json b/inputmethod/InputMethodTest_ets/Test.json similarity index 100% rename from miscservices/InputMethodTest_ets/Test.json rename to inputmethod/InputMethodTest_ets/Test.json diff --git a/miscservices/InputMethodTest_ets/entry/src/main/config.json b/inputmethod/InputMethodTest_ets/entry/src/main/config.json similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/config.json rename to inputmethod/InputMethodTest_ets/entry/src/main/config.json diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/app.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/app.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/app.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/index.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/index.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/input.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/input.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/input.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/input.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/TestAbility/app.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/TestAbility/app.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/TestAbility/app.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/TestAbility/app.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/TestAbility/pages/index.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/TestAbility/pages/index.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/TestAbility/pages/index.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/TestAbility/pages/index.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/inputmethod/InputMethodTest_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputRequestJsunit.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputRequestJsunit.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputRequestJsunit.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputRequestJsunit.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputmethodEngineJsunit.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethodEngineJsunit.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputmethodEngineJsunit.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethodEngineJsunit.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputmethohJsunit.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethohJsunit.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/InputmethohJsunit.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethohJsunit.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/List.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/List.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/List.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/List.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/RequestDownloadTaskJsunit.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestDownloadTaskJsunit.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/RequestDownloadTaskJsunit.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestDownloadTaskJsunit.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/RequestJsunit.test.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestJsunit.test.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/RequestJsunit.test.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestJsunit.test.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/ets/test/Utils.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/Utils.ets similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/ets/test/Utils.ets rename to inputmethod/InputMethodTest_ets/entry/src/main/ets/test/Utils.ets diff --git a/miscservices/InputMethodTest_ets/entry/src/main/resources/base/element/string.json b/inputmethod/InputMethodTest_ets/entry/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/InputMethodTest_ets/entry/src/main/resources/base/element/string.json rename to inputmethod/InputMethodTest_ets/entry/src/main/resources/base/element/string.json diff --git a/miscservices/RequestTest_js/entry/src/main/resources/base/media/icon.png b/inputmethod/InputMethodTest_ets/entry/src/main/resources/base/media/icon.png similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/resources/base/media/icon.png rename to inputmethod/InputMethodTest_ets/entry/src/main/resources/base/media/icon.png diff --git a/miscservices/actspasteboardjsapitest/local.properties b/inputmethod/InputMethodTest_ets/local.properties similarity index 100% rename from miscservices/actspasteboardjsapitest/local.properties rename to inputmethod/InputMethodTest_ets/local.properties diff --git a/miscservices/actspasteboardjsapitest/package-lock.json b/inputmethod/InputMethodTest_ets/package-lock.json similarity index 100% rename from miscservices/actspasteboardjsapitest/package-lock.json rename to inputmethod/InputMethodTest_ets/package-lock.json diff --git a/miscservices/RequestTest_js/signature/openharmony_sx.p7b b/inputmethod/InputMethodTest_ets/signature/openharmony_sx.p7b similarity index 100% rename from miscservices/RequestTest_js/signature/openharmony_sx.p7b rename to inputmethod/InputMethodTest_ets/signature/openharmony_sx.p7b diff --git a/miscservices/actspasteboardjsapitest/.idea/.deveco/project.cache.json b/miscservices/actspasteboardjsapitest/.idea/.deveco/project.cache.json deleted file mode 100644 index 9f11beeeceb5025c56c4ee6cb8fba93c7f2bae44..0000000000000000000000000000000000000000 --- a/miscservices/actspasteboardjsapitest/.idea/.deveco/project.cache.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "BuildOptions":{}, - "CommonInfo":{ - "project.ide.version":"3.0.0.900" - } -} \ No newline at end of file diff --git a/miscservices/actspasteboardjsapitest/.idea/.gitignore b/miscservices/actspasteboardjsapitest/.idea/.gitignore deleted file mode 100644 index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000 --- a/miscservices/actspasteboardjsapitest/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/miscservices/actspasteboardjsapitest/.idea/actspasteboardjsapitest.iml b/miscservices/actspasteboardjsapitest/.idea/actspasteboardjsapitest.iml deleted file mode 100644 index 61021940449bdc69db005bbd04a05380f5629b2c..0000000000000000000000000000000000000000 --- a/miscservices/actspasteboardjsapitest/.idea/actspasteboardjsapitest.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/miscservices/actspasteboardjsapitest/.idea/modules.xml b/miscservices/actspasteboardjsapitest/.idea/modules.xml deleted file mode 100644 index 5a9e3884550918567ee62dba0251979b283436e7..0000000000000000000000000000000000000000 --- a/miscservices/actspasteboardjsapitest/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/miscservices/actspasteboardjsapitest/.idea/vcs.xml b/miscservices/actspasteboardjsapitest/.idea/vcs.xml deleted file mode 100644 index b2bdec2d71b6a5ce4ae49efc37516809c50e4d5e..0000000000000000000000000000000000000000 --- a/miscservices/actspasteboardjsapitest/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/request/BUILD.gn b/request/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..6bea708ff4007e8111e1a38567f38e357b6da8e8 --- /dev/null +++ b/request/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright (C) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos_var.gni") +group("request") { + testonly = true + deps = [ "RequestTest_js:ActsMiscservicesRequestJSApiTest" ] +} diff --git a/miscservices/RequestTest_js/BUILD.gn b/request/RequestTest_js/BUILD.gn similarity index 100% rename from miscservices/RequestTest_js/BUILD.gn rename to request/RequestTest_js/BUILD.gn diff --git a/miscservices/RequestTest_js/Test.json b/request/RequestTest_js/Test.json similarity index 100% rename from miscservices/RequestTest_js/Test.json rename to request/RequestTest_js/Test.json diff --git a/miscservices/RequestTest_js/entry/src/main/config.json b/request/RequestTest_js/entry/src/main/config.json similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/config.json rename to request/RequestTest_js/entry/src/main/config.json diff --git a/miscservices/RequestTest_js/entry/src/main/js/Test/List.test.js b/request/RequestTest_js/entry/src/main/js/Test/List.test.js similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/Test/List.test.js rename to request/RequestTest_js/entry/src/main/js/Test/List.test.js diff --git a/miscservices/RequestTest_js/entry/src/main/js/Test/Publicfunction.js b/request/RequestTest_js/entry/src/main/js/Test/Publicfunction.js similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/Test/Publicfunction.js rename to request/RequestTest_js/entry/src/main/js/Test/Publicfunction.js diff --git a/miscservices/RequestTest_js/entry/src/main/js/Test/UploadCallbackXTSJsunit.test.js b/request/RequestTest_js/entry/src/main/js/Test/UploadCallbackXTSJsunit.test.js similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/Test/UploadCallbackXTSJsunit.test.js rename to request/RequestTest_js/entry/src/main/js/Test/UploadCallbackXTSJsunit.test.js diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/app.js b/request/RequestTest_js/entry/src/main/js/default/app.js similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/app.js rename to request/RequestTest_js/entry/src/main/js/default/app.js diff --git a/miscservices/TimeTest_js/src/main/js/default/i18n/en-US.json b/request/RequestTest_js/entry/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/i18n/en-US.json rename to request/RequestTest_js/entry/src/main/js/default/i18n/en-US.json diff --git a/miscservices/TimeTest_js/src/main/js/default/i18n/zh-CN.json b/request/RequestTest_js/entry/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/i18n/zh-CN.json rename to request/RequestTest_js/entry/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.css b/request/RequestTest_js/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.css rename to request/RequestTest_js/entry/src/main/js/default/pages/index/index.css diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.hml b/request/RequestTest_js/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.hml rename to request/RequestTest_js/entry/src/main/js/default/pages/index/index.hml diff --git a/miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.js b/request/RequestTest_js/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/js/default/pages/index/index.js rename to request/RequestTest_js/entry/src/main/js/default/pages/index/index.js diff --git a/miscservices/RequestTest_js/entry/src/main/resources/base/element/string.json b/request/RequestTest_js/entry/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/RequestTest_js/entry/src/main/resources/base/element/string.json rename to request/RequestTest_js/entry/src/main/resources/base/element/string.json diff --git a/miscservices/TimeTest_js/src/main/resources/base/media/icon.png b/request/RequestTest_js/entry/src/main/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from miscservices/TimeTest_js/src/main/resources/base/media/icon.png rename to request/RequestTest_js/entry/src/main/resources/base/media/icon.png diff --git a/miscservices/TimeTest_js/signature/openharmony_sx.p7b b/request/RequestTest_js/signature/openharmony_sx.p7b old mode 100755 new mode 100644 similarity index 100% rename from miscservices/TimeTest_js/signature/openharmony_sx.p7b rename to request/RequestTest_js/signature/openharmony_sx.p7b diff --git a/test_packages.gni b/test_packages.gni index 9611590a7d3d55b8c9cda69a36fd4b440466c4c9..8a6e5d4d7e4d2e201018238593b341b6f2188996 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -24,10 +24,14 @@ _all_test_packages = [ "${ACTS_ROOT}/communication:communication", "${ACTS_ROOT}/notification:notification", "${ACTS_ROOT}/ability:ability", - "${ACTS_ROOT}/miscservices:miscservices", + "${ACTS_ROOT}/time:time", + "${ACTS_ROOT}/theme:theme", + "${ACTS_ROOT}/request:request", + "${ACTS_ROOT}/inputmethod:inputmethod", "${ACTS_ROOT}/powermgr:powermgr", "${ACTS_ROOT}/startup:startup", "${ACTS_ROOT}/sensors:sensor", + "${ACTS_ROOT}/distributeddatamgr:pasteboard", "${ACTS_ROOT}/distributeddatamgr:distributeddatamgr", "${ACTS_ROOT}/graphic:graphic", "${ACTS_ROOT}/arkui:arkui", diff --git a/miscservices/BUILD.gn b/theme/BUILD.gn similarity index 74% rename from miscservices/BUILD.gn rename to theme/BUILD.gn index 0e05ce9deed5713b662f3e7e90de49b4a25346bc..441614e3ab4783a03e6564a3ffa1990b62440c75 100755 --- a/miscservices/BUILD.gn +++ b/theme/BUILD.gn @@ -12,14 +12,9 @@ # limitations under the License. import("//build/ohos_var.gni") -group("miscservices") { +group("theme") { testonly = true deps = [ - "InputMethodTest_ets:ActsInputMethodEtsTest", - "RequestTest_js:ActsMiscservicesRequestJSApiTest", - "TimeTest_js:ActsTimeJSApiTest", - "TimerTest_js:ActsTimerJSApiTest", - "actspasteboardjsapitest:ActsPasteBoardJSApiTest", "screenlock_js:ActsScreenLockJSApiTest", "wallpaper_js:ActsWallpaperJSApiTest", ] diff --git a/miscservices/screenlock_js/BUILD.gn b/theme/screenlock_js/BUILD.gn similarity index 100% rename from miscservices/screenlock_js/BUILD.gn rename to theme/screenlock_js/BUILD.gn diff --git a/miscservices/screenlock_js/Test.json b/theme/screenlock_js/Test.json similarity index 100% rename from miscservices/screenlock_js/Test.json rename to theme/screenlock_js/Test.json diff --git a/miscservices/TimerTest_js/signature/openharmony_sx.p7b b/theme/screenlock_js/signature/openharmony_sx.p7b similarity index 100% rename from miscservices/TimerTest_js/signature/openharmony_sx.p7b rename to theme/screenlock_js/signature/openharmony_sx.p7b diff --git a/miscservices/screenlock_js/src/main/config.json b/theme/screenlock_js/src/main/config.json similarity index 100% rename from miscservices/screenlock_js/src/main/config.json rename to theme/screenlock_js/src/main/config.json diff --git a/miscservices/screenlock_js/src/main/js/default/app.js b/theme/screenlock_js/src/main/js/default/app.js similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/app.js rename to theme/screenlock_js/src/main/js/default/app.js diff --git a/miscservices/screenlock_js/src/main/js/default/common/images/Wallpaper.png b/theme/screenlock_js/src/main/js/default/common/images/Wallpaper.png similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/common/images/Wallpaper.png rename to theme/screenlock_js/src/main/js/default/common/images/Wallpaper.png diff --git a/miscservices/screenlock_js/src/main/js/default/common/images/bg-tv.jpg b/theme/screenlock_js/src/main/js/default/common/images/bg-tv.jpg similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/common/images/bg-tv.jpg rename to theme/screenlock_js/src/main/js/default/common/images/bg-tv.jpg diff --git a/miscservices/TimerTest_js/src/main/js/default/i18n/en-US.json b/theme/screenlock_js/src/main/js/default/i18n/en-US.json similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/i18n/en-US.json rename to theme/screenlock_js/src/main/js/default/i18n/en-US.json diff --git a/miscservices/TimerTest_js/src/main/js/default/i18n/zh-CN.json b/theme/screenlock_js/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/i18n/zh-CN.json rename to theme/screenlock_js/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/screenlock_js/src/main/js/default/pages/index/index.css b/theme/screenlock_js/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/pages/index/index.css rename to theme/screenlock_js/src/main/js/default/pages/index/index.css diff --git a/miscservices/screenlock_js/src/main/js/default/pages/index/index.hml b/theme/screenlock_js/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/pages/index/index.hml rename to theme/screenlock_js/src/main/js/default/pages/index/index.hml diff --git a/miscservices/screenlock_js/src/main/js/default/pages/index/index.js b/theme/screenlock_js/src/main/js/default/pages/index/index.js similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/pages/index/index.js rename to theme/screenlock_js/src/main/js/default/pages/index/index.js diff --git a/miscservices/screenlock_js/src/main/js/test/List.test.js b/theme/screenlock_js/src/main/js/test/List.test.js similarity index 100% rename from miscservices/screenlock_js/src/main/js/test/List.test.js rename to theme/screenlock_js/src/main/js/test/List.test.js diff --git a/miscservices/screenlock_js/src/main/js/test/screenlock_service_test.js b/theme/screenlock_js/src/main/js/test/screenlock_service_test.js similarity index 100% rename from miscservices/screenlock_js/src/main/js/test/screenlock_service_test.js rename to theme/screenlock_js/src/main/js/test/screenlock_service_test.js diff --git a/miscservices/screenlock_js/src/main/js/test/screenlock_service_test_promise.js b/theme/screenlock_js/src/main/js/test/screenlock_service_test_promise.js similarity index 100% rename from miscservices/screenlock_js/src/main/js/test/screenlock_service_test_promise.js rename to theme/screenlock_js/src/main/js/test/screenlock_service_test_promise.js diff --git a/miscservices/screenlock_js/src/main/resources/base/element/string.json b/theme/screenlock_js/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/screenlock_js/src/main/resources/base/element/string.json rename to theme/screenlock_js/src/main/resources/base/element/string.json diff --git a/miscservices/TimerTest_js/src/main/resources/base/media/icon.png b/theme/screenlock_js/src/main/resources/base/media/icon.png similarity index 100% rename from miscservices/TimerTest_js/src/main/resources/base/media/icon.png rename to theme/screenlock_js/src/main/resources/base/media/icon.png diff --git a/miscservices/wallpaper_js/BUILD.gn b/theme/wallpaper_js/BUILD.gn similarity index 100% rename from miscservices/wallpaper_js/BUILD.gn rename to theme/wallpaper_js/BUILD.gn diff --git a/miscservices/wallpaper_js/Test.json b/theme/wallpaper_js/Test.json similarity index 100% rename from miscservices/wallpaper_js/Test.json rename to theme/wallpaper_js/Test.json diff --git a/miscservices/actspasteboardjsapitest/signature/openharmony_sx.p7b b/theme/wallpaper_js/signature/openharmony_sx.p7b similarity index 100% rename from miscservices/actspasteboardjsapitest/signature/openharmony_sx.p7b rename to theme/wallpaper_js/signature/openharmony_sx.p7b diff --git a/miscservices/wallpaper_js/src/main/config.json b/theme/wallpaper_js/src/main/config.json similarity index 100% rename from miscservices/wallpaper_js/src/main/config.json rename to theme/wallpaper_js/src/main/config.json diff --git a/miscservices/wallpaper_js/src/main/js/Test/List.test.js b/theme/wallpaper_js/src/main/js/Test/List.test.js similarity index 100% rename from miscservices/wallpaper_js/src/main/js/Test/List.test.js rename to theme/wallpaper_js/src/main/js/Test/List.test.js diff --git a/miscservices/wallpaper_js/src/main/js/Test/Wallpaper/WallpaperJsunit.test.js b/theme/wallpaper_js/src/main/js/Test/Wallpaper/WallpaperJsunit.test.js similarity index 100% rename from miscservices/wallpaper_js/src/main/js/Test/Wallpaper/WallpaperJsunit.test.js rename to theme/wallpaper_js/src/main/js/Test/Wallpaper/WallpaperJsunit.test.js diff --git a/miscservices/wallpaper_js/src/main/js/default/app.js b/theme/wallpaper_js/src/main/js/default/app.js similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/app.js rename to theme/wallpaper_js/src/main/js/default/app.js diff --git a/miscservices/wallpaper_js/src/main/js/default/common/images/Wallpaper.png b/theme/wallpaper_js/src/main/js/default/common/images/Wallpaper.png similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/common/images/Wallpaper.png rename to theme/wallpaper_js/src/main/js/default/common/images/Wallpaper.png diff --git a/miscservices/wallpaper_js/src/main/js/default/common/images/bg-tv.jpg b/theme/wallpaper_js/src/main/js/default/common/images/bg-tv.jpg similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/common/images/bg-tv.jpg rename to theme/wallpaper_js/src/main/js/default/common/images/bg-tv.jpg diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/i18n/en-US.json b/theme/wallpaper_js/src/main/js/default/i18n/en-US.json similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/i18n/en-US.json rename to theme/wallpaper_js/src/main/js/default/i18n/en-US.json diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/default/i18n/zh-CN.json b/theme/wallpaper_js/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/default/i18n/zh-CN.json rename to theme/wallpaper_js/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/wallpaper_js/src/main/js/default/pages/index/index.css b/theme/wallpaper_js/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/pages/index/index.css rename to theme/wallpaper_js/src/main/js/default/pages/index/index.css diff --git a/miscservices/wallpaper_js/src/main/js/default/pages/index/index.hml b/theme/wallpaper_js/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/pages/index/index.hml rename to theme/wallpaper_js/src/main/js/default/pages/index/index.hml diff --git a/miscservices/wallpaper_js/src/main/js/default/pages/index/index.js b/theme/wallpaper_js/src/main/js/default/pages/index/index.js similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/pages/index/index.js rename to theme/wallpaper_js/src/main/js/default/pages/index/index.js diff --git a/miscservices/wallpaper_js/src/main/resources/base/element/string.json b/theme/wallpaper_js/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/wallpaper_js/src/main/resources/base/element/string.json rename to theme/wallpaper_js/src/main/resources/base/element/string.json diff --git a/miscservices/actspasteboardjsapitest/entry/src/main/js/resources/base/media/icon.png b/theme/wallpaper_js/src/main/resources/base/media/icon.png similarity index 100% rename from miscservices/actspasteboardjsapitest/entry/src/main/js/resources/base/media/icon.png rename to theme/wallpaper_js/src/main/resources/base/media/icon.png diff --git a/time/BUILD.gn b/time/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..49d9a1c979ba6daf141e980bd9b945e2a01766ac --- /dev/null +++ b/time/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright (C) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos_var.gni") +group("time") { + testonly = true + deps = [ + "TimeTest_js:ActsTimeJSApiTest", + "TimerTest_js:ActsTimerJSApiTest", + ] +} diff --git a/miscservices/TimeTest_js/BUILD.gn b/time/TimeTest_js/BUILD.gn similarity index 100% rename from miscservices/TimeTest_js/BUILD.gn rename to time/TimeTest_js/BUILD.gn diff --git a/miscservices/TimeTest_js/Test.json b/time/TimeTest_js/Test.json similarity index 100% rename from miscservices/TimeTest_js/Test.json rename to time/TimeTest_js/Test.json diff --git a/miscservices/screenlock_js/signature/openharmony_sx.p7b b/time/TimeTest_js/signature/openharmony_sx.p7b old mode 100644 new mode 100755 similarity index 100% rename from miscservices/screenlock_js/signature/openharmony_sx.p7b rename to time/TimeTest_js/signature/openharmony_sx.p7b diff --git a/miscservices/TimeTest_js/src/main/config.json b/time/TimeTest_js/src/main/config.json similarity index 100% rename from miscservices/TimeTest_js/src/main/config.json rename to time/TimeTest_js/src/main/config.json diff --git a/miscservices/TimeTest_js/src/main/js/default/app.js b/time/TimeTest_js/src/main/js/default/app.js similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/app.js rename to time/TimeTest_js/src/main/js/default/app.js diff --git a/miscservices/screenlock_js/src/main/js/default/i18n/en-US.json b/time/TimeTest_js/src/main/js/default/i18n/en-US.json old mode 100644 new mode 100755 similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/i18n/en-US.json rename to time/TimeTest_js/src/main/js/default/i18n/en-US.json diff --git a/miscservices/screenlock_js/src/main/js/default/i18n/zh-CN.json b/time/TimeTest_js/src/main/js/default/i18n/zh-CN.json old mode 100644 new mode 100755 similarity index 100% rename from miscservices/screenlock_js/src/main/js/default/i18n/zh-CN.json rename to time/TimeTest_js/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/TimeTest_js/src/main/js/default/pages/index/index.css b/time/TimeTest_js/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/pages/index/index.css rename to time/TimeTest_js/src/main/js/default/pages/index/index.css diff --git a/miscservices/TimeTest_js/src/main/js/default/pages/index/index.hml b/time/TimeTest_js/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/pages/index/index.hml rename to time/TimeTest_js/src/main/js/default/pages/index/index.hml diff --git a/miscservices/TimeTest_js/src/main/js/default/pages/index/index.js b/time/TimeTest_js/src/main/js/default/pages/index/index.js similarity index 95% rename from miscservices/TimeTest_js/src/main/js/default/pages/index/index.js rename to time/TimeTest_js/src/main/js/default/pages/index/index.js index 683d21658fdfe2191a6481e9a35f173b04c6b2f7..b322cafacae644bcb3097d3f61a619e8059c501b 100755 --- a/miscservices/TimeTest_js/src/main/js/default/pages/index/index.js +++ b/time/TimeTest_js/src/main/js/default/pages/index/index.js @@ -14,7 +14,6 @@ */ import app from '@system.app' -//import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global diff --git a/miscservices/TimeTest_js/src/main/js/default/test/List.test.js b/time/TimeTest_js/src/main/js/default/test/List.test.js similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/test/List.test.js rename to time/TimeTest_js/src/main/js/default/test/List.test.js diff --git a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js b/time/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js similarity index 99% rename from miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js rename to time/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js index 97d8bc16abd582698626d4f5a23c7781da3b3a8f..ec0c614cf6d2c878b0282fd7be11ffe09c0d754c 100644 --- a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js +++ b/time/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js @@ -27,6 +27,7 @@ import { describe("TimeTest", function () { console.log("start################################start"); + /** * @tc.number SUB_systemTime_getRealActiveTime_JS_API_0100 * @tc.name Test systemTime.getRealActiveTime diff --git a/miscservices/TimeTest_js/src/main/js/default/test/Time.test.js b/time/TimeTest_js/src/main/js/default/test/Time.test.js similarity index 100% rename from miscservices/TimeTest_js/src/main/js/default/test/Time.test.js rename to time/TimeTest_js/src/main/js/default/test/Time.test.js diff --git a/miscservices/TimeTest_js/src/main/resources/base/element/string.json b/time/TimeTest_js/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/TimeTest_js/src/main/resources/base/element/string.json rename to time/TimeTest_js/src/main/resources/base/element/string.json diff --git a/miscservices/screenlock_js/src/main/resources/base/media/icon.png b/time/TimeTest_js/src/main/resources/base/media/icon.png old mode 100644 new mode 100755 similarity index 100% rename from miscservices/screenlock_js/src/main/resources/base/media/icon.png rename to time/TimeTest_js/src/main/resources/base/media/icon.png diff --git a/miscservices/TimerTest_js/BUILD.gn b/time/TimerTest_js/BUILD.gn similarity index 100% rename from miscservices/TimerTest_js/BUILD.gn rename to time/TimerTest_js/BUILD.gn diff --git a/miscservices/TimerTest_js/Test.json b/time/TimerTest_js/Test.json similarity index 100% rename from miscservices/TimerTest_js/Test.json rename to time/TimerTest_js/Test.json diff --git a/miscservices/wallpaper_js/signature/openharmony_sx.p7b b/time/TimerTest_js/signature/openharmony_sx.p7b similarity index 100% rename from miscservices/wallpaper_js/signature/openharmony_sx.p7b rename to time/TimerTest_js/signature/openharmony_sx.p7b diff --git a/miscservices/TimerTest_js/src/main/config.json b/time/TimerTest_js/src/main/config.json similarity index 100% rename from miscservices/TimerTest_js/src/main/config.json rename to time/TimerTest_js/src/main/config.json diff --git a/miscservices/TimerTest_js/src/main/js/default/app.js b/time/TimerTest_js/src/main/js/default/app.js similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/app.js rename to time/TimerTest_js/src/main/js/default/app.js diff --git a/miscservices/wallpaper_js/src/main/js/default/i18n/en-US.json b/time/TimerTest_js/src/main/js/default/i18n/en-US.json similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/i18n/en-US.json rename to time/TimerTest_js/src/main/js/default/i18n/en-US.json diff --git a/miscservices/wallpaper_js/src/main/js/default/i18n/zh-CN.json b/time/TimerTest_js/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from miscservices/wallpaper_js/src/main/js/default/i18n/zh-CN.json rename to time/TimerTest_js/src/main/js/default/i18n/zh-CN.json diff --git a/miscservices/TimerTest_js/src/main/js/default/pages/index/index.css b/time/TimerTest_js/src/main/js/default/pages/index/index.css similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/pages/index/index.css rename to time/TimerTest_js/src/main/js/default/pages/index/index.css diff --git a/miscservices/TimerTest_js/src/main/js/default/pages/index/index.hml b/time/TimerTest_js/src/main/js/default/pages/index/index.hml similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/pages/index/index.hml rename to time/TimerTest_js/src/main/js/default/pages/index/index.hml diff --git a/miscservices/TimerTest_js/src/main/js/default/pages/index/index.js b/time/TimerTest_js/src/main/js/default/pages/index/index.js similarity index 95% rename from miscservices/TimerTest_js/src/main/js/default/pages/index/index.js rename to time/TimerTest_js/src/main/js/default/pages/index/index.js index c41eff97753bb7e8937794076dc8ca97672f66c5..876dee977f2afcf38af5c986e8201f3760232611 100644 --- a/miscservices/TimerTest_js/src/main/js/default/pages/index/index.js +++ b/time/TimerTest_js/src/main/js/default/pages/index/index.js @@ -14,7 +14,6 @@ */ import app from '@system.app' -//import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global diff --git a/miscservices/TimerTest_js/src/main/js/default/test/List.test.js b/time/TimerTest_js/src/main/js/default/test/List.test.js similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/test/List.test.js rename to time/TimerTest_js/src/main/js/default/test/List.test.js diff --git a/miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js b/time/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js similarity index 100% rename from miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js rename to time/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js diff --git a/miscservices/TimerTest_js/src/main/resources/base/element/string.json b/time/TimerTest_js/src/main/resources/base/element/string.json similarity index 100% rename from miscservices/TimerTest_js/src/main/resources/base/element/string.json rename to time/TimerTest_js/src/main/resources/base/element/string.json diff --git a/miscservices/wallpaper_js/src/main/resources/base/media/icon.png b/time/TimerTest_js/src/main/resources/base/media/icon.png similarity index 100% rename from miscservices/wallpaper_js/src/main/resources/base/media/icon.png rename to time/TimerTest_js/src/main/resources/base/media/icon.png