From 4e1f76fae58a7e0db111ec68e616e6ea3222f726 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 13 10月 2019 16:17:06 +0800
Subject: [PATCH] fix windows tests
---
test/library/LicenseReader_test.cpp | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/test/library/LicenseReader_test.cpp b/test/library/LicenseReader_test.cpp
index e803ef7..b413fcf 100644
--- a/test/library/LicenseReader_test.cpp
+++ b/test/library/LicenseReader_test.cpp
@@ -1,32 +1,32 @@
+#define BOOST_TEST_MODULE "license_reader_test"
-#define BOOST_TEST_MODULE license_reader_test
-//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include "../../src/library/LicenseReader.h"
+#include <stdlib.h>
+
#include <build_properties.h>
+#include "../../src/library/LicenseReader.hpp"
using namespace license;
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 char *licLocation = 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());
}
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 char *licLocation =
+ 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/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());
@@ -52,11 +51,11 @@
}
BOOST_AUTO_TEST_CASE( env_var_not_defined ) {
- const char * envName = "MYVAR";
- const LicenseLocation location = { NULL, envName, false };
+ const char *envName = "MYVAR";
+ 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());
@@ -64,5 +63,4 @@
BOOST_CHECK_EQUAL(ENVIRONMENT_VARIABLE_NOT_DEFINED,
registry.getLastFailure()->event_type);
}
-
--
Gitblit v1.9.1