summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2018-01-29 19:02:48 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2018-01-29 19:02:48 +0100
commit25e458ea8fdd4d704ce29709852b122cbcad5f06 (patch)
tree1003fa4b52153e3b2b727ce1bc394435d2fc9187
parentf5235ca6cff56b7561901d311f6bd65aa2615ffb (diff)
parent6f35a5f98174a84bc4d96a98c37f66acc06f5b22 (diff)
downloadlibnitrokey-25e458ea8fdd4d704ce29709852b122cbcad5f06.tar.gz
libnitrokey-25e458ea8fdd4d704ce29709852b122cbcad5f06.tar.bz2
Merge branch 'update_catch'
Closes #91
m---------unittest/Catch0
-rw-r--r--unittest/test_HOTP.cc2
-rw-r--r--unittest/test_issues.cc10
-rw-r--r--unittest/test_offline.cc2
4 files changed, 12 insertions, 2 deletions
diff --git a/unittest/Catch b/unittest/Catch
-Subproject ae5ee2cf63d6d67bd1369b512d2a7b60b571c90
+Subproject 62dae592c330ab74cea30c897255ee9518639c3
diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc
index a4f42d2..520faaf 100644
--- a/unittest/test_HOTP.cc
+++ b/unittest/test_HOTP.cc
@@ -50,7 +50,7 @@ TEST_CASE("test secret", "[functions]") {
slot_secret[20] = 0;
const char* secretHex = "3132333435363738393031323334353637383930";
hexStringToByte(slot_secret, secretHex);
- CAPTURE(slot_secret);
+ INFO("Secret: " << slot_secret);
REQUIRE(strcmp("12345678901234567890",reinterpret_cast<char *>(slot_secret) ) == 0 );
}
diff --git a/unittest/test_issues.cc b/unittest/test_issues.cc
index fe80384..d4fd72e 100644
--- a/unittest/test_issues.cc
+++ b/unittest/test_issues.cc
@@ -87,6 +87,16 @@ bool test_31(){
}
TEST_CASE("issue 31", "[issue]"){
+ {
+ auto i = NitrokeyManager::instance();
+ i->set_loglevel(4);
+ REQUIRE(i->connect());
+
+ i->unlock_encrypted_volume(default_user_pin);
+ i->create_hidden_volume(0, 70, 80, hidden_volume_pass);
+ i->lock_device();
+ }
+
for(int i=0; i<20; i++){
REQUIRE(test_31());
}
diff --git a/unittest/test_offline.cc b/unittest/test_offline.cc
index 2d1fcb3..3ef63d2 100644
--- a/unittest/test_offline.cc
+++ b/unittest/test_offline.cc
@@ -115,7 +115,7 @@ TEST_CASE("Test helper function - hex_string_to_byte", "[fast]") {
REQUIRE(v.size() == sizeof(test_data));
for (int i = 0; i < v.size(); ++i) {
INFO("Position i: " << i);
- REQUIRE(v.data()[i] == test_data[i]);
+ REQUIRE(v[i] == test_data[i]);
}
}