From 1e166c13aaabe8d2aad1d604c77020a14dc577cd Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周二, 16 9月 2014 06:22:21 +0800
Subject: [PATCH] refactorings
---
test/library/Os_Linux_test.cpp | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index ea92662..bbb0bf6 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -1,6 +1,6 @@
#define BOOST_TEST_MODULE os_linux_test
//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include "../../src/library/os/os.h"
#include <build_properties.h>
@@ -9,42 +9,42 @@
#include <iostream>
using namespace std;
-/*
- 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, 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, 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_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);
+ free(diskInfos);
+}
BOOST_AUTO_TEST_CASE( read_network_adapters ) {
- AdapterInfo * adapter_info = NULL;
+ OsAdapterInfo * adapter_info = NULL;
size_t adapter_info_size = 0;
FUNCTION_RETURN result = getAdapterInfos(NULL, &adapter_info_size);
- BOOST_CHECK_EQUAL(result, OK);
+ BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
BOOST_CHECK_GT(adapter_info_size, 0);
- adapter_info = (AdapterInfo*) malloc(
- sizeof(AdapterInfo) * adapter_info_size);
+ adapter_info = (OsAdapterInfo*) malloc(
+ sizeof(OsAdapterInfo) * adapter_info_size);
result = getAdapterInfos(adapter_info, &adapter_info_size);
- BOOST_CHECK_EQUAL(result, OK);
+ 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") {
+ 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);
}
}
+ free(adapter_info);
}
--
Gitblit v1.9.1