diff --git a/aw/cxx/distributed/distributed.h b/aw/cxx/distributed/distributed.h index 9e4d3b068be53f5d8fa08f1d680565b5f0542aec..857e2630bafd435cf776cfd48d1dbcc9218f00c1 100644 --- a/aw/cxx/distributed/distributed.h +++ b/aw/cxx/distributed/distributed.h @@ -21,12 +21,12 @@ namespace OHOS { namespace DistributeSystemTest { -static const int MAX_BUFF_LEN = 1024; -static const int DST_COMMAND_NOTIFY = 0; -static const int DST_COMMAND_CALL = 1; -static const int DST_COMMAND_MSG = 2; -static const int DST_COMMAND_END = 3; -static const int DEFAULT_AGENT_PORT = 6789; +constexpr int MAX_BUFF_LEN = 1024; +constexpr int DST_COMMAND_NOTIFY = 0; +constexpr int DST_COMMAND_CALL = 1; +constexpr int DST_COMMAND_MSG = 2; +constexpr int DST_COMMAND_END = 3; +constexpr int DEFAULT_AGENT_PORT = 6789; struct DistributedCmd { int no; // record command no, as return no. diff --git a/aw/cxx/distributed/distributed_agent.cpp b/aw/cxx/distributed/distributed_agent.cpp index 400847ee1ac8ecf426e200949fb36039708bff44..fc1d7afe21c09ff51ae7afb02d33e3fbd5a42c71 100644 --- a/aw/cxx/distributed/distributed_agent.cpp +++ b/aw/cxx/distributed/distributed_agent.cpp @@ -94,7 +94,7 @@ int DistributedAgent::InitAgentServer() } addr.sin_port = htons(agentPort_); - int err = ::bind(serverSockFd, (struct sockaddr *)&addr, sizeof(addr)); + int err = ::bind(serverSockFd, reinterpret_cast(&addr), sizeof(addr)); if (err < 0) { HiLog::Error(DistributedAgent::LABEL, "agent bind error.\n"); close(serverSockFd); @@ -132,7 +132,7 @@ int DistributedAgent::DoCmdServer(int serverSockFd) while (receiveLen > 0) { HiLog::Info(DistributedAgent::LABEL, "wait client .......\n"); - if ((clientSockFd = accept(serverSockFd, (struct sockaddr *)&clientAddr, &sinSize)) > 0) { + if ((clientSockFd = accept(serverSockFd, reinterpret_cast(&clientAddr), &sinSize)) > 0) { break; } receiveLen--; @@ -153,9 +153,9 @@ int DistributedAgent::DoCmdServer(int serverSockFd) return -1; } // every cmd length less than MAX_BUFF_LEN bytes; - int cmdLen = recv(clientSockFd_, buff, DST_COMMAND_HEAD_LEN, 0); - if (static_cast(cmdLen) < DST_COMMAND_HEAD_LEN) { - if (cmdLen == 0) { + int recvCmdLen = recv(clientSockFd_, buff, DST_COMMAND_HEAD_LEN, 0); + if (static_cast(recvCmdLen) < DST_COMMAND_HEAD_LEN) { + if (recvCmdLen == 0) { HiLog::Info(DistributedAgent::LABEL, "agent connect socket closed, IP:%s .\n", inet_ntoa(clientAddr.sin_addr)); mbStop_ = true; diff --git a/aw/cxx/distributed/distributed_cfg.h b/aw/cxx/distributed/distributed_cfg.h index 1c6a6ab8011130be881a901d18358ad9495db308..e8fb0a1f6a3fe92d5dbbf46f369c25c630bddc3d 100644 --- a/aw/cxx/distributed/distributed_cfg.h +++ b/aw/cxx/distributed/distributed_cfg.h @@ -41,7 +41,7 @@ public: ~DistributedCfg(); bool OpenCfg(std::string fileName); bool GetCfgVal(std::string key, std::string &value); - std::string GetValueInString(std::string str, size_t devNO); + std::string GetValueInString(std::string str, size_t devNo); std::string GetDeviceIp(std::string fileName, size_t devNo); std::string GetDeviceUuid(std::string fileName, size_t devNo); static std::unique_ptr& GetInstance(); diff --git a/aw/cxx/distributed/distributed_major.cpp b/aw/cxx/distributed/distributed_major.cpp index 1638b826dc54405cdc1e42f0bce9d6092b66319f..771aec9759cb0a7fc78c4ce0bc6e13a9db60907a 100644 --- a/aw/cxx/distributed/distributed_major.cpp +++ b/aw/cxx/distributed/distributed_major.cpp @@ -130,7 +130,7 @@ int DistributeTestEnvironment::ConnectAgent(size_t devNo) addr.sin_port = htons(serverPort_); int connectCount = 0; for (connectCount = 0; connectCount < CONNECT_TIME; connectCount++) { // try connect to agent 3 times. - if (connect(clientSockFd, (struct sockaddr *)&addr, sizeof(addr)) == 0) { + if (connect(clientSockFd, reinterpret(&addr), sizeof(addr)) == 0) { break; } std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_TIME)); // delay 10ms @@ -184,11 +184,11 @@ bool DistributeTestEnvironment::SendToAgent(size_t devNo, int cmdType, void *pst } globalCommandNo++; char szrbuf[MAX_BUFF_LEN] = {0}; - auto pCmdTest = reinterpret_cast(pstrMsg); - pCmdTest->no = globalCommandNo; - pCmdTest->cmdTestType = htons(cmdType); - pCmdTest->len = htons(len); - int rlen = send(clientList_[devNo].fd, pCmdTest, static_cast(len + DST_COMMAND_HEAD_LEN), 0); + auto pCmdMsg = reinterpret_cast(pstrMsg); + pCmdMsg->no = globalCommandNo; + pCmdMsg->cmdTestType = htons(cmdType); + pCmdMsg->len = htons(len); + int rlen = send(clientList_[devNo].fd, pCmdMsg, static_cast(len + DST_COMMAND_HEAD_LEN), 0); if (rlen <= 0) { HiLog::Error(LABEL, "agent socket is closed."); return breturn; diff --git a/aw/cxx/hwext/perf.h b/aw/cxx/hwext/perf.h index 662dd9137a9a1812049877955ec4368b59ec0148..9cc894ce54c2846ab2780aa5dc329df173b0257e 100644 --- a/aw/cxx/hwext/perf.h +++ b/aw/cxx/hwext/perf.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "securec.h" #include diff --git a/bundle.json b/bundle.json new file mode 100644 index 0000000000000000000000000000000000000000..678ab5fea019762583a589535a167b4934d74d7a --- /dev/null +++ b/bundle.json @@ -0,0 +1,37 @@ +{ + "name": "@openharmony/developertest", + "version": "3.1.0", + "description": "developertest", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "scripts": {}, + "repository": "", + "dirs": {}, + "component": { + "name": "developertest", + "subsystem": "developertest", + "features" :[], + "adapted_system_type": [ "standard" ], + "rom": "0KB", + "ram": "0KB", + "deps": {}, + "build": { + "sub_component": [ + "//test/developertest/examples/app_info:app_info", + "//test/developertest/examples/detector:detector", + "//test/developertest/examples/calculator:calculator", + "//test/developertest/examples/calculator:calculator_static" + ], + "inner_kits": [], + "test": [ + "//test/developertest/examples/app_info/test:unittest", + "//test/developertest/examples/calculator/test:unittest", + "//test/developertest/examples/calculator/test:fuzztest", + "//test/developertest/examples/calculator/test:benchmarktest", + "//test/developertest/examples/detector/test:unittest", + "//test/developertest/examples/sleep/test:performance", + "//test/developertest/examples/distributedb/test:distributedtest" + ] + } + } +} diff --git a/examples/calculator/include/calculator.h b/examples/calculator/include/calculator.h index 9b8168f07ac63b98db3edabf363b32d98e099923..4f39f2f98c8c5e9cbce20000b501765412817039 100644 --- a/examples/calculator/include/calculator.h +++ b/examples/calculator/include/calculator.h @@ -12,10 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#ifndef _EXAMPLE_CALCULATOR_H_ +#define _EXAMPLE_CALCULATOR_H_ int Add(int e1, int e2); int Sub(int e1, int e2); int Mul(int e1, int e2); int Div(int e1, int e2); +#endif // _EXAMPLE_CALCULATOR_H_ \ No newline at end of file diff --git a/examples/calculator/src/calculator.cpp b/examples/calculator/src/calculator.cpp index e71a031359850268aa3fd3ce1dd775ec047a9471..63cd5de36daf2282c64443e4d18375f742e24f58 100644 --- a/examples/calculator/src/calculator.cpp +++ b/examples/calculator/src/calculator.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ -#include int Add(int e1, int e2) { diff --git a/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.cpp b/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.cpp index 576457ac2b63bf9664c6513c4a4126aed79f71fc..e09b54ef388eb7c8b6dcac102ddeebb8103d2a67 100644 --- a/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.cpp +++ b/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.cpp @@ -13,10 +13,8 @@ * limitations under the License. */ -#include "parse_fuzzer.h" - -#include -#include +#include +#include const int FUZZ_DATA_LEN = 3; const int FUZZ_FST_DATA = 0; diff --git a/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.h b/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.h index bf3acfc48cd91e9eeb848b9e7eca48c6e461d822..9089dfa2f553ae84b1edb15f262ef001320235da 100644 --- a/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.h +++ b/examples/calculator/test/fuzztest/common/parse_fuzzer/parse_fuzzer.h @@ -13,11 +13,9 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#ifndef _EXAMPLE_CALCULATOR_PARSE_FUZZER_H_ +#define _EXAMPLE_CALCULATOR_PARSE_FUZZER_H_ #define FUZZ_PROJECT_NAME "parse_fuzzer" + +#endif // _EXAMPLE_CALCULATOR_PARSE_FUZZER_H_ \ No newline at end of file diff --git a/examples/detector/include/detector.h b/examples/detector/include/detector.h index 26d0a1b975154b0d6b801976966749c1faea7192..a4c032736b710eccc7fd495a5ca11b35784b7f2d 100644 --- a/examples/detector/include/detector.h +++ b/examples/detector/include/detector.h @@ -13,7 +13,11 @@ * limitations under the License. */ +#ifndef _EXAMPLE_DETECTOR_H_ +#define _EXAMPLE_DETECTOR_H_ #include bool IsPrime(int n); bool FileExist(const char* fileName); + +#endif // _EXAMPLE_DETECTOR_H_ \ No newline at end of file diff --git a/examples/sleep/include/sleep_ex.h b/examples/sleep/include/sleep_ex.h index d6ca5b3a60cd76ffeae4afc2278442d4b8ea40ae..0b7939dbce01833a63184332f98511f6544a3409 100644 --- a/examples/sleep/include/sleep_ex.h +++ b/examples/sleep/include/sleep_ex.h @@ -13,10 +13,11 @@ * limitations under the License. */ -#include -#include -#include +#ifndef EXAMPLE_SLEEP_H_ +#define EXAMPLE_SLEEP_H_ typedef void (*time_callback)(void *); int Msleep(unsigned long milisec); double ElapsedTime(time_callback func, void* arg); + +#endif // EXAMPLE_SLEEP_H_ \ No newline at end of file diff --git a/examples/sleep/src/sleep_ex.cpp b/examples/sleep/src/sleep_ex.cpp index 5c213280eef6a78a0989510adb09ac07470312f6..46444f10b38a8d8a548b10a424fa75a4226a84da 100644 --- a/examples/sleep/src/sleep_ex.cpp +++ b/examples/sleep/src/sleep_ex.cpp @@ -32,8 +32,10 @@ static double TimeDiff(struct timeval *x , struct timeval *y) return 0; } - double xUs = (double)x->tv_sec * SleepTest::ID_MS_TO_NS_LEVEL + (double)x->tv_usec; - double yUs = (double)y->tv_sec * SleepTest::ID_MS_TO_NS_LEVEL + (double)y->tv_usec; + double xUs = reinterpret_cast(x->tv_sec * SleepTest::ID_MS_TO_NS_LEVEL) + + reinterpret_cast(x->tv_usec); + double yUs = reinterpret_cast(y->tv_sec * SleepTest::ID_MS_TO_NS_LEVEL) + + reinterpret_cast(y->tv_usec); return (yUs - xUs); } @@ -52,7 +54,7 @@ int Msleep(unsigned long miliSec) { struct timespec req = {0, 0}; struct timespec rem = {0, 0}; - time_t sec = (int)(miliSec / SleepTest::ID_SE_TO_MS_LEVEL); + time_t sec = reinterpret_cast(miliSec / SleepTest::ID_SE_TO_MS_LEVEL); miliSec = miliSec - (sec * SleepTest::ID_SE_TO_MS_LEVEL); req.tv_sec = sec; req.tv_nsec = miliSec * SleepTest::ID_MS_TO_NS_LEVEL; diff --git a/ohos.build b/ohos.build deleted file mode 100644 index e2efca2a7452596656071915a25254189c8c99e6..0000000000000000000000000000000000000000 --- a/ohos.build +++ /dev/null @@ -1,22 +0,0 @@ -{ - "subsystem": "developertest", - "parts": { - "developertest": { - "module_list": [ - "//test/developertest/examples/app_info:app_info", - "//test/developertest/examples/detector:detector", - "//test/developertest/examples/calculator:calculator", - "//test/developertest/examples/calculator:calculator_static" - ], - "test_list": [ - "//test/developertest/examples/app_info/test:unittest", - "//test/developertest/examples/calculator/test:unittest", - "//test/developertest/examples/calculator/test:fuzztest", - "//test/developertest/examples/calculator/test:benchmarktest", - "//test/developertest/examples/detector/test:unittest", - "//test/developertest/examples/sleep/test:performance", - "//test/developertest/examples/distributedb/test:distributedtest" - ] - } - } -} diff --git a/src/core/config/config_manager.py b/src/core/config/config_manager.py index c8224e042d26a63b7753e93ee107bfe3545d743c..3b463f63ae52793e96ea81cfcf619f5715ca9f77 100755 --- a/src/core/config/config_manager.py +++ b/src/core/config/config_manager.py @@ -92,7 +92,7 @@ class FilterConfigManager(object): if child.tag != target_name: continue for child2 in child: - if child2.tag != product_form.lower(): + if child2.tag.lower() != product_form.lower(): continue for child3 in child2: if child3.text != "" and child3.text is not None: