@@ -7,4 +7,4 @@ notifications:

   email:

     on_success: change

     on_failure: change

-script: ./configure && make test

+script: ./configure && make -k test

@@ -28,7 +28,6 @@

 #include "sys_stdlib.h"

 #include "sys_time.h"

-using generator = std::function<std::string()>;

 int ipow (int base, int exp);

 time_t time_step (const time_t time, const int step);

@@ -54,6 +53,9 @@ public:

         return delegate_->generate_token();

     };

+    totp_generator (delegate delegate_) :

+        delegate_(delegate_)

+    {}

     totp_generator (const sys_time &clock,

                     const std::string &key_c,

                     const int code_digits);

@@ -18,6 +18,7 @@

 #include "user.h"

 #include "token.h"

 #include "test_util.h"

+#include "generator.h"

 class mock_tokens : public tokens_ifc

 {

@@ -50,6 +51,14 @@ public:

     }

 };

+class fake_totp_generator : public token_generator_ifc

+{

+    public:

+        std::string generate_token() {

+            return "000000";

+        }

+};

+

 class fake_directory : public directory_ifc

 {

 private:

@@ -81,10 +90,9 @@ int installs_token()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (user_name));

     directory directory (std::make_shared<fake_directory> (user_name));

-    generator generator = [&] { return token; };

+    totp_generator *generator = new totp_generator(std::make_shared<fake_totp_generator>());

-    installer installer = installer::create (tokens, unistd, directory,

-                          generator);

+    installer installer = installer::create (tokens, unistd, directory, std::shared_ptr<totp_generator> (generator));

     //when

     std::string result = installer.install_token();

@@ -104,10 +112,9 @@ int unistd_does_not_find_user_name_nullptr_case()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fail_unistd>());

     directory directory (std::make_shared<fake_directory> (user_name));

-    generator generator = [&] { return token; };

+    auto generator = std::shared_ptr<totp_generator>(new totp_generator(std::make_shared<fake_totp_generator>()));

-    installer installer = installer::create (tokens, unistd, directory,

-                          generator);

+    installer installer = installer::create (tokens, unistd, directory, generator);

     //when

     auto returned = installer.install_token();

@@ -128,10 +135,9 @@ int unistd_does_not_find_user_name_empty_string_case()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (""));

     directory directory (std::make_shared<fake_directory> (user_name));

-    generator generator = [&] { return token; };

+    auto generator = std::shared_ptr<totp_generator>(new totp_generator(std::make_shared<fake_totp_generator>()));

-    installer installer = installer::create (tokens, unistd, directory,

-                          generator);

+    installer installer = installer::create (tokens, unistd, directory, generator);

     //when

     auto returned = installer.install_token();

@@ -151,10 +157,9 @@ int directory_finds_no_user_info()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (user_name));

     directory directory (std::make_shared<fake_directory> ("not the user"));

-    generator generator = [&] { return token; };

+    auto generator = std::shared_ptr<totp_generator>(new totp_generator(std::make_shared<fake_totp_generator>()));

-    installer installer = installer::create (tokens, unistd, directory,

-                          generator);

+    installer installer = installer::create (tokens, unistd, directory, generator);

     //when

     auto returned = installer.install_token();