From 726ec77becb3affbc5a5c872bea56c540cdb6e8c Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 07 9月 2019 22:13:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
test/library/LicenseReader_test.cpp | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/library/LicenseReader_test.cpp b/test/library/LicenseReader_test.cpp
index af1b619..6fa4f59 100644
--- a/test/library/LicenseReader_test.cpp
+++ b/test/library/LicenseReader_test.cpp
@@ -11,10 +11,10 @@
BOOST_AUTO_TEST_CASE( read_single_file ) {
const char * licLocation =
PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
- const LicenseLocation location = { licLocation, NULL, false };
+ const LicenseLocation location = { licLocation, nullptr, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
- EventRegistry registry = licenseReader.readLicenses("PrODUCT",
+ const EventRegistry registry = licenseReader.readLicenses("PrODUCT",
licenseInfos);
BOOST_CHECK(registry.isGood());
BOOST_CHECK_EQUAL(1, licenseInfos.size());
@@ -23,10 +23,10 @@
BOOST_AUTO_TEST_CASE( product_not_licensed ) {
const char * licLocation =
PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
- const LicenseLocation location = { licLocation, NULL, false };
+ const LicenseLocation location = { licLocation, nullptr, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
- EventRegistry registry = licenseReader.readLicenses("PRODUCT-NOT",
+ const EventRegistry registry = licenseReader.readLicenses("PRODUCT-NOT",
licenseInfos);
BOOST_CHECK(!registry.isGood());
BOOST_CHECK_EQUAL(0, licenseInfos.size());
@@ -38,10 +38,10 @@
BOOST_AUTO_TEST_CASE( file_not_found ) {
const char * licLocation = PROJECT_TEST_SRC_DIR "/library/not_found.ini";
//const char * envName = "MYVAR";
- const LicenseLocation location = { licLocation, NULL, false };
+ const LicenseLocation location = { licLocation, nullptr, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
- EventRegistry registry = licenseReader.readLicenses("PRODUCT",
+ const EventRegistry registry = licenseReader.readLicenses("PRODUCT",
licenseInfos);
BOOST_CHECK(!registry.isGood());
BOOST_CHECK_EQUAL(0, licenseInfos.size());
@@ -52,10 +52,10 @@
BOOST_AUTO_TEST_CASE( env_var_not_defined ) {
const char * envName = "MYVAR";
- const LicenseLocation location = { NULL, envName, false };
+ const LicenseLocation location = {nullptr, envName, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
- EventRegistry registry = licenseReader.readLicenses("PRODUCT",
+ const EventRegistry registry = licenseReader.readLicenses("PRODUCT",
licenseInfos);
BOOST_CHECK(!registry.isGood());
BOOST_CHECK_EQUAL(0, licenseInfos.size());
@@ -68,10 +68,10 @@
char str[MAX_PATH];
strcpy(str,"LIC_VAR=" PROJECT_TEST_SRC_DIR "/library/test_reader.ini");
putenv(str);
- const LicenseLocation location = { NULL, "LIC_VAR", false };
+ const LicenseLocation location = {nullptr, "LIC_VAR", false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
- EventRegistry registry = licenseReader.readLicenses("PrODUCT",
+ const EventRegistry registry = licenseReader.readLicenses("PrODUCT",
licenseInfos);
BOOST_CHECK(registry.isGood());
BOOST_CHECK_EQUAL(1, licenseInfos.size());
--
Gitblit v1.9.1