From 8bbef2865455754425a84b86680a89bff8aa7691 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 19 10月 2019 08:50:45 +0800
Subject: [PATCH] issue #64 , issue #56 (part)
---
test/functional/date_test.cpp | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/test/functional/date_test.cpp b/test/functional/date_test.cpp
index 3210a45..44a9911 100644
--- a/test/functional/date_test.cpp
+++ b/test/functional/date_test.cpp
@@ -1,17 +1,19 @@
-#define BOOST_TEST_MODULE standard_license_test
-//#define BOOST_TEST_MAIN
-//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE date_test
+
#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 <build_properties.h>
+#include "../../src/tools/license-generator/license-generator.h"
+#include "../../src/library/api/license++.h"
#include "../../src/library/ini/SimpleIni.h"
#include "generate-license.h"
namespace fs = boost::filesystem;
using namespace license;
using namespace std;
+
+namespace test {
BOOST_AUTO_TEST_CASE( license_not_expired ) {
const string licLocation(PROJECT_TEST_TEMP_DIR "/not_expired.lic");
@@ -22,10 +24,10 @@
/* */
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("TEST", &licenseLocation,
+ &license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, true);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
@@ -33,6 +35,7 @@
BOOST_AUTO_TEST_CASE( license_expired ) {
const string licLocation(PROJECT_TEST_TEMP_DIR "/expired.lic");
+ remove(licLocation.c_str());
vector<string> extraArgs;
extraArgs.push_back("-e");
extraArgs.push_back("2013-10-10");
@@ -40,11 +43,14 @@
/* */
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("TEST", &licenseLocation,
+ &license);
BOOST_CHECK_EQUAL(result, PRODUCT_EXPIRED);
BOOST_CHECK_EQUAL(license.has_expiry, true);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
}
+
+}
--
Gitblit v1.9.1