openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 16:13:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4032 Adaptation Previewer Test Framework

Browse Source 
Merge pull request !4032 from 常佳兴/test
This commit is contained in:
openharmony_ci 2023-05-10 12:56:41 +00:00 committed by Gitee
commit 973c2f2e63
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ecmascript/base/path_helper.h
View File

@ -44,6 +44,7 @@ public:
static constexpr char BUNDLE_SUB_INSTALL_PATH[] = "/data/storage/el1/";
static constexpr char PREVIEW_OF_ACROSS_HAP_FLAG[] = "[preview]";
static constexpr char NAME_SPACE_TAG[] = "@";
static constexpr char PREVIER_TEST_DIR[] = ".test";
static constexpr size_t MAX_PACKAGE_LEVEL = 1;
static constexpr size_t SEGMENTS_LIMIT_TWO = 2;
@ -107,7 +108,7 @@ public:
CString elem = fileName.substr(prev, curr - prev);
if (elem == ".." && !elems.empty()) {
elems.pop_back();
} else if (elem != ".") {
} else if (elem != "." && elem != "..") {
elems.push_back(elem);
}
}
@ -154,7 +155,13 @@ public:
#if !defined(PANDA_TARGET_WINDOWS) && !defined(PANDA_TARGET_MACOS)
entryPoint = vm->GetBundleName() + "/" + inputFileName;
#else
entryPoint = vm->GetBundleName() + "/" + vm->GetModuleName() + MODULE_DEFAULE_ETS + inputFileName;
// if the inputFileName starts with '.test', the preview test page is started.
// in this case, the path ets does not need to be combined.
if (StringHelper::StringStartWith(inputFileName, PREVIER_TEST_DIR)) {
entryPoint = vm->GetBundleName() + "/" + vm->GetModuleName() + "/" + inputFileName;
} else {
entryPoint = vm->GetBundleName() + "/" + vm->GetModuleName() + MODULE_DEFAULE_ETS + inputFileName;
}
#endif
}
}

2
ecmascript/module/tests/ecma_module_test.cpp
View File

@ -423,7 +423,7 @@ HWTEST_F_L0(EcmaModuleTest, NormalizePath)
CString res2 = "node_modules/0/moduleTest/index";
CString moduleRecordName2 = "./node_modules///0//moduleTest/index";
CString res3 = "../node_modules/0/moduleTest/index";
CString res3 = "node_modules/0/moduleTest/index";
CString moduleRecordName3 = "../node_modules/0/moduleTest///index";
CString res4 = "moduleTest/index";