modify testcase

Signed-off-by: wuxiaodan <wuxiaodan5@huawei.com>
This commit is contained in:
wuxiaodan 2023-05-05 19:58:54 +08:00
parent af66594ec9
commit d01a4dc340
8 changed files with 28 additions and 82 deletions

View File

@ -11,8 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/ohos.gni")
#import("//foundation/distributeddatamgr/data_share/datashare.gni")
group("distributeddatatest") {
testonly = true
if (is_standard_system) {
@ -26,45 +24,21 @@ group("distributeddatatest") {
}
ohos_shared_library("disDataProcess") {
#module_out_path = module_output_path
#
sources = [ "./cpptest/process_common/process_msg.cpp" ]
visibility = [ ":*" ]
include_dirs = [ "../common" ]
include_dirs = [
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/permission",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/account",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/broadcaster",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/utils",
"//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/distributeddatafwk/include",
"//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/distributeddatafwk/src",
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/app_distributeddata/include",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/ include",
"../include",
"../../../../interfaces/innerkits/distributeddata",
"//third_party/json/single_include",
"//base/powermgr/power_manager/interfaces/innerkits/native/include",
"../../common",
"../common",
# "${datashare_innerapi_path}/common/include",
# "${datashare_innerapi_path}/provider/include",
"//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/mod_securitylabel",
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
"//base/security/access_token/interfaces/innerkits/accesstoke/include",
"//base/security/access_token/interfaces/innerkits/nativetoken/include",
]
deps = [
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//commonlibrary/c_utils/base:utils",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter:distributeddata_adapter",
"//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb:distributeddb",
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_inner",
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils",
"device_manager:devicemanagersdk",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
]
subsystem_name = "distributeddatamgr"
part_name = "kv_store"
}

View File

@ -10,29 +10,13 @@
# 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("//test/xts/tools/build/suite.gni")
import("../../../../tools/build/suite.gni")
module_output_path = "dcts/distributeddatamgr"
###############################################################################################
config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/permission",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/account",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/broadcaster",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter/include/utils",
"//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/distributeddatafwk/include",
"//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/distributeddatafwk/src",
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/app_distributeddata/include",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/ include",
"../include",
"../../../../interfaces/innerkits/distributeddata",
"//third_party/json/single_include",
"//base/powermgr/power_manager/interfaces/innerkits/native/include",
"../../common",
"../../../common",
]
}
@ -47,18 +31,15 @@ ohos_moduletest_suite("DctsdisDataTest") {
configs = [ ":module_private_config" ]
deps = [
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/adapter:distributeddata_adapter",
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_inner",
"//third_party/googletest:gtest_main",
]
deps = [ "//third_party/googletest:gtest_main" ]
external_deps = [
"c_utils:utils",
"datamgr_service:distributeddata_adapter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
]
subsystem_name = "distributeddatamgr"
part_name = "kv_store"
}
###########################################################################################

View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("../../../../../../tools/build/suite.gni")
ohos_js_hap_suite("distributekvdisjs_test") {
hap_profile = "./src/main/config.json"

View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("../../../../../../tools/build/suite.gni")
ohos_hap_assist_suite("distributekvdisjs_server") {
hap_profile = "./src/main/config.json"

View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("../../../../../../tools/build/suite.gni")
ohos_js_hap_suite("distributerdbdisjs_test") {
hap_profile = "./src/main/config.json"

View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("../../../../../../tools/build/suite.gni")
ohos_hap_assist_suite("distributerdbdisjs_server") {
hap_profile = "./src/main/config.json"

View File

@ -19,16 +19,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/cJSON",
"//commonlibrary/c_utils/base/include",
"//base/security/access_token/interfaces/innerkits/accesstoke/include",
"//base/security/access_token/interfaces/innerkits/nativetoken/include",
"//foundation/communication/dsoftbus/adapter/common/include",
"//foundation/communication/dsoftbus/core/common/include",
"//foundation/communication/dsoftbus/interfaces/kits/common",
"//foundation/communication/dsoftbus/interfaces/kits/bus_center",
"//foundation/communication/dsoftbus/interfaces/kits/discovery",
"//foundation/communication/dsoftbus/interfaces/kits/transport",
"//test/xts/dcts/common",
"../../../common",
]
}
@ -41,13 +32,13 @@ ohos_unittest("disTest") {
"../../common/shm_utils.cpp",
"net_trans_common.cpp",
]
deps = [
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//foundation/communication/dsoftbus/sdk:softbus_client",
external_deps = [
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils",
"dsoftbus:softbus_client",
]
external_deps = [ "c_utils:utils" ]
subsystem_name = "distributeddatamgr"
part_name = "kv_store"
}

View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("../../tools/build/suite.gni")
ohos_deploy_xdevice("deploy_testtools") {
configs_dir = "./config"