From 43bb63424fb7e78c245341c1baf326557ef896e8 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 31 Jan 2017 18:53:14 +0100
Subject: C++ tests fixed

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 unittest/test2.cc | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'unittest/test2.cc')

diff --git a/unittest/test2.cc b/unittest/test2.cc
index 00e70e3..4b61a3c 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -20,9 +20,10 @@ using namespace nitrokey::proto::stick20;
 using namespace nitrokey::log;
 using namespace nitrokey::misc;
 
+#include <memory>
 
 template<typename CMDTYPE>
-void execute_password_command(Device &stick, const char *password, const char kind = 'P') {
+void execute_password_command(std::shared_ptr<Device> stick, const char *password, const char kind = 'P') {
   auto p = get_payload<CMDTYPE>();
   if (kind == 'P'){
     p.set_kind_user();
@@ -47,8 +48,8 @@ void SKIP_TEST() {
 TEST_CASE("long operation test", "[test_long]") {
   SKIP_TEST();
 
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
   try{
@@ -123,8 +124,8 @@ TEST_CASE("test device commands ids", "[fast]") {
 }
 
 TEST_CASE("test device internal status with various commands", "[fast]") {
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
 
   Log::instance().set_loglevel(Loglevel::DEBUG);
@@ -147,8 +148,8 @@ TEST_CASE("test device internal status with various commands", "[fast]") {
 }
 
 TEST_CASE("setup hidden volume test", "[hidden]") {
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
   stick10::LockDevice::CommandTransaction::run(stick);
@@ -170,8 +171,8 @@ TEST_CASE("setup hidden volume test", "[hidden]") {
 }
 
 TEST_CASE("setup multiple hidden volumes", "[hidden]") {
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
 
@@ -207,8 +208,8 @@ TEST_CASE("setup multiple hidden volumes", "[hidden]") {
 TEST_CASE("update password change", "[dangerous]") {
   SKIP_TEST();
 
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
 
@@ -228,8 +229,8 @@ TEST_CASE("update password change", "[dangerous]") {
 }
 
 TEST_CASE("general test", "[test]") {
-  Stick20 stick;
-  bool connected = stick.connect();
+  auto stick = make_shared<Stick20>();
+  bool connected = stick->connect();
   REQUIRE(connected == true);
 
   Log::instance().set_loglevel(Loglevel::DEBUG);
-- 
cgit v1.2.1