@@ -37,11 +37,13 @@ public:

     }

 };

-class file_reader_with_open_fail : public file_reader_ifc {

-    public:

-        bool open (std::ifstream &token_file, std::string &fetched_token) {

-            return false;

-        }

+class file_reader_with_open_fail : public file_reader_ifc

+{

+public:

+    bool open (std::ifstream &token_file, std::string &fetched_token)

+    {

+        return false;

+    }

 };

 class fake_user : public user_ifc

@@ -78,9 +80,11 @@ int reads_from_the_right_file ()

     succeed();

 }

-int returns_empty_string_if_file_open_fail() {

+int returns_empty_string_if_file_open_fail()

+{

     //given

-    file_reader test_file_reader (file_reader::delegate (new file_reader_with_open_fail));

+    file_reader test_file_reader (file_reader::delegate (new

+                                  file_reader_with_open_fail));

     user test_user (user::delegate (new fake_user));

     user_token_supplier supplier (user_token_supplier::create (

                                       test_file_reader));

@@ -89,7 +93,7 @@ int returns_empty_string_if_file_open_fail() {

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

     //then

-    check(actual == "", "should have returned empty string");

+    check (actual == "", "should have returned empty string");

     succeed();

 }

@@ -51,8 +51,7 @@ public:

         std::vector<user> return_value;

         if (!result && found_passwd) {

-            return_value.push_back (std::shared_ptr<user_ifc> (new user_impl (

-                                        sys_passwd)));

+            return_value.push_back (user::delegate (new user_impl (sys_passwd)));

         }

         return return_value;

@@ -65,41 +64,3 @@ directory directory::create (unistd &unistd, pwd &pwd)

     return directory (delegate (new directory_impl (unistd, pwd)));

 }

-/*

-class concrete_user : public user

-{

-private:

-    std::vector<char> buffer_;

-    std::shared_ptr<struct passwd> store_;

-public:

-    concrete_user (const std::vector<char> &buffer,

-                   const std::shared_ptr<struct passwd> &store);

-};

-

-concrete_user::concrete_user (const std::vector<char> &buffer,

-                              const std::shared_ptr<struct passwd> &store) :

-    buffer_ (buffer),

-    store_ (store),

-    user (store.get())

-{

-}

-

-const std::shared_ptr<user> create_user (const std::string &user_name)

-{

-    std::vector<char> buffer (sysconf (_SC_GETPW_R_SIZE_MAX));

-    std::shared_ptr<struct passwd> sys_passwd (new struct passwd);

-    struct passwd *found_passwd (0);

-

-    getpwnam_r (user_name.c_str(), sys_passwd.get(), buffer.data(),

-                buffer.size(), &found_passwd);

-

-    std::shared_ptr<user> rval;

-

-    if (found_passwd) {

-        rval.reset (new concrete_user (buffer, sys_passwd));

-    }

-

-    return rval;

-}

-*/

-