From bf76bcf6c991746ccb95f07bc3baa066bdab3025 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 12月 2019 17:36:20 +0800
Subject: [PATCH] fix new tests
---
test/functional/date_test.cpp | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/test/functional/date_test.cpp b/test/functional/date_test.cpp
index 3210a45..15fbdd0 100644
--- a/test/functional/date_test.cpp
+++ b/test/functional/date_test.cpp
@@ -1,11 +1,12 @@
-#define BOOST_TEST_MODULE standard_license_test
-//#define BOOST_TEST_MAIN
-//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE test_date
+
#include <boost/test/unit_test.hpp>
-#include "../../../src/tools/license-generator/license-generator.h"
-#include "../../../src/library/api/license++.h"
-#include <build_properties.h>
#include <boost/filesystem.hpp>
+
+#include <licensecc_properties.h>
+#include <licensecc_properties_test.h>
+
+#include <licensecc/licensecc.h>
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
@@ -13,38 +14,43 @@
using namespace license;
using namespace std;
-BOOST_AUTO_TEST_CASE( license_not_expired ) {
- const string licLocation(PROJECT_TEST_TEMP_DIR "/not_expired.lic");
+namespace license {
+namespace test {
+
+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 = "";
- EVENT_TYPE result = acquire_license("TEST", licenseLocation, &license);
+ licenseLocation.licenseData = "";
+ const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &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");
+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 = "";
- EVENT_TYPE result = acquire_license("TEST", licenseLocation, &license);
+ licenseLocation.licenseData = nullptr;
+ BOOST_TEST_MESSAGE("before acquire license");
+ const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &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