From bd879d3c9f5fef0107bc3036be3893edab14e89c Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周三, 01 1月 2020 20:26:43 +0800
Subject: [PATCH] cleanup & new api
---
test/functional/date_test.cpp | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/test/functional/date_test.cpp b/test/functional/date_test.cpp
index b07216b..83462df 100644
--- a/test/functional/date_test.cpp
+++ b/test/functional/date_test.cpp
@@ -1,11 +1,12 @@
-#define BOOST_TEST_MODULE date_test
+#define BOOST_TEST_MODULE test_date
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include <build_properties.h>
-#include "../../src/tools/license-generator/license-generator.h"
-#include "../../src/library/api/license++.h"
+#include <licensecc_properties.h>
+#include <licensecc_properties_test.h>
+
+#include <licensecc/licensecc.h>
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
@@ -13,45 +14,42 @@
using namespace license;
using namespace std;
+namespace license {
namespace test {
-BOOST_AUTO_TEST_CASE( license_not_expired ) {
- const string licLocation(PROJECT_TEST_TEMP_DIR "/not_expired.lic");
+BOOST_AUTO_TEST_CASE(license_not_expired) {
vector<string> extraArgs;
extraArgs.push_back("-e");
extraArgs.push_back("2050-10-10");
- generate_license(licLocation, extraArgs);
+ const string licLocation = generate_license("not_expired.lic", extraArgs);
/* */
LicenseInfo license;
- LicenseLocation licenseLocation;
- licenseLocation.openFileNearModule = false;
- licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.environmentVariableName = "";
- const EVENT_TYPE result = acquire_license("TEST", licenseLocation,
- &license);
+ LicenseLocation location = {LICENSE_PATH};
+ std::copy(licLocation.begin(), licLocation.end(), location.licenseData);
+
+ const EVENT_TYPE result = acquire_license(nullptr, &location, &license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, true);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
+ BOOST_CHECK_GT(license.days_left, 0);
}
-BOOST_AUTO_TEST_CASE( license_expired ) {
- const string licLocation(PROJECT_TEST_TEMP_DIR "/expired.lic");
- remove(licLocation.c_str());
+BOOST_AUTO_TEST_CASE(license_expired) {
vector<string> extraArgs;
extraArgs.push_back("-e");
extraArgs.push_back("2013-10-10");
- generate_license(licLocation, extraArgs);
+ const string licLocation = generate_license("expired", extraArgs);
/* */
LicenseInfo license;
- LicenseLocation licenseLocation;
- licenseLocation.openFileNearModule = false;
- licenseLocation.licenseFileLocation = licLocation.c_str();
- licenseLocation.environmentVariableName = "";
- const EVENT_TYPE result = acquire_license("TEST", licenseLocation,
- &license);
+ LicenseLocation location = {LICENSE_PATH};
+ std::copy(licLocation.begin(), licLocation.end(), location.licenseData);
+ BOOST_TEST_MESSAGE("before acquire license");
+ const EVENT_TYPE result = acquire_license(nullptr, &location, &license);
BOOST_CHECK_EQUAL(result, PRODUCT_EXPIRED);
BOOST_CHECK_EQUAL(license.has_expiry, true);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
+ BOOST_CHECK_EQUAL(license.days_left, 0);
}
-}
+} // namespace test
+} // namespace license
--
Gitblit v1.9.1