From 3b1577ab7eb2000a3477a0aa489b888fb1256434 Mon Sep 17 00:00:00 2001
From: lurumdare <8020186+lurumdare@users.noreply.github.com>
Date: 周六, 07 9月 2019 20:40:25 +0800
Subject: [PATCH] const everywhere (#30)
---
test/functional/volid_test.cpp | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index e9bf9ae..f63d2b3 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -21,13 +21,17 @@
const string licLocation(PROJECT_TEST_TEMP_DIR "/volid_license.lic");
PcSignature identifier_out;
- IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
+ const IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
BOOST_TEST_CHECKPOINT("Before generate");
- FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
+ 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;
- vector<string> extraArgs = { "-s", identifier_out };
+ vector<string> extraArgs;
+ extraArgs.push_back("-s");
+ extraArgs.push_back(identifier_out);
+ BOOST_TEST_CHECKPOINT("Before generate license");
generate_license(licLocation, extraArgs);
LicenseInfo license;
@@ -35,82 +39,85 @@
licenseLocation.openFileNearModule = false;
licenseLocation.licenseFileLocation = licLocation.c_str();
licenseLocation.environmentVariableName = "";
- EVENT_TYPE result = acquire_license("TEST", licenseLocation, &license);
+ const EVENT_TYPE result = acquire_license("TEST", licenseLocation, &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,
+
+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]);
- if (generate_ok != FUNC_RET_OK){
- idfile.close();
- remove(idfileLocation.c_str());
- BOOST_ERROR("Generating identifier for strategy " << strategies[i] << "failed with: " << generate_ok);
- }
BOOST_ASSERT(generate_ok == FUNC_RET_OK);
- idfile << identifier_out << endl;
+ if (generate_ok != FUNC_RET_OK) {
+ BOOST_ERROR(
+ "Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
+ idfile << "0000-0000-0000-0000" << endl;
+ } else
+ idfile << identifier_out << endl;
}
idfile.close();
}
BOOST_AUTO_TEST_CASE(generated_identifiers_stability) {
const string idfileLocation(PROJECT_TEST_TEMP_DIR "/identifiers_file");
- IDENTIFICATION_STRATEGY strategies[] =
- { DEFAULT,
- DISK_LABEL,
- DISK_NUM,
- ETHERNET };
- const int num_strategies = sizeof(strategies) / sizeof(strategies[0]);
+ std::vector<IDENTIFICATION_STRATEGY> strategies;
+ if (getVirtualization() != CONTAINER) {
+ strategies = { DEFAULT, DISK_LABEL, DISK_NUM, ETHERNET };
+ } else {
+ strategies = { DEFAULT, ETHERNET };
+ }
+ int num_strategies = strategies.size();
std::ifstream test_idfile_exist(idfileLocation);
if (!test_idfile_exist.good()) {
- generate_reference_file(idfileLocation, strategies, num_strategies);
+ 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())
+ generate_reference_file(idfileLocation, strategies.data(), num_strategies);
}
- //try to locate a "good" reference file.
- int tries = 2;
- std::vector<string> reference_signatures;
- do{
- std::ifstream is(idfileLocation);
- std::istream_iterator<string> start(is), end;
- reference_signatures = vector<string>(start, end);
- if (reference_signatures.size() != num_strategies){
- is.close();
- remove(idfileLocation.c_str());
- generate_reference_file(idfileLocation, strategies, num_strategies);
- }
- } while (reference_signatures.size() != num_strategies && tries-- > 0);
- BOOST_ASSERT(tries > 0);
-
- PcSignature generated_identifier;
- BOOST_TEST_CHECKPOINT("Generating current signatures and comparing with past");
+ 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");
for (int i = 0; i < num_strategies; i++) {
+ PcSignature generated_identifier;
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);
+ continue;
+ }
if (reference_signatures[i] != generated_identifier) {
- string message = string("pc signature compare fail: strategy:")
- + to_string((long double) strategies[i]) + " generated: ["
- + generated_identifier + "] reference: ["
+ string message = string("pc signature compare fail: strategy: ")
+ + to_string(static_cast<long long>(strategies[i]))
+ + " generated: [" + generated_identifier + "] reference: ["
+ reference_signatures[i] + "]";
- BOOST_FAIL(message);
+ 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;
PcSignature pcsig;
strncpy(pcsig, reference_signatures[i].c_str(),
- sizeof(PcSignature));
+ sizeof(PcSignature) - 1);
EVENT_TYPE val_result = validate_pc_signature(pcsig);
- string message = string("pc signature verification strategy:")
- + to_string(i) + " generated: [" + generated_identifier
- + "] reference: [" + reference_signatures[i] + "]";
BOOST_TEST_CHECKPOINT("Verifying signature: ");
BOOST_CHECK_EQUAL(val_result, LICENSE_OK);
}
--
Gitblit v1.9.1