diff options
| -rw-r--r-- | device.cc | 2 | ||||
| -rw-r--r-- | unittest/test.cc | 18 |
2 files changed, 4 insertions, 16 deletions
@@ -48,7 +48,7 @@ CommError Device::recv(void *packet) { int retry_count = 0; Log::instance()(__PRETTY_FUNCTION__, Loglevel::DEBUG_L2); - std::this_thread::sleep_for( std::chrono::milliseconds(5000) ); + std::this_thread::sleep_for( std::chrono::milliseconds(5000) ); //FIXME remove timeout in favor of sync communication if (mp_devhandle == NULL) throw std::runtime_error("Attempted HID receive on an invalid descriptor."); diff --git a/unittest/test.cc b/unittest/test.cc index 2dfd325..8f6a27a 100644 --- a/unittest/test.cc +++ b/unittest/test.cc @@ -12,7 +12,6 @@ using namespace nitrokey::device; using namespace nitrokey::proto::stick10; using namespace nitrokey::log; -//int main() { std::string getSlotName(Stick10& stick, int slotNo){ ReadSlot::CommandTransaction::CommandPayload slot_req; @@ -24,28 +23,17 @@ std::string getSlotName(Stick10& stick, int slotNo){ TEST_CASE( "Slot names are correct", "[slotNames]" ) { Stick10 stick; + stick.connect(); Log::instance().set_loglevel(Loglevel::DEBUG_L2); - { auto resp = GetStatus::CommandTransaction::run(stick); - } - { FirstAuthenticate::CommandTransaction::CommandPayload authreq; strcpy((char *)(authreq.card_password), "12345678"); FirstAuthenticate::CommandTransaction::run(stick, authreq); - } - - { - //for (int i=0x20; i<0x23; i++) { - // ReadSlot::CommandTransaction::CommandPayload slot_req; - // slot_req.slot_number = i; - // auto slot = ReadSlot::CommandTransaction::run(stick, slot_req); - //} - REQUIRE( getSlotName(stick, 0x20) == std::string("slot1") ); + + REQUIRE( getSlotName(stick, 0x20) == std::string("1") ); REQUIRE( getSlotName(stick, 0x21) == std::string("slot2") ); - REQUIRE( getSlotName(stick, 0x22) == std::string("slot3") ); - } stick.disconnect(); } |