From 103b2d5d9bbc969bb2eb48f3238ef764858248b8 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 27 Aug 2022 10:30:31 +0200
Subject: masto notifs tests filename correct

---
 test/mastodon-notifications-test.el  | 217 -----------------------------------
 test/mastodon-notifications-tests.el | 217 +++++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+), 217 deletions(-)
 delete mode 100644 test/mastodon-notifications-test.el
 create mode 100644 test/mastodon-notifications-tests.el

(limited to 'test')

diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
deleted file mode 100644
index 4804e10..0000000
--- a/test/mastodon-notifications-test.el
+++ /dev/null
@@ -1,217 +0,0 @@
-;;; mastodon-notifications-test.el --- Tests for mastodon-notifications.el  -*- lexical-binding: nil -*-
-
-(require 'cl-lib)
-(require 'cl-macs)
-(require 'el-mock)
-
-(defconst mastodon-notifications--test-base-mentioned
-  '((id . "1234")
-    (type . "mention")
-    (created_at . "2018-03-06T04:27:21.288Z" )
-    (account (id . 42)
-             (username . "acct42")
-             (acct . "acct42@example.space")
-             (display_name . "Account 42")
-             (locked . :json-false)
-             (created_at . "2017-04-01T00:00:00.000Z")
-             (followers_count . 99)
-             (following_count . 13)
-             (statuses_count . 101)
-             (note . "E"))
-    (status (id . 61208)
-            (created_at . "2017-04-24T19:01:02.000Z")
-            (in_reply_to_id)
-            (in_reply_to_account_id)
-            (sensitive . :json-false)
-            (spoiler_text . "")
-            (visibility . "public")
-            (account (id . 42)
-                     (username . "acct42")
-                     (acct . "acct42@example.space")
-                     (display_name . "Account 42")
-                     (locked . :json-false)
-                     (created_at . "2017-04-01T00:00:00.000Z")
-                     (followers_count . 99)
-                     (following_count . 13)
-                     (statuses_count . 101)
-                     (note . "E"))
-            (media_attachments . [])
-            (mentions . [])
-            (tags . [])
-            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
-            (url . "https://example.space/users/acct42/updates/123456789")
-            (content . "<p>Just some text</p>")
-            (reblogs_count . 0)
-            (favourites_count . 0)
-            (reblog))))
-
-(defconst mastodon-notifications--test-base-favourite
-  '((id . "1234")
-    (type . "favourite")
-    (created_at . "2018-03-06T04:27:21.288Z" )
-    (account (id . 42)
-             (username . "acct42")
-             (acct . "acct42@example.space")
-             (display_name . "Account 42")
-             (locked . :json-false)
-             (created_at . "2017-04-01T00:00:00.000Z")
-             (followers_count . 99)
-             (following_count . 13)
-             (statuses_count . 101)
-             (note . "E"))
-    (status (id . 61208)
-            (created_at . "2017-04-24T19:01:02.000Z")
-            (in_reply_to_id)
-            (in_reply_to_account_id)
-            (sensitive . :json-false)
-            (spoiler_text . "")
-            (visibility . "public")
-            (account (id . 42)
-                     (username . "acct42")
-                     (acct . "acct42@example.space")
-                     (display_name . "Account 42")
-                     (locked . :json-false)
-                     (created_at . "2017-04-01T00:00:00.000Z")
-                     (followers_count . 99)
-                     (following_count . 13)
-                     (statuses_count . 101)
-                     (note . "E"))
-            (media_attachments . [])
-            (mentions . [])
-            (tags . [])
-            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
-            (url . "https://example.space/users/acct42/updates/123456789")
-            (content . "<p>Just some text</p>")
-            (reblogs_count . 0)
-            (favourites_count . 0)
-            (reblog))))
-
-(defconst mastodon-notifications--test-base-boosted
-  '((id . "1234")
-    (type . "reblog")
-    (created_at . "2018-03-06T04:27:21.288Z" )
-    (account (id . 42)
-             (username . "acct42")
-             (acct . "acct42@example.space")
-             (display_name . "Account 42")
-             (locked . :json-false)
-             (created_at . "2017-04-01T00:00:00.000Z")
-             (followers_count . 99)
-             (following_count . 13)
-             (statuses_count . 101)
-             (note . "E"))
-    (status (id . 61208)
-            (created_at . "2017-04-24T19:01:02.000Z")
-            (in_reply_to_id)
-            (in_reply_to_account_id)
-            (sensitive . :json-false)
-            (spoiler_text . "")
-            (visibility . "public")
-            (account (id . 42)
-                     (username . "acct42")
-                     (acct . "acct42@example.space")
-                     (display_name . "Account 42")
-                     (locked . :json-false)
-                     (created_at . "2017-04-01T00:00:00.000Z")
-                     (followers_count . 99)
-                     (following_count . 13)
-                     (statuses_count . 101)
-                     (note . "E"))
-            (media_attachments . [])
-            (mentions . [])
-            (tags . [])
-            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
-            (url . "https://example.space/users/acct42/updates/123456789")
-            (content . "<p>Just some text</p>")
-            (reblogs_count . 0)
-            (favourites_count . 0)
-            (reblog))))
-
-(defconst mastodon-notifications--test-base-followed
-  '((id . "1234")
-    (type . "follow")
-    (created_at . "2018-03-06T04:27:21.288Z" )
-    (account (id . 42)
-             (username . "acct42")
-             (acct . "acct42@example.space")
-             (display_name . "Account 42")
-             (locked . :json-false)
-             (created_at . "2017-04-01T00:00:00.000Z")
-             (followers_count . 99)
-             (following_count . 13)
-             (statuses_count . 101)
-             (note . "E"))
-    (status (id . 61208)
-            (created_at . "2017-04-24T19:01:02.000Z")
-            (in_reply_to_id)
-            (in_reply_to_account_id)
-            (sensitive . :json-false)
-            (spoiler_text . "")
-            (visibility . "public")
-            (account (id . 42)
-                     (username . "acct42")
-                     (acct . "acct42@example.space")
-                     (display_name . "Account 42")
-                     (locked . :json-false)
-                     (created_at . "2017-04-01T00:00:00.000Z")
-                     (followers_count . 99)
-                     (following_count . 13)
-                     (statuses_count . 101)
-                     (note . "E"))
-            (media_attachments . [])
-            (mentions . [])
-            (tags . [])
-            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
-            (url . "https://example.space/users/acct42/updates/123456789")
-            (content . "<p>Just some text</p>")
-            (reblogs_count . 0)
-            (favourites_count . 0)
-            (reblog))))
-
-(defconst mastodon-notifications--test-base-favourite
-  '((id . "1234")
-    (type . "mention")
-    (created_at . "2018-03-06T04:27:21.288Z" )
-    (account (id . 42)
-             (username . "acct42")
-             (acct . "acct42@example.space")
-             (display_name . "Account 42")
-             (locked . :json-false)
-             (created_at . "2017-04-01T00:00:00.000Z")
-             (followers_count . 99)
-             (following_count . 13)
-             (statuses_count . 101)
-             (note . "E"))))
-
-(ert-deftest mastodon-notifications--notification-get ()
-  "Ensure get request format for notifictions is accurate."
-  (let ((mastodon-instance-url "https://instance.url"))
-    (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
-      (mastodon-notifications--get))))
-
-(defun mastodon-notifications--test-type (fun sample)
-  "Test notification draw functions.
-
-FUN is the notificiation function to be called and SAMPLE is the
-notification to be tested."
-  (let ((mastodon-tl--show-avatars-p nil)
-        (timestamp (cdr (assoc 'created_at  sample))))
-    (with-temp-buffer (funcall fun sample)
-                      (buffer-substring-no-properties (point-min) (point-max)))))
-
-(ert-deftest mastodon-notifications--test-byline-concat ()
-  "Ensure proper suffix is appended to action."
-  (should (and
-           (string= " Mentioned you"
-                    (mastodon-notifications--byline-concat "Mentioned"))
-           (string= " Followed you"
-                    (mastodon-notifications--byline-concat "Followed"))
-           (string= " Favourited your status from"
-                    (mastodon-notifications--byline-concat "Favourited"))
-           (string= " Boosted your status from"
-                    (mastodon-notifications--byline-concat "Boosted"))
-           (string= " Posted a post"
-                    (mastodon-notifications--byline-concat "Posted")))))
-
-
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
new file mode 100644
index 0000000..f5cc4c5
--- /dev/null
+++ b/test/mastodon-notifications-tests.el
@@ -0,0 +1,217 @@
+;;; mastodon-notifications-tests.el --- Tests for mastodon-notifications.el  -*- lexical-binding: nil -*-
+
+(require 'cl-lib)
+(require 'cl-macs)
+(require 'el-mock)
+
+(defconst mastodon-notifications--test-base-mentioned
+  '((id . "1234")
+    (type . "mention")
+    (created_at . "2018-03-06T04:27:21.288Z" )
+    (account (id . 42)
+             (username . "acct42")
+             (acct . "acct42@example.space")
+             (display_name . "Account 42")
+             (locked . :json-false)
+             (created_at . "2017-04-01T00:00:00.000Z")
+             (followers_count . 99)
+             (following_count . 13)
+             (statuses_count . 101)
+             (note . "E"))
+    (status (id . 61208)
+            (created_at . "2017-04-24T19:01:02.000Z")
+            (in_reply_to_id)
+            (in_reply_to_account_id)
+            (sensitive . :json-false)
+            (spoiler_text . "")
+            (visibility . "public")
+            (account (id . 42)
+                     (username . "acct42")
+                     (acct . "acct42@example.space")
+                     (display_name . "Account 42")
+                     (locked . :json-false)
+                     (created_at . "2017-04-01T00:00:00.000Z")
+                     (followers_count . 99)
+                     (following_count . 13)
+                     (statuses_count . 101)
+                     (note . "E"))
+            (media_attachments . [])
+            (mentions . [])
+            (tags . [])
+            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
+            (url . "https://example.space/users/acct42/updates/123456789")
+            (content . "<p>Just some text</p>")
+            (reblogs_count . 0)
+            (favourites_count . 0)
+            (reblog))))
+
+(defconst mastodon-notifications--test-base-favourite
+  '((id . "1234")
+    (type . "favourite")
+    (created_at . "2018-03-06T04:27:21.288Z" )
+    (account (id . 42)
+             (username . "acct42")
+             (acct . "acct42@example.space")
+             (display_name . "Account 42")
+             (locked . :json-false)
+             (created_at . "2017-04-01T00:00:00.000Z")
+             (followers_count . 99)
+             (following_count . 13)
+             (statuses_count . 101)
+             (note . "E"))
+    (status (id . 61208)
+            (created_at . "2017-04-24T19:01:02.000Z")
+            (in_reply_to_id)
+            (in_reply_to_account_id)
+            (sensitive . :json-false)
+            (spoiler_text . "")
+            (visibility . "public")
+            (account (id . 42)
+                     (username . "acct42")
+                     (acct . "acct42@example.space")
+                     (display_name . "Account 42")
+                     (locked . :json-false)
+                     (created_at . "2017-04-01T00:00:00.000Z")
+                     (followers_count . 99)
+                     (following_count . 13)
+                     (statuses_count . 101)
+                     (note . "E"))
+            (media_attachments . [])
+            (mentions . [])
+            (tags . [])
+            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
+            (url . "https://example.space/users/acct42/updates/123456789")
+            (content . "<p>Just some text</p>")
+            (reblogs_count . 0)
+            (favourites_count . 0)
+            (reblog))))
+
+(defconst mastodon-notifications--test-base-boosted
+  '((id . "1234")
+    (type . "reblog")
+    (created_at . "2018-03-06T04:27:21.288Z" )
+    (account (id . 42)
+             (username . "acct42")
+             (acct . "acct42@example.space")
+             (display_name . "Account 42")
+             (locked . :json-false)
+             (created_at . "2017-04-01T00:00:00.000Z")
+             (followers_count . 99)
+             (following_count . 13)
+             (statuses_count . 101)
+             (note . "E"))
+    (status (id . 61208)
+            (created_at . "2017-04-24T19:01:02.000Z")
+            (in_reply_to_id)
+            (in_reply_to_account_id)
+            (sensitive . :json-false)
+            (spoiler_text . "")
+            (visibility . "public")
+            (account (id . 42)
+                     (username . "acct42")
+                     (acct . "acct42@example.space")
+                     (display_name . "Account 42")
+                     (locked . :json-false)
+                     (created_at . "2017-04-01T00:00:00.000Z")
+                     (followers_count . 99)
+                     (following_count . 13)
+                     (statuses_count . 101)
+                     (note . "E"))
+            (media_attachments . [])
+            (mentions . [])
+            (tags . [])
+            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
+            (url . "https://example.space/users/acct42/updates/123456789")
+            (content . "<p>Just some text</p>")
+            (reblogs_count . 0)
+            (favourites_count . 0)
+            (reblog))))
+
+(defconst mastodon-notifications--test-base-followed
+  '((id . "1234")
+    (type . "follow")
+    (created_at . "2018-03-06T04:27:21.288Z" )
+    (account (id . 42)
+             (username . "acct42")
+             (acct . "acct42@example.space")
+             (display_name . "Account 42")
+             (locked . :json-false)
+             (created_at . "2017-04-01T00:00:00.000Z")
+             (followers_count . 99)
+             (following_count . 13)
+             (statuses_count . 101)
+             (note . "E"))
+    (status (id . 61208)
+            (created_at . "2017-04-24T19:01:02.000Z")
+            (in_reply_to_id)
+            (in_reply_to_account_id)
+            (sensitive . :json-false)
+            (spoiler_text . "")
+            (visibility . "public")
+            (account (id . 42)
+                     (username . "acct42")
+                     (acct . "acct42@example.space")
+                     (display_name . "Account 42")
+                     (locked . :json-false)
+                     (created_at . "2017-04-01T00:00:00.000Z")
+                     (followers_count . 99)
+                     (following_count . 13)
+                     (statuses_count . 101)
+                     (note . "E"))
+            (media_attachments . [])
+            (mentions . [])
+            (tags . [])
+            (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
+            (url . "https://example.space/users/acct42/updates/123456789")
+            (content . "<p>Just some text</p>")
+            (reblogs_count . 0)
+            (favourites_count . 0)
+            (reblog))))
+
+(defconst mastodon-notifications--test-base-favourite
+  '((id . "1234")
+    (type . "mention")
+    (created_at . "2018-03-06T04:27:21.288Z" )
+    (account (id . 42)
+             (username . "acct42")
+             (acct . "acct42@example.space")
+             (display_name . "Account 42")
+             (locked . :json-false)
+             (created_at . "2017-04-01T00:00:00.000Z")
+             (followers_count . 99)
+             (following_count . 13)
+             (statuses_count . 101)
+             (note . "E"))))
+
+(ert-deftest mastodon-notifications--notification-get ()
+  "Ensure get request format for notifictions is accurate."
+  (let ((mastodon-instance-url "https://instance.url"))
+    (with-mock
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
+      (mastodon-notifications--get))))
+
+(defun mastodon-notifications--test-type (fun sample)
+  "Test notification draw functions.
+
+FUN is the notificiation function to be called and SAMPLE is the
+notification to be tested."
+  (let ((mastodon-tl--show-avatars-p nil)
+        (timestamp (cdr (assoc 'created_at  sample))))
+    (with-temp-buffer (funcall fun sample)
+                      (buffer-substring-no-properties (point-min) (point-max)))))
+
+(ert-deftest mastodon-notifications--test-byline-concat ()
+  "Ensure proper suffix is appended to action."
+  (should (and
+           (string= " Mentioned you"
+                    (mastodon-notifications--byline-concat "Mentioned"))
+           (string= " Followed you"
+                    (mastodon-notifications--byline-concat "Followed"))
+           (string= " Favourited your status from"
+                    (mastodon-notifications--byline-concat "Favourited"))
+           (string= " Boosted your status from"
+                    (mastodon-notifications--byline-concat "Boosted"))
+           (string= " Posted a post"
+                    (mastodon-notifications--byline-concat "Posted")))))
+
+
-- 
cgit v1.2.3