From 65454077a8c63b50adda4e8c6095c8f00675c4d2 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周日, 08 3月 2020 21:45:16 +0800 Subject: [PATCH] Merge branch 'feature/pc_identifiers' of https://github.com/open-license-manager/open-license-manager.git into feature/pc_identifiers --- test/functional/standard-license_test.cpp | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp index 1ef1081..4293d11 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 @@ -72,8 +73,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