From dda16735b94661b798d6c0fd3e41af944de0a1fe Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 13 10月 2019 15:02:19 +0800
Subject: [PATCH] refactoring - locators
---
test/library/LicenseReader_test.cpp | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/test/library/LicenseReader_test.cpp b/test/library/LicenseReader_test.cpp
index 6fa4f59..b413fcf 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_MODULE "license_reader_test"
+
#include <boost/test/unit_test.hpp>
-#include "../../src/library/LicenseReader.h"
-#include <build_properties.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 char *licLocation = PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
+
const LicenseLocation location = { licLocation, nullptr, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
@@ -21,7 +21,7 @@
}
BOOST_AUTO_TEST_CASE( product_not_licensed ) {
- const char * licLocation =
+ const char *licLocation =
PROJECT_TEST_SRC_DIR "/library/test_reader.ini";
const LicenseLocation location = { licLocation, nullptr, false };
LicenseReader licenseReader(location);
@@ -36,7 +36,7 @@
}
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, nullptr, false };
LicenseReader licenseReader(location);
@@ -51,8 +51,8 @@
}
BOOST_AUTO_TEST_CASE( env_var_not_defined ) {
- const char * envName = "MYVAR";
- const LicenseLocation location = {nullptr, envName, false };
+ const char *envName = "MYVAR";
+ const LicenseLocation location = { nullptr, envName, false };
LicenseReader licenseReader(location);
vector<FullLicenseInfo> licenseInfos;
const EventRegistry registry = licenseReader.readLicenses("PRODUCT",
@@ -62,18 +62,5 @@
BOOST_ASSERT(registry.getLastFailure()!=NULL);
BOOST_CHECK_EQUAL(ENVIRONMENT_VARIABLE_NOT_DEFINED,
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