From afa27e13998bbea9dfa11f82944ed6d89a43c44b Mon Sep 17 00:00:00 2001 From: Gabriele Contini <gcontini@users.noreply.github.com> Date: 周日, 01 9月 2019 13:39:32 +0800 Subject: [PATCH] added libboost-date-time-dev --- test/functional/standard-license_test.cpp | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp index d301d68..8b49c50 100644 --- a/test/functional/standard-license_test.cpp +++ b/test/functional/standard-license_test.cpp @@ -1,38 +1,23 @@ #define BOOST_TEST_MODULE standard_license_test //#define BOOST_TEST_MAIN -#define BOOST_TEST_DYN_LINK +//#define BOOST_TEST_DYN_LINK #include <boost/test/unit_test.hpp> -#include "../../../src/license-generator/license-generator.h" -#include "../../../src/library/api/license++.h" +#include "../../src/tools/license-generator/license-generator.h" +#include "../../src/library/api/license++.h" #include <build_properties.h> #include <boost/filesystem.hpp> - +#include "../../src/library/ini/SimpleIni.h" +#include "generate-license.h" namespace fs = boost::filesystem; using namespace license; using namespace std; -void generate_license(const string& prod_name, const string& fname) { - int argc = 4; - const char** argv = new const char*[argc + 1]; - argv[0] = "lic-generator"; - argv[1] = "-o"; - argv[2] = fname.c_str(); - argv[3] = "test"; - int retCode = LicenseGenerator::generateLicense(argc, argv); - delete (argv); - BOOST_CHECK_EQUAL(retCode, 0); - BOOST_ASSERT(fs::exists(fname)); - CSimpleIniA ini; - SI_Error rc = ini.LoadFile(fname.c_str()); - BOOST_CHECK_GE(rc,0); - int sectionSize = ini.GetSectionSize(prod_name.c_str()); - BOOST_CHECK_GT(sectionSize,0); -} BOOST_AUTO_TEST_CASE( standard_lic_file ) { const string licLocation(PROJECT_TEST_TEMP_DIR "/standard_license.lic"); - generate_license(string("TEST"), licLocation); + vector<string> extraArgs; + generate_license(licLocation, extraArgs); /* */ LicenseInfo license; LicenseLocation licenseLocation; @@ -46,3 +31,4 @@ BOOST_CHECK_EQUAL(license.linked_to_pc, false); } + -- Gitblit v1.9.1