3 files changed, 93 insertions, 5 deletions
diff --git a/test/test-macros.el b/test/test-macros.el
index 1634603..5e0eac9 100644
--- a/test/test-macros.el
+++ b/test/test-macros.el
@@ -39,6 +39,5 @@
            .page
            .page_size
            .quota_max
-           .quota_remaining
-           .total)
-      nil none))))
+           .quota_remaining)
+      nil nil))))
diff --git a/test/test-printing.el b/test/test-printing.el
index c477b28..7384829 100644
--- a/test/test-printing.el
+++ b/test/test-printing.el
@@ -64,13 +64,76 @@ after being run through `sx-question--tag-format'."
   "Test `sx--user-@name' character substitution"
   (should
    (string=
-    (sx--user-@name '((display_name . "ĥÞßđłřğĝýÿñńśşšŝżźžçćčĉùúûüŭůòóôõöøőðìíîïıèéêëęàåáâäãåąĵ★")))
+    (sx-user--@name "ĥÞßđłřğĝýÿñńśşšŝżźžçćčĉùúûüŭůòóôõöøőðìíîïıèéêëęàåáâäãåąĵ★")
     "@hTHssdlrggyynnsssszzzccccuuuuuuooooooooiiiiieeeeeaaaaaaaaj"))
   (should
    (string=
-    (sx--user-@name '((display_name . "ĤÞßĐŁŘĞĜÝŸÑŃŚŞŠŜŻŹŽÇĆČĈÙÚÛÜŬŮÒÓÔÕÖØŐÐÌÍÎÏıÈÉÊËĘÀÅÁÂÄÃÅĄĴ")))
+    (sx-user--@name "ĤÞßĐŁŘĞĜÝŸÑŃŚŞŠŜŻŹŽÇĆČĈÙÚÛÜŬŮÒÓÔÕÖØŐÐÌÍÎÏıÈÉÊËĘÀÅÁÂÄÃÅĄĴ")
+    "@HTHssDLRGGYYNNSSSSZZZCCCCUUUUUUOOOOOOOOIIIIiEEEEEAAAAAAAAJ"))
+  (should-error
+   (sx-user--@name 2)))
+
+(ert-deftest sx-user--format ()
+  "Test various `sx-user--format' features."
+  (let ((user
+         '((display_name . "ĥÞßđłřğĝýÿñńśşšŝżźžçćčĉùúûüŭůòóôõöøőðìíîïıèéêëęàåáâäãåąĵ★")
+           (accept_rate . 90)
+           (reputation . 10)
+           (link . "link"))))
+    (should
+     (equal (sx-user--format "%l" user) "link"))
+    (should
+     (equal
+      (sx-user--format "%@" user)
+      "@hTHssdlrggyynnsssszzzccccuuuuuuooooooooiiiiieeeeeaaaaaaaaj"))
+    (should
+     (equal
+      (sx-user--format "%@%%d%%%-30d  %9r%l" user)
+      "@hTHssdlrggyynnsssszzzccccuuuuuuooooooooiiiiieeeeeaaaaaaaaj%d%ĥÞßđłřğĝýÿñńśşšŝżźžçćčĉùúûüŭůòóôõöøőðìíîïıèéêëęàåáâäãåąĵ★         10link")))
+  (should
+   (string=
+    (sx-user--format "%@" '((display_name . "ĤÞßĐŁŘĞĜÝŸÑŃŚŞŠŜŻŹŽÇĆČĈÙÚÛÜŬŮÒÓÔÕÖØŐÐÌÍÎÏıÈÉÊËĘÀÅÁÂÄÃÅĄĴ")))
     "@HTHssDLRGGYYNNSSSSZZZCCCCUUUUUUOOOOOOOOIIIIiEEEEEAAAAAAAAJ")))
 
+(ert-deftest sx-object-modification ()
+  "Test adding things to objects"
+  (let ((object (list (cons 'owner "me"))))
+    (should
+     (equal (sx--ensure-owner-in-object 1 object)
+            '((owner . "me"))))
+    (should
+     (equal object '((owner . "me")))))
+  (let ((object (list (cons 'not-owner "me"))))
+    (should
+     (equal (sx--ensure-owner-in-object 1 object)
+            '((owner . 1) (not-owner . "me"))))
+    (should
+     (equal object '((owner . 1) (not-owner . "me")))))
+  (let ((object (list (cons 'comments [something]))))
+    (should
+     (equal (sx--add-comment-to-object "comment" object)
+            '((comments . [something "comment"]))))
+    (should
+     (equal object '((comments . [something "comment"])))))
+  (let ((object (list (cons 'not-comments [something]))))
+    (should
+     (equal (sx--add-comment-to-object "comment" object)
+            '((comments . ["comment"]) (not-comments . [something]))))
+    (should
+     (equal object '((comments . ["comment"]) (not-comments . [something])))))
+  (let ((object (list (cons 'not-answers [something]))))
+    (should
+     (equal (sx--add-answer-to-question-object "answer" object)
+            '((answers . ["answer"]) (not-answers . [something]))))
+    (should
+     (equal object '((answers . ["answer"]) (not-answers . [something])))))
+  (let ((object (list (cons 'answers [something]))))
+    (should
+     (equal (sx--add-answer-to-question-object "answer" object)
+            '((answers . [something "answer"]))))
+    (should
+     (equal object '((answers . [something "answer"]))))))
+
 (ert-deftest sx-question-mode--fill-and-fontify ()
   "Check complicated questions are filled correctly."
   (should
diff --git a/test/test-util.el b/test/test-util.el
index 1e3dc2b..b466c08 100644
--- a/test/test-util.el
+++ b/test/test-util.el
@@ -43,3 +43,29 @@
      (lambda (path) (intern (mapconcat #'symbol-name path "/")))
      '(a b (c d (e f g) h i (j k) l) m (n o) p))
     '(a b c/d c/e/f c/e/g c/h c/i c/j/k c/l m n/o p))))
+
+(ert-deftest link-to-data ()
+  (should
+   (equal
+    (sx--link-to-data "http://meta.emacs.stackexchange.com/posts/comments/510?noredirect=1")
+    '((id . 510) (type . comment) (site_par . "meta.emacs"))))
+  (should
+   (equal
+    (sx--link-to-data "http://emacs.stackexchange.com/questions/7409/is-there-a-generic-toggle-previous-window-function#comment10965_7409")
+    '((id . 10965) (type . comment) (site_par . "emacs"))))
+  (should
+   (equal
+    (sx--link-to-data "http://emacs.stackexchange.com/q/7409/50")
+    '((id . 7409) (type . question) (site_par . "emacs"))))
+  (should
+   (equal
+    (sx--link-to-data "http://emacs.stackexchange.com/a/7410/50")
+    '((id . 7410) (type . answer) (site_par . "emacs"))))
+  (should
+   (equal
+    (sx--link-to-data "http://emacs.stackexchange.com/questions/7409/is-there-a-generic-toggle-previous-window-function/9999#7410")
+    '((id . 7410) (type . answer) (site_par . "emacs"))))
+  (should
+   (equal
+    (sx--link-to-data "http://emacs.stackexchange.com/questions/7409/is-there-a-generic-toggle-previous-window-function/7410")
+    '((id . 7410) (type . answer) (site_par . "emacs")))))