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/functional/volid_test.cpp | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index de17e53..d6cff73 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -1,10 +1,10 @@
#define BOOST_TEST_MODULE standard_license_test
//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#undef BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <fstream>
#include <cstring>
-#include "../../../src/license-generator/license-generator.h"
+#include "../../../src/tools/license-generator/license-generator.h"
#include "../../../src/library/api/license++.h"
#include <build_properties.h>
#include <boost/filesystem.hpp>
@@ -23,7 +23,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 +46,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 == FUNC_RET_OK);
idfile << identifier_out << endl;
}
idfile.close();
@@ -55,10 +55,10 @@
BOOST_AUTO_TEST_CASE(generated_identifiers_stability) {
const string idfileLocation(PROJECT_TEST_TEMP_DIR "/identifiers_file");
IDENTIFICATION_STRATEGY strategies[] =
- { IDENTIFICATION_STRATEGY::DEFAULT,
- IDENTIFICATION_STRATEGY::DISK_LABEL,
- IDENTIFICATION_STRATEGY::DISK_NUM,
- IDENTIFICATION_STRATEGY::ETHERNET };
+ { DEFAULT,
+ DISK_LABEL,
+ DISK_NUM,
+ ETHERNET };
const int num_strategies = sizeof(strategies) / sizeof(strategies[0]);
std::ifstream test_idfile_exist(idfileLocation);
if (!test_idfile_exist.good()) {
@@ -67,17 +67,16 @@
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: ["
+ + to_string((long double) strategies[i]) + " generated: ["
+ generated_identifier + "] reference: ["
+ reference_signatures[i] + "]";
BOOST_FAIL(message);
@@ -88,7 +87,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 +98,4 @@
}
}
}
+
--
Gitblit v1.9.1