From 815b6202edb909f36b6c177539838e9a9755d9ba Mon Sep 17 00:00:00 2001 From: zhangzifa Date: Wed, 20 Mar 2019 10:39:11 +0800 Subject: [PATCH] remove cpp sdk not supported products --- CMakeLists.txt | 9 +---- .../cs/cs_describetemplates_ut.cc | 40 +++++-------------- .../ecs/ecs_describeInstances_ft.cc | 5 +-- 3 files changed, 12 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d35d3786..b52413d56 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,6 @@ add_subdirectory(rtc) add_subdirectory(chatbot) add_subdirectory(teslastream) add_subdirectory(mopen) -add_subdirectory(mts) add_subdirectory(iot) add_subdirectory(linkface) add_subdirectory(ots) @@ -92,25 +91,19 @@ add_subdirectory(arms) add_subdirectory(lubancloud) add_subdirectory(alimt) add_subdirectory(xspace) -add_subdirectory(jarvis-public) add_subdirectory(cbn) -add_subdirectory(emr) add_subdirectory(ram) add_subdirectory(sts) add_subdirectory(gpdb) -add_subdirectory(sas-api) add_subdirectory(cr) add_subdirectory(finmall) add_subdirectory(openanalytics) add_subdirectory(snsuapi) add_subdirectory(ubsms) - - add_subdirectory(yundun) add_subdirectory(arms4finance) add_subdirectory(imagesearch) add_subdirectory(cas) -add_subdirectory(bssopenapi) add_subdirectory(cloudwf) add_subdirectory(alidns) -add_subdirectory(httpdns) \ No newline at end of file +add_subdirectory(httpdns) diff --git a/test/function_test/cs/cs_describetemplates_ut.cc b/test/function_test/cs/cs_describetemplates_ut.cc index 3e74882fc..a466ac923 100644 --- a/test/function_test/cs/cs_describetemplates_ut.cc +++ b/test/function_test/cs/cs_describetemplates_ut.cc @@ -3,35 +3,13 @@ #include "gtest/gtest.h" #include "alibabacloud/core/AlibabaCloud.h" #include "alibabacloud/cs/CSClient.h" -#include "alibabacloud/cs/model/CreateTemplateRequest.h" -// #include "alibabacloud/core/CommonClient.h" -// #include "alibabacloud/core/CommonRequest.h" -#include "alibabacloud/core/sts/StsClient.h" -#include "alibabacloud/core/StsAssumeRoleCredentialsProvider.h" - using namespace std; using namespace AlibabaCloud; using namespace AlibabaCloud::CS; namespace { - TEST(cs, describeTemplatesError) { - utUtils utils; - string key = utils.get_env("ENV_AccessKeyId"); - string secret = utils.get_env("ENV_AccessKeySecret"); - - InitializeSdk(); - ClientConfiguration configuration("cn-hangzhou"); - CSClient client(key, secret, configuration); - Model::DescribeTemplatesRequest request; - auto outcome = client.describeTemplates(request); - EXPECT_TRUE(outcome.error().errorCode() == "InvalidAction.NotFound"); - EXPECT_TRUE(outcome.error().errorMessage() == "Specified api is not found, please check your url and method."); - ShutdownSdk(); - } - - - TEST(cs, describeTemplatesClientTimeout) { + TEST(cs, DescribeClustersClientTimeout) { utUtils utils; string key = utils.get_env("ENV_AccessKeyId"); string secret = utils.get_env("ENV_AccessKeySecret"); @@ -42,14 +20,14 @@ namespace { configuration.setReadTimeout(123); CSClient client(key, secret, configuration); - Model::DescribeTemplatesRequest request; - auto outcome = client.describeTemplates(request); + Model::DescribeClustersRequest request; + auto outcome = client.describeClusters(request); EXPECT_TRUE(outcome.error().errorCode() == "OperationTimeoutError"); EXPECT_TRUE(outcome.error().errorMessage().find("Timeout (connectTimeout: 1ms, readTimeout: 123ms) when connect or read") == 0); ShutdownSdk(); } - TEST(cs, describeTemplatesRequstTimeout) { + TEST(cs, DescribeClustersRequstTimeout) { utUtils utils; string key = utils.get_env("ENV_AccessKeyId"); string secret = utils.get_env("ENV_AccessKeySecret"); @@ -57,16 +35,16 @@ namespace { InitializeSdk(); ClientConfiguration configuration("cn-hangzhou"); CSClient client(key, secret, configuration); - Model::DescribeTemplatesRequest request; + Model::DescribeClustersRequest request; request.setConnectTimeout(11); request.setReadTimeout(213); - auto outcome = client.describeTemplates(request); + auto outcome = client.describeClusters(request); EXPECT_TRUE(outcome.error().errorCode() == "OperationTimeoutError"); EXPECT_TRUE(outcome.error().errorMessage().find("Timeout (connectTimeout: 11ms, readTimeout: 213ms) when connect or read") == 0); ShutdownSdk(); } - TEST(cs, describeTemplatesClientRequstTimeout) { + TEST(cs, DescribeClustersClientRequstTimeout) { utUtils utils; string key = utils.get_env("ENV_AccessKeyId"); string secret = utils.get_env("ENV_AccessKeySecret"); @@ -77,10 +55,10 @@ namespace { configuration.setReadTimeout(123); CSClient client(key, secret, configuration); - Model::DescribeTemplatesRequest request; + Model::DescribeClustersRequest request; request.setConnectTimeout(11); request.setReadTimeout(213); - auto outcome = client.describeTemplates(request); + auto outcome = client.describeClusters(request); EXPECT_TRUE(outcome.error().errorCode() == "OperationTimeoutError"); EXPECT_TRUE(outcome.error().errorMessage().find("Timeout (connectTimeout: 11ms, readTimeout: 213ms) when connect or read") == 0); ShutdownSdk(); diff --git a/test/function_test/ecs/ecs_describeInstances_ft.cc b/test/function_test/ecs/ecs_describeInstances_ft.cc index 56e0f9dd5..b6e81055f 100644 --- a/test/function_test/ecs/ecs_describeInstances_ft.cc +++ b/test/function_test/ecs/ecs_describeInstances_ft.cc @@ -46,9 +46,8 @@ namespace { delReq.setForce(true); auto outcome = client.deleteInstance(delReq); - - EXPECT_TRUE(outcome.error().errorCode() == "InvalidParameter"); - EXPECT_TRUE(outcome.error().errorMessage() == "The specified parameter \"Force\" is not valid."); + EXPECT_TRUE(outcome.error().errorCode() == "InvalidInstanceId.NotFound"); + EXPECT_TRUE(outcome.error().errorMessage() == "The specified InstanceId does not exist."); ShutdownSdk(); }