From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 09:42:26 +0800
Subject: [PATCH] cleanup and change license generation parameters
---
test/functional/standard-license_test.cpp | 88 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index d301d68..669ca46 100644
--- a/test/functional/standard-license_test.cpp
+++ b/test/functional/standard-license_test.cpp
@@ -1,48 +1,74 @@
-#define BOOST_TEST_MODULE standard_license_test
-//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE test_standard_license
+
#include <boost/test/unit_test.hpp>
-#include "../../../src/license-generator/license-generator.h"
-#include "../../../src/library/api/license++.h"
-#include <build_properties.h>
#include <boost/filesystem.hpp>
+#include <licensecc/licensecc.h>
+#include <licensecc_properties_test.h>
+#include <licensecc_properties.h>
+#include "../../src/library/ini/SimpleIni.h"
+#include "generate-license.h"
+#include "../../src/library/base/FileUtils.hpp"
+
+namespace license {
+namespace test {
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);
+/**
+ * Test a generic license with no expiry neither client id.
+ */
+BOOST_AUTO_TEST_CASE(test_generic_license) {
+ const vector<string> extraArgs;
+ const string licLocation = generate_license("standard_license", extraArgs);
/* */
LicenseInfo license;
LicenseLocation licenseLocation;
- licenseLocation.openFileNearModule=false;
licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.environmentVariableName = "";
- EVENT_TYPE result = acquire_license("TEST",
- licenseLocation, & license);
+ licenseLocation.licenseData = nullptr;
+ const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, false);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
}
+/**
+ * Pass the license data to the application.
+ */
+
+// BOOST_AUTO_TEST_CASE( b64_environment_variable ) {
+// const string licLocation(PROJECT_TEST_TEMP_DIR "/standard_env_license.lic");
+// const vector<string> extraArgs;
+// generate_license(licLocation, extraArgs);
+// const string licensestr(license::get_file_contents(licLocation.c_str(), MAX_LICENSE_LENGTH));
+// /* */
+// LicenseInfo license;
+// LicenseLocation licenseLocation;
+// licenseLocation.licenseFileLocation = nullptr;
+// licenseLocation.licenseData = licensestr.c_str();
+// const EVENT_TYPE result = acquire_license("TEST", &licenseLocation,
+// &license);
+// BOOST_CHECK_EQUAL(result, LICENSE_OK);
+// BOOST_CHECK_EQUAL(license.has_expiry, false);
+// BOOST_CHECK_EQUAL(license.linked_to_pc, false);
+//}
+//
+// BOOST_AUTO_TEST_CASE( pc_identifier ) {
+// const string licLocation(PROJECT_TEST_TEMP_DIR "/pc_identifier.lic");
+// const vector<string> extraArgs = { "-s", "Jaaa-aaaa-MG9F-ZhB1" };
+// generate_license(licLocation, extraArgs);
+//
+// LicenseInfo license;
+// LicenseLocation licenseLocation;
+// licenseLocation.licenseFileLocation = licLocation.c_str();
+// licenseLocation.licenseData = "";
+// const EVENT_TYPE result = acquire_license("TEST", &licenseLocation,
+// &license);
+// BOOST_CHECK_EQUAL(result, IDENTIFIERS_MISMATCH);
+// BOOST_CHECK_EQUAL(license.has_expiry, false);
+// BOOST_CHECK_EQUAL(license.linked_to_pc, true);
+//}
+}
+} // namespace license
--
Gitblit v1.9.1