diff options
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/conftest.py | 1 | ||||
| -rw-r--r-- | unittest/test_C_API.cpp | 15 | ||||
| -rw-r--r-- | unittest/test_pro.py | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/unittest/conftest.py b/unittest/conftest.py index 9af67ac..49f1502 100644 --- a/unittest/conftest.py +++ b/unittest/conftest.py @@ -44,7 +44,6 @@ def C(request=None): cnt = 0 a = iter(declarations) for declaration in a: - if 'NK_device_model' in declaration: continue if declaration.strip().startswith('NK_C_API'): declaration = declaration.replace('NK_C_API', '').strip() while ';' not in declaration: diff --git a/unittest/test_C_API.cpp b/unittest/test_C_API.cpp index f38d0b6..1964738 100644 --- a/unittest/test_C_API.cpp +++ b/unittest/test_C_API.cpp @@ -87,18 +87,15 @@ TEST_CASE("multiple devices with ID", "[BASIC]") { } TEST_CASE("Get device model", "[BASIC]") { - auto success = NK_get_device_model(nullptr); - REQUIRE(!success); - NK_logout(); - NK_device_model model = static_cast<NK_device_model>(3); - success = NK_get_device_model(&model); - REQUIRE(!success); + NK_device_model model = NK_get_device_model(); + REQUIRE(model == NK_device_model::NK_DISCONNECTED); - auto result = NK_login_auto(); - REQUIRE(result != 0); - success = NK_get_device_model(&model); + auto success = NK_login_auto() == 1; REQUIRE(success); + model = NK_get_device_model(); + REQUIRE(model != NK_device_model::NK_DISCONNECTED); + REQUIRE((model == NK_PRO || model == NK_STORAGE)); NK_logout(); } diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 53588f6..6fac172 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -872,3 +872,8 @@ def test_TOTP_codes_from_nitrokeyapp(secret, C): lib_at = lambda : bb(oath.totp(secret, period=period)) print (lib_at()) assert lib_at() == code_device + + +def test_get_device_model(C): + assert C.NK_get_device_model() != 0 + # assert C.NK_get_device_model() != C.NK_DISCONNECTED
\ No newline at end of file |