From 9119e2b9bbb11b4ae21618fbaacfe6edaeb2a62b Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 15 2月 2020 23:49:50 +0800 Subject: [PATCH] pc identifiers work --- test/functional/standard-license_test.cpp | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp index 6d55de8..8bb45b1 100644 --- a/test/functional/standard-license_test.cpp +++ b/test/functional/standard-license_test.cpp @@ -11,11 +11,11 @@ #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. The license is read from file @@ -27,7 +27,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); @@ -45,7 +45,7 @@ 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