From 5a8a12d7a2c69610cd7a9a00ed1b3579b750a914 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 16 11月 2019 21:39:10 +0800
Subject: [PATCH] issue #42 #38 \n review build system, \n issue #38 added clang format
---
test/functional/volid_test.cpp | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index f8b0d8d..cdd00bc 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -1,14 +1,14 @@
-#define BOOST_TEST_MODULE standard_license_test
-//#define BOOST_TEST_MAIN
-//#undef BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE test_volid
+
#include <boost/test/unit_test.hpp>
#include <fstream>
#include <stdio.h>
#include <cstring>
#include "../../src/tools/license-generator/license-generator.h"
#include "../../src/library/api/license++.h"
-#include <build_properties.h>
#include <boost/filesystem.hpp>
+#include <licensecc_properties.h>
+#include <licensecc_properties_test.h>
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
#include "../../src/library/pc-identifiers.h"
@@ -21,9 +21,9 @@
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);
@@ -36,10 +36,9 @@
LicenseInfo license;
LicenseLocation licenseLocation;
- licenseLocation.openFileNearModule = false;
licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.environmentVariableName = "";
- EVENT_TYPE result = acquire_license("TEST", licenseLocation, &license);
+ licenseLocation.licenseData = "";
+ 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);
@@ -52,11 +51,11 @@
for (int i = 0; i < num_strategies; i++) {
FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
strategies[i]);
- BOOST_ASSERT(generate_ok == FUNC_RET_OK);
if (generate_ok != FUNC_RET_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
idfile << identifier_out << endl;
}
@@ -66,12 +65,26 @@
BOOST_AUTO_TEST_CASE(generated_identifiers_stability) {
const string idfileLocation(PROJECT_TEST_TEMP_DIR "/identifiers_file");
std::vector<IDENTIFICATION_STRATEGY> strategies;
- if (getVirtualization() != CONTAINER) {
- strategies = { DEFAULT, DISK_LABEL, DISK_NUM, ETHERNET };
+ size_t disk_num;
+ getDiskInfos(NULL, &disk_num);
+ if (disk_num >0) {
+ strategies = { DEFAULT, DISK_NUM, DISK_LABEL };
} else {
- strategies = { DEFAULT, ETHERNET };
+ BOOST_TEST_CHECKPOINT("if no disk default strategy fails see #49");
+ //strategies = { DEFAULT };
+ strategies = {};
}
- int num_strategies = strategies.size();
+ size_t adapters;
+ getAdapterInfos(nullptr, &adapters);
+ if(adapters > 0){
+ strategies.push_back(ETHERNET);
+ }
+
+ size_t num_strategies = strategies.size();
+ 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(),
--
Gitblit v1.9.1