From 3eeb130c21f94770cec666220f867b7f91b13763 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周一, 10 2月 2020 05:07:32 +0800
Subject: [PATCH] fix ubuntu 16.10
---
test/functional/standard-license_test.cpp | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index 669ca46..5d3839c 100644
--- a/test/functional/standard-license_test.cpp
+++ b/test/functional/standard-license_test.cpp
@@ -11,24 +11,41 @@
#include "generate-license.h"
#include "../../src/library/base/FileUtils.hpp"
+using namespace std;
+namespace fs = boost::filesystem;
+
namespace license {
namespace test {
-namespace fs = boost::filesystem;
-using namespace license;
-using namespace std;
/**
- * Test a generic license with no expiry neither client id.
+ * Test a generic license with no expiry neither client id. The license is read from file
*/
-BOOST_AUTO_TEST_CASE(test_generic_license) {
+BOOST_AUTO_TEST_CASE(test_generic_license_read_file) {
const vector<string> extraArgs;
const string licLocation = generate_license("standard_license", extraArgs);
/* */
LicenseInfo license;
- LicenseLocation licenseLocation;
- licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.licenseData = nullptr;
- const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &license);
+ LicenseLocation location = {LICENSE_PATH};
+ std::copy(licLocation.begin(), licLocation.end(), location.licenseData);
+ const LCC_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, false);
+}
+
+/**
+ * Test a generic license with no expiry neither client id. The license is passed in trhough the licenseData structure.
+ */
+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);
+ LicenseInfo license;
+ LicenseLocation location = {LICENSE_PLAIN_DATA};
+ std::copy(license_data.begin(), license_data.end(), location.licenseData);
+ const LCC_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, false);
--
Gitblit v1.9.1