From 1febc26adc037995e3ea01b765213d22a348db0d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 03 5月 2020 21:44:03 +0800
Subject: [PATCH] issue #77
---
test/functional/generate-license.cpp | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/test/functional/generate-license.cpp b/test/functional/generate-license.cpp
index febf621..ae42689 100644
--- a/test/functional/generate-license.cpp
+++ b/test/functional/generate-license.cpp
@@ -7,10 +7,13 @@
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
#include <sstream>
+#include <fstream>
#include <iostream>
#include <licensecc_properties_test.h>
+#include <licensecc_properties.h>
#include "../../src/library/base/base.h"
#include "../../src/library/ini/SimpleIni.h"
@@ -18,8 +21,10 @@
namespace fs = boost::filesystem;
using namespace std;
+
namespace license {
namespace test {
+
string generate_license(const string& license_name, const vector<string>& other_args) {
fs::path lcc_exe(LCC_EXE);
BOOST_REQUIRE_MESSAGE(fs::is_regular_file(lcc_exe), "License generator not found: " LCC_EXE);
@@ -27,15 +32,15 @@
if (!fs::exists(licenses_base)) {
BOOST_REQUIRE_MESSAGE(fs::create_directories(licenses_base), "test folders created " + licenses_base.string());
}
-
- const fs::path license_fname(licenses_base / (license_name + ".lic"));
+ const string license_name_norm = boost::ends_with(license_name, ".lic") ? license_name : (license_name + ".lic");
+ const fs::path license_fname(licenses_base / license_name_norm);
const string license_fname_s = license_fname.string();
remove(license_fname_s.c_str());
stringstream ss;
ss << LCC_EXE << " license issue";
ss << " --" PARAM_PRIMARY_KEY " " << LCC_PROJECT_PRIVATE_KEY;
- ss << " --" PARAM_LICENSE_NAME " " << license_name;
+ ss << " --" PARAM_LICENSE_OUTPUT " " << license_fname_s;
ss << " --" PARAM_PROJECT_FOLDER " " << LCC_TEST_LICENSES_PROJECT;
for (int i = 0; i < other_args.size(); i++) {
@@ -44,11 +49,11 @@
cout << "executing :" << ss.str() << endl;
const int retCode = std::system(ss.str().c_str());
BOOST_CHECK_EQUAL(retCode, 0);
- BOOST_ASSERT(fs::exists(license_fname));
+ BOOST_ASSERT_MSG(fs::exists(license_fname), "license exists");
CSimpleIniA ini;
const SI_Error rc = ini.LoadFile(license_fname.c_str());
BOOST_CHECK_GE(rc, 0);
- const int sectionSize = ini.GetSectionSize("DEFAULT");
+ const int sectionSize = ini.GetSectionSize(LCC_PROJECT_NAME);
BOOST_CHECK_GT(sectionSize, 0);
return license_fname.string();
}
@@ -75,7 +80,7 @@
const int retCode = std::system(ss.str().c_str());
BOOST_CHECK_EQUAL(retCode, 0);
BOOST_ASSERT(fs::exists(outputFile));
- std::ifstream ifs(outputFile.c_str());
+ std::ifstream ifs(output_file_s.c_str());
std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
return content;
}
--
Gitblit v1.9.1