From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
test/functional/generate-license.cpp | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/test/functional/generate-license.cpp b/test/functional/generate-license.cpp
index 3aa07f9..d9b65f0 100644
--- a/test/functional/generate-license.cpp
+++ b/test/functional/generate-license.cpp
@@ -13,15 +13,19 @@
#include <iostream>
#include <licensecc_properties_test.h>
+#include <licensecc_properties.h>
-#include "../../src/library/base/base.h"
+#include"licensecc/licensecc.h"
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
+#include "../src/library/base/file_utils.hpp"
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);
@@ -37,20 +41,20 @@
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++) {
+ for (size_t i = 0; i < other_args.size(); i++) {
ss << " " << other_args[i];
}
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_REQUIRE_EQUAL(retCode, 0);
+ BOOST_REQUIRE_MESSAGE(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");
+ BOOST_REQUIRE_GE(rc, 0);
+ const int sectionSize = ini.GetSectionSize(LCC_PROJECT_NAME);
BOOST_CHECK_GT(sectionSize, 0);
return license_fname.string();
}
--
Gitblit v1.9.1