From af1e72475cc3f1cfc7cadece162e2231610c8cd0 Mon Sep 17 00:00:00 2001
From: Elie Tournier <tournier.elie@gmail.com>
Date: Tue, 18 Apr 2017 13:38:34 +0100
Subject: Rename devices: s/Stick10/Device_NKPro and s/Stick20/Device_NKStorage

Signed-off-by: Elie Tournier <tournier.elie@gmail.com>
---
 unittest/test.cc      |  4 ++--
 unittest/test2.cc     | 12 ++++++------
 unittest/test3.cc     |  2 +-
 unittest/test_HOTP.cc |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'unittest')

diff --git a/unittest/test.cc b/unittest/test.cc
index 41cf545..c877d33 100644
--- a/unittest/test.cc
+++ b/unittest/test.cc
@@ -12,7 +12,7 @@ using namespace nitrokey::proto::NKPro;
 using namespace nitrokey::log;
 using namespace nitrokey::misc;
 
-using Dev10 = std::shared_ptr<Stick10>;
+using Dev10 = std::shared_ptr<Device_NKPro>;
 
 std::string getSlotName(Dev10 stick, int slotNo) {
   auto slot_req = get_payload<ReadSlot>();
@@ -23,7 +23,7 @@ std::string getSlotName(Dev10 stick, int slotNo) {
 }
 
 TEST_CASE("Slot names are correct", "[slotNames]") {
-  auto stick = make_shared<Stick10>();
+  auto stick = make_shared<Device_NKPro>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
 
diff --git a/unittest/test2.cc b/unittest/test2.cc
index 37d5983..cd012c5 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -47,7 +47,7 @@ void SKIP_TEST() {
 TEST_CASE("long operation test", "[test_long]") {
   SKIP_TEST();
 
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
@@ -123,7 +123,7 @@ TEST_CASE("test device commands ids", "[fast]") {
 }
 
 TEST_CASE("test device internal status with various commands", "[fast]") {
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
 
@@ -147,7 +147,7 @@ TEST_CASE("test device internal status with various commands", "[fast]") {
 }
 
 TEST_CASE("setup hidden volume test", "[hidden]") {
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
@@ -170,7 +170,7 @@ TEST_CASE("setup hidden volume test", "[hidden]") {
 }
 
 TEST_CASE("setup multiple hidden volumes", "[hidden]") {
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
@@ -207,7 +207,7 @@ TEST_CASE("setup multiple hidden volumes", "[hidden]") {
 TEST_CASE("update password change", "[dangerous]") {
   SKIP_TEST();
 
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
   Log::instance().set_loglevel(Loglevel::DEBUG);
@@ -228,7 +228,7 @@ TEST_CASE("update password change", "[dangerous]") {
 }
 
 TEST_CASE("general test", "[test]") {
-  auto stick = make_shared<Stick20>();
+  auto stick = make_shared<Device_NKStorage>();
   bool connected = stick->connect();
   REQUIRE(connected == true);
 
diff --git a/unittest/test3.cc b/unittest/test3.cc
index 65680ad..cfb63a0 100644
--- a/unittest/test3.cc
+++ b/unittest/test3.cc
@@ -21,7 +21,7 @@ using namespace nitrokey::proto::NKPro_08;
 using namespace nitrokey::log;
 using namespace nitrokey::misc;
 
-using Dev = Stick10;
+using Dev = Device_NKPro;
 using Dev10 = std::shared_ptr<Dev>;
 
 void connect_and_setup(Dev10 stick) {
diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc
index 7c905dc..e1d682b 100644
--- a/unittest/test_HOTP.cc
+++ b/unittest/test_HOTP.cc
@@ -33,7 +33,7 @@ TEST_CASE("test secret", "[functions]") {
 }
 
 TEST_CASE("Test HOTP codes according to RFC", "[HOTP]") {
-    std::shared_ptr<Stick10> stick = make_shared<Stick10>();
+    std::shared_ptr<Device_NKPro> stick = make_shared<Device_NKPro>();
     bool connected = stick->connect();
 
   REQUIRE(connected == true);
-- 
cgit v1.2.1