From 1ae5de2f59799a5d02e64cfa36bd1d3b36827f43 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周三, 13 8月 2014 16:21:41 +0800
Subject: [PATCH] build linux
---
test/functional/volid_test.cpp | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index de17e53..6aa87d1 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -1,6 +1,6 @@
#define BOOST_TEST_MODULE standard_license_test
//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <fstream>
#include <cstring>
@@ -11,6 +11,7 @@
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
#include "../../src/library/pc-identifiers.h"
+#include <dbus-1.0/dbus/dbus.h>
namespace fs = boost::filesystem;
using namespace license;
@@ -23,7 +24,7 @@
IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
strategy);
- BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
+ BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
cout << "Identifier:" << identifier_out << endl;
vector<string> extraArgs = { "-s", identifier_out };
generate_license(licLocation, extraArgs);
@@ -46,7 +47,7 @@
for (int i = 0; i < num_strategies; i++) {
FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
strategies[i]);
- BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
+ BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
idfile << identifier_out << endl;
}
idfile.close();
@@ -67,15 +68,14 @@
std::ifstream is(idfileLocation);
std::istream_iterator<string> start(is), end;
std::vector<string> reference_signatures(start, end);
- BOOST_CHECK_EQUAL(reference_signatures.size(), num_strategies);
+ BOOST_ASSERT(reference_signatures.size() == num_strategies);
PcSignature generated_identifier;
BOOST_CHECKPOINT("Generating current signatures and comparing with past");
for (int i = 0; i < num_strategies; i++) {
FUNCTION_RETURN generate_ok = generate_user_pc_signature(
generated_identifier, strategies[i]);
- BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
- if (memcmp(generated_identifier, reference_signatures[i].c_str(),
- sizeof(PcSignature))) {
+ BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
+ if (reference_signatures[i] != generated_identifier) {
string message = string("pc signature compare fail: strategy:")
+ to_string(strategies[i]) + " generated: ["
+ generated_identifier + "] reference: ["
@@ -88,7 +88,8 @@
for (int j = 0; j < 100; j++) {
for (unsigned int i = 0; i < reference_signatures.size(); i++) {
PcSignature pcsig;
- memcpy(pcsig, reference_signatures[i].c_str(), sizeof(PcSignature));
+ strncpy(pcsig, reference_signatures[i].c_str(),
+ sizeof(PcSignature));
EVENT_TYPE val_result = validate_pc_signature(pcsig);
string message = string("pc signature verification strategy:")
+ to_string(i) + " generated: [" + generated_identifier
@@ -98,3 +99,4 @@
}
}
}
+
--
Gitblit v1.9.1