From e24c5e05d6ab923f1d9ee22d0fdafb893d9732b1 Mon Sep 17 00:00:00 2001
From: lurumdare <8020186+lurumdare@users.noreply.github.com>
Date: 周六, 07 9月 2019 22:00:55 +0800
Subject: [PATCH] NULL to nullptr (#34)
---
test/library/LicenseReader_test.cpp | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/test/library/LicenseReader_test.cpp b/test/library/LicenseReader_test.cpp
index f4dcfca..6fa4f59 100644
--- a/test/library/LicenseReader_test.cpp
+++ b/test/library/LicenseReader_test.cpp
@@ -1,20 +1,20 @@
-
#define BOOST_TEST_MODULE license_reader_test
//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include "../../src/library/LicenseReader.h"
#include <build_properties.h>
+#include <stdlib.h>
using namespace license;
BOOST_AUTO_TEST_CASE( read_single_file ) {
const char * licLocation =
- PROJECT_TEST_SRC_DIR "/library/reader/test_reader.ini";
- const LicenseLocation location = { licLocation, NULL, false };
+ PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
+ 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());
@@ -22,11 +22,11 @@
BOOST_AUTO_TEST_CASE( product_not_licensed ) {
const char * licLocation =
- PROJECT_TEST_SRC_DIR "/library/reader/test_reader.ini";
- const LicenseLocation location = { licLocation, NULL, false };
+ PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
+ 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());
@@ -36,13 +36,12 @@
}
BOOST_AUTO_TEST_CASE( file_not_found ) {
- const char * licLocation =
- PROJECT_TEST_SRC_DIR "/library/reader/not_found.ini";
+ 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());
@@ -53,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());
@@ -65,4 +64,16 @@
registry.getLastFailure()->event_type);
}
+BOOST_AUTO_TEST_CASE( read_env_var ) {
+ char str[MAX_PATH];
+ strcpy(str,"LIC_VAR=" PROJECT_TEST_SRC_DIR "/library/test_reader.ini");
+ putenv(str);
+ const LicenseLocation location = {nullptr, "LIC_VAR", false };
+ LicenseReader licenseReader(location);
+ vector<FullLicenseInfo> licenseInfos;
+ const EventRegistry registry = licenseReader.readLicenses("PrODUCT",
+ licenseInfos);
+ BOOST_CHECK(registry.isGood());
+ BOOST_CHECK_EQUAL(1, licenseInfos.size());
+}
--
Gitblit v1.9.1