From 79b1b57045e86d9845e352c3f2aa0efbab6111a9 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 3月 2020 10:19:09 +0800
Subject: [PATCH] tests and improvements

---
 test/library/Os_Linux_test.cpp |   78 ++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index 5d9bd90..527da44 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -1,49 +1,43 @@
 #define BOOST_TEST_MODULE os_linux_test
-//#define BOOST_TEST_MAIN
-//#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include "../../src/library/os/os.h"
-#include <build_properties.h>
-
 #include <string>
 #include <iostream>
+#include <boost/test/unit_test.hpp>
+
+#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 ) {
-	DiskInfo * diskInfos = NULL;
-	size_t disk_info_size = 0;
-	FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
-	BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
-	BOOST_CHECK_GT(disk_info_size, 0);
-	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(diskInfos[0].disk_sn[0], 0);
-}
-
-BOOST_AUTO_TEST_CASE( read_network_adapters ) {
-	AdapterInfo * 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 = (AdapterInfo*) malloc(
-			sizeof(AdapterInfo) * 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 {
-			BOOST_CHECK_NE(adapter_info[i].mac_address[0], 0);
-		}
+BOOST_AUTO_TEST_CASE(read_disk_id) {
+	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);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
+		BOOST_CHECK_GT(disk_info_size, 0);
+		diskInfos = (DiskInfo *)malloc(sizeof(DiskInfo) * disk_info_size);
+		result = getDiskInfos(diskInfos, &disk_info_size);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
+		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 == VIRTUALIZATION::CONTAINER) {
+		// docker or lxc diskInfo is not meaningful
+		DiskInfo *diskInfos = NULL;
+		size_t disk_info_size = 0;
+		FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_NOT_AVAIL);
 	}
-
 }
+
+}  // namespace test
+}  // namespace license

--
Gitblit v1.9.1