From 4093b38f678b4d253b610f3439adb9e950e37c92 Mon Sep 17 00:00:00 2001 From: Jan Willamowius <jan@willamowius.de> Date: 周一, 22 4月 2019 23:56:28 +0800 Subject: [PATCH] fix regex to check format of client signature --- test/library/LicenseReader_test.cpp | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/test/library/LicenseReader_test.cpp b/test/library/LicenseReader_test.cpp index f4dcfca..af1b619 100644 --- a/test/library/LicenseReader_test.cpp +++ b/test/library/LicenseReader_test.cpp @@ -1,16 +1,16 @@ - #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"; + PROJECT_TEST_SRC_DIR "/library/test_reader.ini"; const LicenseLocation location = { licLocation, NULL, false }; LicenseReader licenseReader(location); vector<FullLicenseInfo> licenseInfos; @@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE( product_not_licensed ) { const char * licLocation = - PROJECT_TEST_SRC_DIR "/library/reader/test_reader.ini"; + PROJECT_TEST_SRC_DIR "/library/test_reader.ini"; const LicenseLocation location = { licLocation, NULL, false }; LicenseReader licenseReader(location); vector<FullLicenseInfo> licenseInfos; @@ -36,8 +36,7 @@ } 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 }; LicenseReader licenseReader(location); @@ -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 = { NULL, "LIC_VAR", false }; + LicenseReader licenseReader(location); + vector<FullLicenseInfo> licenseInfos; + EventRegistry registry = licenseReader.readLicenses("PrODUCT", + licenseInfos); + BOOST_CHECK(registry.isGood()); + BOOST_CHECK_EQUAL(1, licenseInfos.size()); +} -- Gitblit v1.9.1