From a7d354a72d22cde4de1494bf3475d8ea49e9cd2d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors
---
test/library/Os_Linux_test.cpp | 67 +++++++--------------------------
1 files changed, 14 insertions(+), 53 deletions(-)
diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index 6d68d0d..527da44 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -5,13 +5,19 @@
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
-
+#include "../../src/library/base/StringUtils.h"
#include "../../src/library/os/os.h"
+#include "../../src/library/os/execution_environment.hpp"
+
+namespace license {
+namespace test {
using namespace std;
+using namespace os;
BOOST_AUTO_TEST_CASE(read_disk_id) {
- VIRTUALIZATION virt = getVirtualization();
- if (virt == NONE || virt == VM) {
+ os::ExecutionEnvironment exec_env;
+ os::VIRTUALIZATION virt = exec_env.getVirtualization();
+ if (virt == VIRTUALIZATION::NONE || virt == VIRTUALIZATION::VM) {
DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
@@ -20,11 +26,11 @@
diskInfos = (DiskInfo *)malloc(sizeof(DiskInfo) * disk_info_size);
result = getDiskInfos(diskInfos, &disk_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
- BOOST_CHECK_GT(strlen(diskInfos[0].device), 0);
- BOOST_CHECK_GT(strlen(diskInfos[0].label), 0);
+ BOOST_CHECK_GT(mstrnlen_s(diskInfos[0].device, sizeof(diskInfos[0].device)), 0);
+ BOOST_CHECK_GT(mstrnlen_s(diskInfos[0].label, sizeof diskInfos[0].label), 0);
BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0);
free(diskInfos);
- } else if (virt == CONTAINER) {
+ } else if (virt == VIRTUALIZATION::CONTAINER) {
// docker or lxc diskInfo is not meaningful
DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
@@ -33,50 +39,5 @@
}
}
-BOOST_AUTO_TEST_CASE(read_network_adapters) {
- OsAdapterInfo *adapter_info = NULL;
- size_t adapter_info_size = 0;
- FUNCTION_RETURN result = getAdapterInfos(NULL, &adapter_info_size);
- BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
- BOOST_CHECK_GT(adapter_info_size, 0);
- adapter_info = (OsAdapterInfo *)malloc(sizeof(OsAdapterInfo) * adapter_info_size);
- result = getAdapterInfos(adapter_info, &adapter_info_size);
- BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
- for (size_t i = 0; i < adapter_info_size; i++) {
- cout << "Interface found: " << string(adapter_info[i].description) << endl;
- BOOST_CHECK_GT(strlen(adapter_info[i].description), 0);
- // lo mac address is always 0 but it has ip
- // other interfaces may not be connected
- if (string(adapter_info[i].description) == "lo") {
- BOOST_CHECK_NE(adapter_info[i].ipv4_address[0], 0);
- } else {
- bool mac_is_0 = true;
- for (int j = 0; j < 6; j++) {
- mac_is_0 = mac_is_0 && (adapter_info[i].mac_address[j] == 0);
- }
- BOOST_CHECK_MESSAGE(!mac_is_0, "Mac address for interface " << adapter_info[i].description << " is 0");
- }
- }
- free(adapter_info);
-}
-
-BOOST_AUTO_TEST_CASE(get_cpuid) { BOOST_CHECK_EQUAL(1, 1); }
-
-// To test if virtualization is detected correctly define an env variable VIRT_ENV
-// otherwise the test is skipped
-BOOST_AUTO_TEST_CASE(test_virtualization) {
- const char *env = getenv("VIRT_ENV");
- if (env != NULL) {
- if (strcmp(env, "CONTAINER") == 0) {
- VIRTUALIZATION virt = getVirtualization();
- BOOST_CHECK_EQUAL(virt, CONTAINER);
- } else if (strcmp(env, "VM") == 0) {
- BOOST_FAIL("check for vm not implemented");
- } else if (strcmp(env, "NONE") == 0) {
- VIRTUALIZATION virt = getVirtualization();
- BOOST_CHECK_EQUAL(virt, NONE);
- } else {
- BOOST_FAIL(string("value ") + env + " not supported: VM,CONTAINER,NONE");
- }
- }
-}
+} // namespace test
+} // namespace license
--
Gitblit v1.9.1