From f5106362b82b035dcd8e487d755316e886de3440 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 23 11月 2019 22:48:18 +0800
Subject: [PATCH] signature verified, tests
---
test/functional/volid_test.cpp | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index cdd00bc..71bcb02 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -2,23 +2,27 @@
#include <boost/test/unit_test.hpp>
#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <cstring>
-#include "../../src/tools/license-generator/license-generator.h"
-#include "../../src/library/api/license++.h"
#include <boost/filesystem.hpp>
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
+
+#include <licensecc/licensecc.h>
#include "../../src/library/ini/SimpleIni.h"
-#include "generate-license.h"
#include "../../src/library/pc-identifiers.h"
+#include "../../src/library/os/os.h"
+#include "generate-license.h"
namespace fs = boost::filesystem;
using namespace license;
using namespace std;
+namespace license {
+namespace test {
+
BOOST_AUTO_TEST_CASE( default_volid_lic_file ) {
- const string licLocation(PROJECT_TEST_TEMP_DIR "/volid_license.lic");
PcSignature identifier_out;
const IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
@@ -32,13 +36,13 @@
extraArgs.push_back("-s");
extraArgs.push_back(identifier_out);
BOOST_TEST_CHECKPOINT("Before generate license");
- generate_license(licLocation, extraArgs);
+ const string licLocation = generate_license("volid_license", extraArgs);
LicenseInfo license;
LicenseLocation licenseLocation;
licenseLocation.licenseFileLocation = licLocation.c_str();
licenseLocation.licenseData = "";
- const EVENT_TYPE result = acquire_license("TEST", &licenseLocation, &license);
+ const EVENT_TYPE result = acquire_license(nullptr, &licenseLocation, &license);
BOOST_CHECK_EQUAL(result, LICENSE_OK);
BOOST_CHECK_EQUAL(license.has_expiry, false);
BOOST_CHECK_EQUAL(license.linked_to_pc, true);
@@ -137,3 +141,5 @@
}
}
+} // namespace test
+} // namespace license
--
Gitblit v1.9.1