@@ -42,10 +42,15 @@ t_%.o: %.cc

 user_test: user_test.o t_user.o

 	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

+validator_test: validator_test.o t_validator.o

+	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

+

+

 .PHONY: test

-test: user_test

+test: user_test validator_test

 	@./user_test

+	@./validator_test

 #	@./dual_control_test

@@ -62,13 +62,12 @@ user::user(const std::string &user_name) :

 int validate_token(const char *c_user_name, const char *c_token) {

-    user user(c_user_name);

-    if (!user.valid()) {

-        return 0;

-    }

-    std::string token(c_token);

+   user_p user(create_user(c_user_name));

+

+   validator_p validator(create_validator(user));

+

+   return validator->valid(c_token);

-    return user.token() == token;

 }

@@ -1,5 +1,18 @@

 #ifndef _TOKEN_H

 #define _TOKEN_H

+#include <string>

+#include <memory>

+

+#include "user.h"

+

+class token {

+       std::string value_

+    public:

+       token(const std::string &value) : value_(value) {}

+       std::string value() { return value_; }

+}

+

+shared_ptr<token> create_token(std::shared_ptr<user> user);

 int validate_token(const char *user, const char *token);

@@ -16,6 +16,7 @@ class user {

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

+typedef std::shared_ptr<user> user_p;

 #endif

new file mode 100644

@@ -0,0 +1,8 @@

+#include <string>

+

+#include "validator.h"

+

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

+    return true;

+}

+

new file mode 100644

@@ -0,0 +1,11 @@

+#ifndef _VALIDATOR_

+#define _VALIDATOR_

+

+#include <string>

+

+class validator {

+    public:

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

+};

+

+#endif

new file mode 100644

@@ -0,0 +1,31 @@

+#include "validator.h"

+#include "test_util.h"

+

+bool validator_validates() {

+

+   // given

+   validator v;

+

+

+   // when

+   bool actual = v.validate("user", "code");

+

+

+   // then

+   check(actual, "user and code should be valid");

+   succeed();

+}

+

+RESET_VARS_START

+RESET_VARS_END

+

+bool run_tests() {

+    test(validator_validates);

+    succeed();

+

+}

+

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

+    return !run_tests();

+}

+