From 60ae840790232c52ea3f456881771edee02d35ac Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周五, 05 1月 2018 09:10:28 +0800
Subject: [PATCH] fix some compilation issues
---
test/functional/volid_test.cpp | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index b289af5..e9bf9ae 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -3,9 +3,10 @@
//#undef BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <fstream>
+#include <stdio.h>
#include <cstring>
-#include "../../../src/license-generator/license-generator.h"
-#include "../../../src/library/api/license++.h"
+#include "../../src/tools/license-generator/license-generator.h"
+#include "../../src/library/api/license++.h"
#include <build_properties.h>
#include <boost/filesystem.hpp>
#include "../../src/library/ini/SimpleIni.h"
@@ -21,6 +22,7 @@
PcSignature identifier_out;
IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
+ BOOST_TEST_CHECKPOINT("Before generate");
FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
strategy);
BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
@@ -38,7 +40,7 @@
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) {
ofstream idfile(idfileLocation);
@@ -46,6 +48,11 @@
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;
}
@@ -64,12 +71,23 @@
if (!test_idfile_exist.good()) {
generate_reference_file(idfileLocation, strategies, num_strategies);
}
- std::ifstream is(idfileLocation);
- std::istream_iterator<string> start(is), end;
- std::vector<string> reference_signatures(start, end);
- BOOST_ASSERT(reference_signatures.size() == 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_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++) {
FUNCTION_RETURN generate_ok = generate_user_pc_signature(
generated_identifier, strategies[i]);
@@ -83,7 +101,7 @@
}
}
- BOOST_CHECKPOINT("Verifying signatures");
+ BOOST_TEST_CHECKPOINT("Verifying signatures");
for (int j = 0; j < 100; j++) {
for (unsigned int i = 0; i < reference_signatures.size(); i++) {
PcSignature pcsig;
@@ -93,7 +111,7 @@
string message = string("pc signature verification strategy:")
+ to_string(i) + " generated: [" + generated_identifier
+ "] reference: [" + reference_signatures[i] + "]";
- BOOST_CHECKPOINT("Verifying signature: ");
+ BOOST_TEST_CHECKPOINT("Verifying signature: ");
BOOST_CHECK_EQUAL(val_result, LICENSE_OK);
}
}
--
Gitblit v1.9.1