@@ -2,8 +2,8 @@ CXXFLAGS += -fPIC -fno-stack-protector -std=c++14

 CFLAGS += -fPIC -fno-stack-protector

 OBJS = dual_control.o request.o dual_control_integrate.o validator.o conversation.o user.o \

-	   sys_unistd.o sys_pwd.o

-TESTS = dual_control_test validator_test conversation_test request_test user_test

+	   sys_unistd.o sys_pwd.o token.o

+TESTS = dual_control_test validator_test conversation_test request_test user_test token_test

 TESTOBJS = $(patsubst %,%.o,$(TESTS))

 SRCS := $(OBJS:.o=.cc) $(TESTOBJS:.o=.cc)

@@ -24,8 +24,28 @@ namespace

         public:

             impl(file_reader &file_reader) : file_reader_(file_reader) {}

             std::string token(user &user) {

-                std::string filepath = user.home_directory() + "/" + ".dual_control";

-                file_reader_.read(filepath);

+                std::string file_path(user.home_directory());

+                std::string fetched_token(file_reader_.read(file_path));

+                return fetched_token;

             }

     };

+

+    class file_reader_impl : public file_reader_ifc {

+        public:

+            std::string read(std::string file_path) {

+                return file_path;

+            }

+    };

+}

+

+file_reader file_reader::create ()

+{

+    return file_reader (std::shared_ptr<file_reader_ifc>(new file_reader_impl ));

+}

+

+user_token_supplier user_token_supplier::create (file_reader &file_reader)

+{

+    return user_token_supplier (std::shared_ptr<user_token_supplier_ifc>(new impl (file_reader)));

 }

+

+

@@ -19,12 +19,36 @@

 class user_token_supplier_ifc

 {

 public:

-    virtual std::string token (const user &user)

+    virtual ~user_token_supplier_ifc() {}

+    virtual std::string token (user &user)

     {

-        return "";

+        return "virtual supplier";

     }

 };

+

+class file_reader_ifc {

+    public:

+        virtual std::string read(std::string file_path) {

+            return "";

+        }

+};

+

+class file_reader : public file_reader_ifc {

+    public:

+        typedef std::shared_ptr<file_reader_ifc> delegate;

+    private:

+        delegate delegate_;

+    public:

+        file_reader(delegate delegate) :

+            delegate_(delegate) {}

+        file_reader() : delegate_(delegate(new file_reader_ifc)) {}

+        std::string read(std::string file_path) {

+            return delegate_->read(file_path);

+        }

+    static file_reader create ();

+};

+

 class user_token_supplier : public user_token_supplier_ifc

 {

     public:

@@ -36,16 +60,12 @@ class user_token_supplier : public user_token_supplier_ifc

         delegate_ (delegate) {}

         user_token_supplier() : user_token_supplier (

            delegate (new user_token_supplier_ifc)) {}

-        std::string token (const user &user)

+        std::string token (user &user)

         {

             return delegate_->token (user);

         }

+    static user_token_supplier create (file_reader &file_reader);

 };

-class file_reader_ifc {

-    public:

-        std::string read(

-}

-

 #endif

@@ -9,19 +9,61 @@

  * at https://github.com/cjdev/dual-control.

  */

+#include <memory>

 #include <cstring>

 #include <pwd.h>

 #include <cstdio>

 #include <sys/stat.h>

+

 #include "token.h"

 #include "test_util.h"

+#include "user.h"

+

+class fake_file_reader : public file_reader_ifc {

+    public:

+        std::string read(std::string file_path) {

+            return file_path;

+        }

+};

+class fake_user : public user_ifc {

+    private:

+        std::string home_directory_;

+    public:

+        fake_user(std::string &user_name) :

+            home_directory_("home/" + user_name + "/.dual_control") {

+            }

+        std::string home_directory() {

+            return home_directory_;

+        }

+};

+int reads_from_the_right_file () {

+    //given

+    file_reader test_file_reader(file_reader::delegate(new fake_file_reader));

+    std::string user_name = "user";

+    std::string expected = "home/" + user_name + "/.dual_control";

+    user test_user(std::shared_ptr<fake_user>((new fake_user(user_name))));

+    user_token_supplier supplier(user_token_supplier::create(test_file_reader));

+    //when

+    std::string actual = supplier.token(test_user);

+    //then

+    check(actual == expected, "read wrong file");

+    succeed();

+}

 RESET_VARS_START

 RESET_VARS_END

+int run_tests() {

+    test(reads_from_the_right_file);

+    succeed();

+}

+

+int main(int argc, char *argv[]) {

+    return !run_tests();

+}

@@ -11,6 +11,7 @@

 #include <memory>

 #include <vector>

+#include <iostream>

 #include "user.h"

 #include "sys_unistd.h"

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

 namespace

 {

-

 class user_impl : public user_ifc {

     private:

         std::string home_directory_;

@@ -14,7 +14,7 @@

 #include <vector>

 #include <string>

 #include <memory>

-

+#include <iostream>

 #include "sys_unistd.h"

 #include "sys_pwd.h"

@@ -22,7 +22,9 @@ class user_ifc

 {

 public:

     virtual ~user_ifc() {}

-    virtual std::string home_directory();

+    virtual std::string home_directory() {

+        return "virtual";

+    }

 };

 class user : public user_ifc

@@ -32,8 +34,13 @@ class user : public user_ifc

     private:

         delegate delegate_;

     public:

-        user (delegate delegate) : delegate_ (delegate) {}

+        user (delegate delegate) : delegate_ (delegate) {

+        }

         user() : user (delegate (new user_ifc)) {}

+        std::string home_directory() {

+            return delegate_-> home_directory();

+        }

+    static user create (const passwd &passwd);

 };

 class directory_ifc

@@ -34,7 +34,6 @@ public:

         if (user_name == user_name_) {

             result.push_back (user());

         }

-

         return result;

     }

 };

@@ -46,7 +45,7 @@ private:

 public:

     fake_user_token_supplier (const std::string &token) : token_ (token) {}

     fake_user_token_supplier() : token_ ("_NOT_A_TOKEN") {}

-    virtual std::string token (const user &user)

+    std::string token (user &user)

     {

         return token_;

     }