@@ -48,8 +48,7 @@ validator_test: validator_test.o t_validator.o

 .PHONY: test

-test: user_test validator_test

-	@./user_test

+test: validator_test

 	@./validator_test

@@ -6,17 +6,19 @@

 #include <pwd.h>

 class user {

-    private:

-        struct passwd *info;

-

     public:

-        user(struct passwd *sys_info);

-        std::string home_directory();

+        virtual ~user() {}

+//        virtual std::string home_directory() = 0;

 };

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

 typedef std::shared_ptr<user> user_p;

+class directory {

+    public:

+        virtual ~directory() {}

+        virtual const user_p find_user(const std::string &user_name) = 0;

+};

+typedef std::shared_ptr<directory> directory_p;

 #endif

@@ -3,6 +3,6 @@

 #include "validator.h"

 bool validator::validate(const std::string &user_name, const std::string &token) {

-    return user_name == "user" && token == "token";

+    return directory_->find_user(user_name) && token == "token";

 }

@@ -3,8 +3,13 @@

 #include <string>

+#include "user.h"

+

 class validator {

+    private:

+        directory_p directory_;

     public:

+        validator(const directory_p &directory): directory_(directory) {}

         bool validate(const std::string &user, const std::string &token);

 };

@@ -1,29 +1,51 @@

 #include "validator.h"

+#include "user.h"

 #include "test_util.h"

+class fake_directory : public directory {

+    private:

+        std::string user_name_;

+    public:

+        fake_directory(const std::string &user_name) : user_name_(user_name) {}

+        fake_directory() : user_name_("_NOT_A_USER") {}

+

+        virtual const user_p find_user(const std::string &user_name) {

+            user_p result;

+            if (user_name == user_name_) {

+                result.reset(new user);

+            }

+

+            return result;

+        }

+};

+

+

 bool validator_validates() {

    // given

-   validator v;

+    std::string user_name = "msmith";

+    directory_p directory(new fake_directory(user_name));

+    validator validator(directory);

-   // when

-   bool actual = v.validate("user", "token");

+    // when

+    bool actual = validator.validate(user_name, "token");

-   // then

-   check(actual, "should be valid");

-   succeed();

+    // then

+    check(actual, "should be valid");

+    succeed();

 }

 bool validator_fails_unknown_user() {

    // given

-   validator v;

+   directory_p directory(new fake_directory);

+   validator validator(directory);

    // when

-   bool actual = v.validate("notuser", "token");

+   bool actual = validator.validate("notuser", "token");

    // then

@@ -34,11 +56,13 @@ bool validator_fails_unknown_user() {

 bool validator_fails_incorrect_token() {

    // given

-   validator v;

+    std::string user_name = "user";

+    directory_p directory(new fake_directory(user_name));

+    validator validator(directory);

    // when

-   bool actual = v.validate("user", "nottoken");

+   bool actual = validator.validate(user_name, "nottoken");

    // then