From 4467a957a498b93dbcaefbad97df24b43dfbc99d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:16:09 +0800
Subject: [PATCH] fix tests
---
test/functional/standard-license_test.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index 6d55de8..ac62764 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,13 +10,13 @@
#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;
namespace license {
namespace test {
-namespace fs = boost::filesystem;
-using namespace license;
-using namespace std;
/**
* Test a generic license with no expiry neither client id. The license is read from file
@@ -27,7 +28,7 @@
LicenseInfo license;
LicenseLocation location = {LICENSE_PATH};
std::copy(licLocation.begin(), licLocation.end(), location.licenseData);
- const EVENT_TYPE result = acquire_license(nullptr, &location, &license);
+ 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);
@@ -39,13 +40,12 @@
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);
- const EVENT_TYPE result = acquire_license(nullptr, &location, &license);
+ 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);
@@ -72,8 +72,8 @@
// BOOST_CHECK_EQUAL(license.linked_to_pc, false);
//}
//
-// BOOST_AUTO_TEST_CASE( pc_identifier ) {
-// const string licLocation(PROJECT_TEST_TEMP_DIR "/pc_identifier.lic");
+// BOOST_AUTO_TEST_CASE( hw_identifier ) {
+// const string licLocation(PROJECT_TEST_TEMP_DIR "/hw_identifier.lic");
// const vector<string> extraArgs = { "-s", "Jaaa-aaaa-MG9F-ZhB1" };
// generate_license(licLocation, extraArgs);
//
--
Gitblit v1.9.1