From 9d7cd404cc2d09c82b65be4828be0ac74eca20a7 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周三, 01 1月 2020 20:26:43 +0800
Subject: [PATCH] cleanup & new api
---
test/functional/volid_test.cpp | 64 +++++++++++++-------------------
1 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index 53dfae3..b6a808a 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -22,13 +22,12 @@
namespace license {
namespace test {
-BOOST_AUTO_TEST_CASE( default_volid_lic_file ) {
+BOOST_AUTO_TEST_CASE(default_volid_lic_file) {
PcSignature identifier_out;
const IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::STRATEGY_ETHERNET;
BOOST_TEST_CHECKPOINT("Before generate");
- const FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
- strategy);
+ const FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out, strategy);
BOOST_TEST_CHECKPOINT("After generate signature");
BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
cout << "Identifier:" << identifier_out << endl;
@@ -39,25 +38,22 @@
const string licLocation = generate_license("volid_license", extraArgs);
LicenseInfo license;
- LicenseLocation licenseLocation;
- licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.licenseData = "";
- const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &license);
+ LicenseLocation location = {LICENSE_PATH};
+ std::copy(licLocation.begin(), licLocation.end(), location.licenseData);
+ const EVENT_TYPE result = acquire_license(nullptr, &location, &license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, false);
BOOST_CHECK_EQUAL(license.linked_to_pc, true);
}
-static void generate_reference_file(const string &idfileLocation,
- IDENTIFICATION_STRATEGY strategies[], int num_strategies) {
+static void generate_reference_file(const string &idfileLocation, IDENTIFICATION_STRATEGY strategies[],
+ int num_strategies) {
ofstream idfile(idfileLocation);
PcSignature identifier_out;
for (int i = 0; i < num_strategies; i++) {
- FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
- strategies[i]);
+ FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out, strategies[i]);
if (generate_ok != FUNC_RET_OK) {
- BOOST_ERROR(
- "Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
+ BOOST_ERROR("Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
idfile << "0000-0000-0000-0000" << endl;
BOOST_ASSERT(generate_ok == FUNC_RET_OK);
} else
@@ -71,69 +67,61 @@
std::vector<IDENTIFICATION_STRATEGY> strategies;
size_t disk_num;
getDiskInfos(NULL, &disk_num);
- if (disk_num >0) {
+ if (disk_num > 0) {
strategies = {STRATEGY_DEFAULT, STRATEGY_DISK_NUM, STRATEGY_DISK_LABEL};
} else {
BOOST_TEST_CHECKPOINT("if no disk default strategy fails see #49");
- //strategies = { DEFAULT };
+ // strategies = { DEFAULT };
strategies = {};
}
size_t adapters;
getAdapterInfos(nullptr, &adapters);
- if(adapters > 0){
+ if (adapters > 0) {
strategies.push_back(STRATEGY_ETHERNET);
}
size_t num_strategies = strategies.size();
- if(num_strategies == 0) {
- //see issue #49 can't use default
+ if (num_strategies == 0) {
+ // see issue #49 can't use default
return;
}
std::ifstream test_idfile_exist(idfileLocation);
if (!test_idfile_exist.good()) {
- generate_reference_file(idfileLocation, strategies.data(),
- strategies.size());
+ generate_reference_file(idfileLocation, strategies.data(), strategies.size());
} else {
std::istream_iterator<string> start(test_idfile_exist), end;
std::vector<string> reference_signatures(start, end);
test_idfile_exist.close();
- if (reference_signatures.size() != num_strategies
- || std::find(reference_signatures.begin(),
- reference_signatures.end(), "0000-0000-0000-0000")
- != reference_signatures.end())
+ if (reference_signatures.size() != num_strategies ||
+ std::find(reference_signatures.begin(), reference_signatures.end(), "0000-0000-0000-0000") !=
+ reference_signatures.end())
generate_reference_file(idfileLocation, strategies.data(), num_strategies);
}
std::ifstream is(idfileLocation);
std::istream_iterator<string> start(is), end;
std::vector<string> reference_signatures(start, end);
- BOOST_TEST_CHECKPOINT(
- "Generating current signatures and comparing with past");
+ BOOST_TEST_CHECKPOINT("Generating current signatures and comparing with past");
for (int i = 0; i < num_strategies; i++) {
PcSignature generated_identifier;
- FUNCTION_RETURN generate_ok = generate_user_pc_signature(
- generated_identifier, strategies[i]);
+ FUNCTION_RETURN generate_ok = generate_user_pc_signature(generated_identifier, strategies[i]);
BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
if (generate_ok != FUNC_RET_OK) {
- BOOST_ERROR(
- "Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
+ BOOST_ERROR("Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
continue;
}
if (reference_signatures[i] != generated_identifier) {
- string message = string("pc signature compare fail: strategy: ")
- + to_string(static_cast<long long>(strategies[i]))
- + " generated: [" + generated_identifier + "] reference: ["
- + reference_signatures[i] + "]";
+ string message = string("pc signature compare fail: strategy: ") +
+ to_string(static_cast<long long>(strategies[i])) + " generated: [" + generated_identifier +
+ "] reference: [" + reference_signatures[i] + "]";
BOOST_ERROR(message);
}
}
BOOST_TEST_CHECKPOINT("Verifying signatures");
for (int j = 0; j < 100; j++) {
for (unsigned int i = 0; i < reference_signatures.size(); i++) {
- if (reference_signatures[i] == "0000-0000-0000-0000")
- continue;
+ if (reference_signatures[i] == "0000-0000-0000-0000") continue;
PcSignature pcsig;
- strncpy(pcsig, reference_signatures[i].c_str(),
- sizeof(PcSignature) - 1);
+ strncpy(pcsig, reference_signatures[i].c_str(), sizeof(PcSignature) - 1);
EVENT_TYPE val_result = validate_pc_signature(pcsig);
BOOST_TEST_CHECKPOINT("Verifying signature: ");
BOOST_CHECK_EQUAL(val_result, LICENSE_OK);
--
Gitblit v1.9.1