git.fiddlerwoaroof.com
Browse code

formatting

jbalcita authored on 24/04/2017 16:09:50
Showing 7 changed files
conversation.cc
History View file @ 0e21882
... ... 
@@ -71,3 +71,4 @@ conversation create_conversation (pam &pam)
71 71 
 {
72 72 
     return conversation (std::shared_ptr<conversation_ifc> (new impl (pam)));
73 73 
 }
74 
+
token.cc
History View file @ 0e21882
... ... 
@@ -18,34 +18,39 @@
18 18
19 19 
 namespace
20 20 
 {
21 
-    class impl : public user_token_supplier_ifc {
22 
-        private:
23 
-            file_reader file_reader_;
24 
-        public:
25 
-            impl(file_reader &file_reader) : file_reader_(file_reader) {}
26 
-            std::string token(user &user) {
27 
-                std::string file_path(user.home_directory() + "/.dual_control");
28 
-                std::string fetched_token(file_reader_.read(file_path));
29 
-                return fetched_token;
30 
-            }
31 
-    };
32 
-
33 
-    class file_reader_impl : public file_reader_ifc {
34 
-        public:
35 
-            std::string read(std::string file_path) {
36 
-                return file_path;
37 
-            }
38 
-    };
21 
+class impl : public user_token_supplier_ifc
22 
+{
23 
+private:
24 
+    file_reader file_reader_;
25 
+public:
26 
+    impl (file_reader &file_reader) : file_reader_ (file_reader) {}
27 
+    std::string token (user &user)
28 
+    {
29 
+        std::string file_path (user.home_directory() + "/.dual_control");
30 
+        std::string fetched_token (file_reader_.read (file_path));
31 
+        return fetched_token;
32 
+    }
33 
+};
34 
+
35 
+class file_reader_impl : public file_reader_ifc
36 
+{
37 
+public:
38 
+    std::string read (std::string file_path)
39 
+    {
40 
+        return file_path;
41 
+    }
42 
+};
39 43 
 }
40 44
41 45 
 file_reader file_reader::create ()
42 46 
 {
43 
-    return file_reader (std::shared_ptr<file_reader_ifc>(new file_reader_impl ));
47 
+    return file_reader (std::shared_ptr<file_reader_ifc> (new
48 
+                        file_reader_impl ));
44 49 
 }
45 50
46 51 
 user_token_supplier user_token_supplier::create (file_reader &file_reader)
47 52 
 {
48 
-    return user_token_supplier (std::shared_ptr<user_token_supplier_ifc>(new impl (file_reader)));
53 
+    return user_token_supplier (std::shared_ptr<user_token_supplier_ifc>
54 
+                                (new impl (file_reader)));
49 55 
 }
50 56
51 
-
token.h
History View file @ 0e21882
... ... 
@@ -26,44 +26,47 @@ public:
26 26 
     }
27 27 
 };
