From 82f9d834ad772b2f16b6524f679d14d8a7afe881 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周二, 10 9月 2019 23:29:10 +0800
Subject: [PATCH] fix issue #37 tests in windows
---
test/functional/standard-license_test.cpp | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index d301d68..18a6ae0 100644
--- a/test/functional/standard-license_test.cpp
+++ b/test/functional/standard-license_test.cpp
@@ -1,48 +1,34 @@
#define BOOST_TEST_MODULE standard_license_test
//#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include "../../../src/license-generator/license-generator.h"
-#include "../../../src/library/api/license++.h"
+#include "../../src/tools/license-generator/license-generator.h"
+#include "../../src/library/api/license++.h"
#include <build_properties.h>
#include <boost/filesystem.hpp>
-
+#include "../../src/library/ini/SimpleIni.h"
+#include "generate-license.h"
namespace fs = boost::filesystem;
using namespace license;
using namespace std;
-void generate_license(const string& prod_name, const string& fname) {
- int argc = 4;
- const char** argv = new const char*[argc + 1];
- argv[0] = "lic-generator";
- argv[1] = "-o";
- argv[2] = fname.c_str();
- argv[3] = "test";
- int retCode = LicenseGenerator::generateLicense(argc, argv);
- delete (argv);
- BOOST_CHECK_EQUAL(retCode, 0);
- BOOST_ASSERT(fs::exists(fname));
- CSimpleIniA ini;
- SI_Error rc = ini.LoadFile(fname.c_str());
- BOOST_CHECK_GE(rc,0);
- int sectionSize = ini.GetSectionSize(prod_name.c_str());
- BOOST_CHECK_GT(sectionSize,0);
-}
BOOST_AUTO_TEST_CASE( standard_lic_file ) {
const string licLocation(PROJECT_TEST_TEMP_DIR "/standard_license.lic");
- generate_license(string("TEST"), licLocation);
+ const vector<string> extraArgs;
+ generate_license(licLocation, extraArgs);
/* */
LicenseInfo license;
LicenseLocation licenseLocation;
licenseLocation.openFileNearModule=false;
licenseLocation.licenseFileLocation = licLocation.c_str();
licenseLocation.environmentVariableName = "";
- EVENT_TYPE result = acquire_license("TEST",
+ const EVENT_TYPE result = acquire_license("TEST",
licenseLocation, & license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, false);
BOOST_CHECK_EQUAL(license.linked_to_pc, false);
}
+
--
Gitblit v1.9.1