From 72555a6569db7ae977fa80aac42b900d96ffdb6d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周一, 04 5月 2020 11:20:41 +0800
Subject: [PATCH] older version of boost seem have issues with arguments containing commas
---
test/functional/standard-license_test.cpp | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index 8bb45b1..c163212 100644
--- a/test/functional/standard-license_test.cpp
+++ b/test/functional/standard-license_test.cpp
@@ -1,3 +1,4 @@
+
#define BOOST_TEST_MODULE test_standard_license
#include <boost/test/unit_test.hpp>
@@ -9,7 +10,7 @@
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
-#include "../../src/library/base/FileUtils.hpp"
+#include "../../src/library/base/file_utils.hpp"
using namespace std;
namespace fs = boost::filesystem;
@@ -39,9 +40,8 @@
BOOST_AUTO_TEST_CASE(test_read_license_data) {
const vector<string> extraArgs;
const fs::path licLocation = fs::path(generate_license("standard_license1", extraArgs));
- string license_data;
- // load the license string
- fs::load_string_file(licLocation, license_data);
+ const string licLocationStr = licLocation.string();
+ string license_data = get_file_contents(licLocationStr.c_str(), 65536);
LicenseInfo license;
LicenseLocation location = {LICENSE_PLAIN_DATA};
std::copy(license_data.begin(), license_data.end(), location.licenseData);
@@ -54,23 +54,51 @@
/**
* Pass the license data to the application.
*/
+/* lccgen bug #10 parameter -b is ignored.
+BOOST_AUTO_TEST_CASE(base64_encoded) {
+ const string licLocation("standard_b64.lic");
+ vector<string> extraArgs;
+ extraArgs.push_back("-b");
+ const string lic_location = generate_license(licLocation, extraArgs);
+ const string license_data(license::get_file_contents(lic_location.c_str(), 65536));
+ LicenseInfo license;
+ LicenseLocation licenseLocation;
+ licenseLocation.license_data_type = LICENSE_ENCODED;
+ std::copy(license_data.begin(), license_data.end(), licenseLocation.licenseData);
+ const LCC_EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &license);
+ BOOST_CHECK_EQUAL(result, LCC_EVENT_TYPE::LICENSE_OK);
+ BOOST_CHECK_EQUAL(license.has_expiry, false);
+ BOOST_CHECK_EQUAL(license.linked_to_pc, false);
+}
+*/
-// BOOST_AUTO_TEST_CASE( b64_environment_variable ) {
-// const string licLocation(PROJECT_TEST_TEMP_DIR "/standard_env_license.lic");
-// const vector<string> extraArgs;
-// generate_license(licLocation, extraArgs);
-// const string licensestr(license::get_file_contents(licLocation.c_str(), MAX_LICENSE_LENGTH));
-// /* */
-// LicenseInfo license;
-// LicenseLocation licenseLocation;
-// licenseLocation.licenseFileLocation = nullptr;
-// licenseLocation.licenseData = licensestr.c_str();
-// 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, false);
-//}
+// old boost version can't parse the comma separated list.. only centos 7 and Ubuntu 16.04
+#if (BOOST_VERSION > 106500)
+BOOST_AUTO_TEST_CASE(multiple_features) {
+ vector<string> extraArgs;
+ extraArgs.push_back("-f");
+ extraArgs.push_back(LCC_PROJECT_NAME ",feature1,feature2");
+ const fs::path licLocation = fs::path(generate_license("multi_feature", extraArgs));
+ const string licLocationStr = licLocation.string();
+ string license_data = get_file_contents(licLocationStr.c_str(), 65536);
+ LicenseInfo license;
+ LicenseLocation location = {LICENSE_PLAIN_DATA};
+ std::copy(license_data.begin(), license_data.end(), location.licenseData);
+ CallerInformations callInfo;
+ strcpy(callInfo.feature_name, "feature1");
+ callInfo.magic = 0;
+ callInfo.version[0] = '\0';
+ LCC_EVENT_TYPE result = acquire_license(&callInfo, &location, &license);
+ BOOST_CHECK_EQUAL(result, LCC_EVENT_TYPE::LICENSE_OK);
+ strcpy(callInfo.feature_name, "feature2");
+ result = acquire_license(&callInfo, &location, &license);
+ BOOST_CHECK_EQUAL(result, LCC_EVENT_TYPE::LICENSE_OK);
+ strcpy(callInfo.feature_name, "feature3");
+ result = acquire_license(&callInfo, &location, &license);
+ BOOST_CHECK_EQUAL(result, LCC_EVENT_TYPE::PRODUCT_NOT_LICENSED);
+}
+#endif
+
//
// BOOST_AUTO_TEST_CASE( hw_identifier ) {
// const string licLocation(PROJECT_TEST_TEMP_DIR "/hw_identifier.lic");
@@ -87,5 +115,5 @@
// BOOST_CHECK_EQUAL(license.has_expiry, false);
// BOOST_CHECK_EQUAL(license.linked_to_pc, true);
//}
-}
+} // namespace test
} // namespace license
--
Gitblit v1.9.1