28 28
29 
-
30 
-class file_reader_ifc {
31 
-    public:
32 
-        virtual std::string read(std::string file_path) {
33 
-            return "";
34 
-        }
29 
+class file_reader_ifc
30 
+{
31 
+public:
32 
+    virtual std::string read (std::string file_path)
33 
+    {
34 
+        return "";
35 
+    }
35 36 
 };
36 37
37 
-class file_reader : public file_reader_ifc {
38 
-    public:
39 
-        typedef std::shared_ptr<file_reader_ifc> delegate;
40 
-    private:
41 
-        delegate delegate_;
42 
-    public:
43 
-        file_reader(delegate delegate) :
44 
-            delegate_(delegate) {}
45 
-        file_reader() : delegate_(delegate(new file_reader_ifc)) {}
46 
-        std::string read(std::string file_path) {
47 
-            return delegate_->read(file_path);
48 
-        }
38 
+class file_reader : public file_reader_ifc
39 
+{
40 
+public:
41 
+    typedef std::shared_ptr<file_reader_ifc> delegate;
42 
+private:
43 
+    delegate delegate_;
44 
+public:
45 
+    file_reader (delegate delegate) :
46 
+        delegate_ (delegate) {}
47 
+    file_reader() : delegate_ (delegate (new file_reader_ifc)) {}
48 
+    std::string read (std::string file_path)
49 
+    {
50 
+        return delegate_->read (file_path);
51 
+    }
49 52 
     static file_reader create ();
50 53 
 };
51 54
52 55 
 class user_token_supplier : public user_token_supplier_ifc
53 56 
 {
54 
-    public:
55 
-        typedef std::shared_ptr<user_token_supplier_ifc> delegate;
56 
-    private:
57 
-        delegate delegate_;
58 
-    public:
59 
-        user_token_supplier (delegate delegate) :
57 
+public:
58 
+    typedef std::shared_ptr<user_token_supplier_ifc> delegate;
59 
+private:
60 
+    delegate delegate_;
61 
+public:
62 
+    user_token_supplier (delegate delegate) :
60 63 
         delegate_ (delegate) {}
61 
-        user_token_supplier() : user_token_supplier (
62 
-           delegate (new user_token_supplier_ifc)) {}
63 
-        std::string token (user &user)
64 
-        {
65 
-            return delegate_->token (user);
66 
-        }
64 
+    user_token_supplier() : user_token_supplier (
65 
+            delegate (new user_token_supplier_ifc)) {}
66 
+    std::string token (user &user)
67 
+    {
68 
+        return delegate_->token (user);
69 
+    }
67 70 
     static user_token_supplier create (file_reader &file_reader);
68 71 
 };
69 72
token_test.cc
History View file @ 0e21882
... ... 
@@ -15,57 +15,63 @@
15 15 
 #include <cstdio>
16 16 
 #include <sys/stat.h>
17 17
18 
-
19 18 
 #include "token.h"
20 19 
 #include "test_util.h"
21 20 
 #include "user.h"
22 21
23 
-class fake_file_reader : public file_reader_ifc {
24 
-    public:
25 
-        std::string read(std::string file_path) {
26 
-            return file_path;
27 
-        }
22 
+class fake_file_reader : public file_reader_ifc
23 
+{
24 
+public:
25 
+    std::string read (std::string file_path)
26 
+    {
27 
+        return file_path;
28 
+    }
28 29 
 };
29 30
30 
-class fake_user : public user_ifc {
31 
-    private:
32 
-        std::string home_directory_;
33 
-    public:
34 
-        fake_user(std::string &user_name) :
35 
-            home_directory_("home/" + user_name) {
36 
-            }
37 
-        std::string home_directory() {
38 
-            return home_directory_;
39 
-        }
31 
+class fake_user : public user_ifc
32 
+{
33 
+private:
34 
+    std::string home_directory_;
35 
+public:
36 
+    fake_user (std::string &user_name) :
37 
+        home_directory_ ("home/" + user_name)
38 
+    {
39 
+    }
40 
+    std::string home_directory()
41 
+    {
42 
+        return home_directory_;
43 
+    }
40 44 
 };
41 45
42 
-int reads_from_the_right_file () {
46 
+int reads_from_the_right_file ()
47 
+{
43 48 
     //given
44 
-    file_reader test_file_reader(file_reader::delegate(new fake_file_reader));
49 
+    file_reader test_file_reader (file_reader::delegate (new fake_file_reader));
45 50 
     std::string user_name = "user";
46 51 
     std::string expected = "home/" + user_name + "/.dual_control";
47 
-    user test_user(user::delegate(new fake_user(user_name)));
48 
-    user_token_supplier supplier(user_token_supplier::create(test_file_reader));
52 
+    user test_user (user::delegate (new fake_user (user_name)));
53 
+    user_token_supplier supplier (user_token_supplier::create (
54 
+                                      test_file_reader));
49 55
50 56 
     //when
51 
-    std::string actual = supplier.token(test_user);
57 
+    std::string actual = supplier.token (test_user);
52 58
53 59 
     //then
54 
-    check(actual == expected, "read wrong file");
60 
+    check (actual == expected, "read wrong file");
55 61 
     succeed();
56 62 
 }
57 63
58 
-
59 
-
60 64 
 RESET_VARS_START
61 65 
 RESET_VARS_END
62 66
63 
-int run_tests() {
64 
-    test(reads_from_the_right_file);
67 
+int run_tests()
68 
+{
69 
+    test (reads_from_the_right_file);
65 70 
     succeed();
66 71 
 }
67 72
68 
-int main(int argc, char *argv[]) {
73 
+int main (int argc, char *argv[])
74 
+{
69 75 
     return !run_tests();
70 76 
 }
71 77
user.cc
History View file @ 0e21882
... ... 
@@ -19,17 +19,19 @@
19 19
20 20 
 namespace
21 21 
 {
22 
-class user_impl : public user_ifc {
23 
-    private:
24 
-        std::string home_directory_;
25 
-        std::string user_name_;
26 
-    public:
27 
-        user_impl(const passwd user_info) :
28 
-            home_directory_(std::string(user_info.pw_dir)),
29 
-            user_name_(std::string(user_info.pw_name)) {}
30 
-        std::string home_directory() {
31 
-            return home_directory_;
32 
-        }
22 
+class user_impl : public user_ifc
23 
+{
24 
+private:
25 
+    std::string home_directory_;
26 
+    std::string user_name_;
27 
+public:
28 
+    user_impl (const passwd user_info) :
29 
+        home_directory_ (std::string (user_info.pw_dir)),
30 
+        user_name_ (std::string (user_info.pw_name)) {}
31 
+    std::string home_directory()
32 
+    {
33 
+        return home_directory_;
34 
+    }
33 35 
 };
34 36
35 37 
 class directory_impl : public directory_ifc
... ... 
@@ -49,7 +51,8 @@ public:
49 51 
         std::vector<user> return_value;
50 52
51 53 
         if (!result && found_passwd) {
52 
-            return_value.push_back (std::shared_ptr<user_ifc>(new user_impl(sys_passwd)));
54 
+            return_value.push_back (std::shared_ptr<user_ifc> (new user_impl (
55 
+                                        sys_passwd)));
53 56 
         }
54 57
55 58 
         return return_value;
user.h
History View file @ 0e21882
... ... 
@@ -22,24 +22,27 @@ class user_ifc
22 22 
 {
23 23 
 public:
24 24 
     virtual ~user_ifc() {}
25 
-    virtual std::string home_directory() {
25 
+    virtual std::string home_directory()
26 
+    {
26 27 
         return "virtual";
27 28 
     }
28 29 
 };
29 30
30 31 
 class user : public user_ifc
31 32 
 {
32 
-    public:
33 
-        typedef std::shared_ptr<user_ifc> delegate;
34 
-    private:
35 
-        delegate delegate_;
36 
-    public:
37 
-        user (delegate delegate) : delegate_ (delegate) {
38 
-        }
39 
-        user() : user (delegate (new user_ifc)) {}
40 
-        std::string home_directory() {
41 
-            return delegate_-> home_directory();
42 
-        }
33 
+public:
34 
+    typedef std::shared_ptr<user_ifc> delegate;
35 
+private:
36 
+    delegate delegate_;
37 
+public:
38 
+    user (delegate delegate) : delegate_ (delegate)
39 
+    {
40 
+    }
41 
+    user() : user (delegate (new user_ifc)) {}
42 
+    std::string home_directory()
43 
+    {
44 
+        return delegate_-> home_directory();
45 
+    }
43 46 
     static user create (const passwd &passwd);
44 47 
 };
45 48
validator_test.cc
History View file @ 0e21882
... ... 
@@ -34,6 +34,7 @@ public:
34 34 
         if (user_name == user_name_) {
35 35 
             result.push_back (user());
36 36 
         }
37 
+
37 38 
         return result;
38 39 
     }
39 40 
 };