Reorganize apub protocol tests

crates/apub/assets/mastodon/activities/create_note.json

@@ -1,4 +1,11 @@
 {
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "ostatus": "http://ostatus.org#",
+      "atomUri": "ostatus:atomUri"
+    }
+  ],
   "id": "https://mastodon.madrid/users/felix/statuses/107224289116410645/activity",
   "type": "Create",
   "actor": "https://mastodon.madrid/users/felix",

crates/apub/assets/mastodon/activities/follow.json

@@ -0,0 +1,7 @@
+{
+  "@context": "https://www.w3.org/ns/activitystreams",
+  "id": "https://masto.asonix.dog/1ea87517-63c5-4118-8831-460ee641b2cf",
+  "type": "Follow",
+  "actor": "https://masto.asonix.dog/users/asonix",
+  "object": "https://ds9.lemmy.ml/c/testcom"
+}

crates/apub/assets/mastodon/activities/undo_follow.json

@@ -0,0 +1,13 @@
+{
+  "@context": "https://www.w3.org/ns/activitystreams",
+  "id": "https://masto.asonix.dog/users/asonix#follows/449/undo",
+  "type": "Undo",
+  "actor": "https://masto.asonix.dog/users/asonix",
+  "object": {
+    "id": "https://masto.asonix.dog/1ea87517-63c5-4118-8831-460ee641b2cf",
+    "type": "Follow",
+    "actor": "https://masto.asonix.dog/users/asonix",
+    "object": "https://ds9.lemmy.ml/c/testcom"
+  }
+}
+

crates/apub/assets/smithereen/objects/note.json

@@ -28,5 +28,11 @@
     }
   },
   "sensitive": false,
-  "likes": "https://friends.grishka.me/posts/66561/likes"
+  "likes": "https://friends.grishka.me/posts/66561/likes",
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "sensitive": "as:sensitive"
+    }
+  ]
 }

crates/apub/src/collections/community_moderators.rs

@@ -138,10 +138,13 @@ impl ApubObject for ApubCommunityModerators {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::objects::{
+  use crate::{
-    community::tests::parse_lemmy_community,
+    objects::{
-    person::tests::parse_lemmy_person,
+      community::tests::parse_lemmy_community,
-    tests::{file_to_json_object, init_context},
+      person::tests::parse_lemmy_person,
+      tests::init_context,
+    },
+    protocol::tests::file_to_json_object,
   };
   use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::{

crates/apub/src/objects/comment.rs

@@ -208,12 +208,15 @@ impl ApubObject for ApubComment {
 #[cfg(test)]
 pub(crate) mod tests {
   use super::*;
-  use crate::objects::{
+  use crate::{
-    community::{tests::parse_lemmy_community, ApubCommunity},
+    objects::{
-    instance::ApubSite,
+      community::{tests::parse_lemmy_community, ApubCommunity},
-    person::{tests::parse_lemmy_person, ApubPerson},
+      instance::ApubSite,
-    post::ApubPost,
+      person::{tests::parse_lemmy_person, ApubPerson},
-    tests::{file_to_json_object, init_context},
+      post::ApubPost,
+      tests::init_context,
+    },
+    protocol::tests::file_to_json_object,
   };
   use assert_json_diff::assert_json_include;
   use lemmy_apub_lib::activity_queue::create_activity_queue;

crates/apub/src/objects/community.rs

@@ -214,9 +214,9 @@ impl ApubCommunity {
 #[cfg(test)]
 pub(crate) mod tests {
   use super::*;
-  use crate::objects::{
+  use crate::{
-    instance::tests::parse_lemmy_instance,
+    objects::{instance::tests::parse_lemmy_instance, tests::init_context},
-    tests::{file_to_json_object, init_context},
+    protocol::tests::file_to_json_object,
   };
   use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::{source::site::Site, traits::Crud};

crates/apub/src/objects/instance.rs

@@ -186,7 +186,7 @@ pub(in crate::objects) async fn fetch_instance_actor_for_object(
 #[cfg(test)]
 pub(crate) mod tests {
   use super::*;
-  use crate::objects::tests::{file_to_json_object, init_context};
+  use crate::{objects::tests::init_context, protocol::tests::file_to_json_object};
   use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::traits::Crud;
   use serial_test::serial;

crates/apub/src/objects/mod.rs

@@ -41,8 +41,7 @@ pub(crate) mod tests {
   use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
   use reqwest::Client;
   use reqwest_middleware::ClientBuilder;
-  use serde::de::DeserializeOwned;
+  use std::sync::Arc;
-  use std::{fs::File, io::BufReader, sync::Arc};
   use tokio::sync::Mutex;
 
   // TODO: would be nice if we didnt have to use a full context for tests.
@@ -90,10 +89,4 @@ pub(crate) mod tests {
     .start();
     LemmyContext::create(pool, chat_server, client, activity_queue, settings, secret)
   }
-
-  pub(crate) fn file_to_json_object<T: DeserializeOwned>(path: &str) -> Result<T, LemmyError> {
-    let file = File::open(path)?;
-    let reader = BufReader::new(file);
-    Ok(serde_json::from_reader(reader)?)
-  }
 }

crates/apub/src/objects/person.rs

@@ -204,9 +204,9 @@ pub(crate) mod tests {
   use crate::{
     objects::{
       instance::{tests::parse_lemmy_instance, ApubSite},
-      tests::{file_to_json_object, init_context},
+      tests::init_context,
     },
-    protocol::objects::instance::Instance,
+    protocol::{objects::instance::Instance, tests::file_to_json_object},
   };
   use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::{source::site::Site, traits::Crud};

crates/apub/src/objects/post.rs

@@ -207,11 +207,14 @@ impl ApubObject for ApubPost {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::objects::{
+  use crate::{
-    community::tests::parse_lemmy_community,
+    objects::{
-    person::tests::parse_lemmy_person,
+      community::tests::parse_lemmy_community,
-    post::ApubPost,
+      person::tests::parse_lemmy_person,
-    tests::{file_to_json_object, init_context},
+      post::ApubPost,
+      tests::init_context,
+    },
+    protocol::tests::file_to_json_object,
   };
   use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::source::site::Site;

crates/apub/src/objects/private_message.rs

@@ -159,9 +159,9 @@ impl ApubObject for ApubPrivateMessage {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::objects::{
+  use crate::{
-    person::ApubPerson,
+    objects::{person::ApubPerson, tests::init_context},
-    tests::{file_to_json_object, init_context},
+    protocol::tests::file_to_json_object,
   };
   use assert_json_diff::assert_json_include;
   use lemmy_apub_lib::activity_queue::create_activity_queue;

crates/apub/src/protocol/activities/block/mod.rs

@@ -8,8 +8,8 @@ mod tests {
     tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_lemmy_block() {
+  fn test_parse_lemmy_block() {
     test_parse_lemmy_item::<BlockUser>("assets/lemmy/activities/block/block_user.json").unwrap();
     test_parse_lemmy_item::<UndoBlockUser>("assets/lemmy/activities/block/undo_block_user.json")
       .unwrap();

crates/apub/src/protocol/activities/community/mod.rs

@@ -17,8 +17,8 @@ mod tests {
     tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_lemmy_community() {
+  fn test_parse_lemmy_community_activities() {
     test_parse_lemmy_item::<AnnounceActivity>(
       "assets/lemmy/activities/community/announce_create_page.json",
     )

crates/apub/src/protocol/activities/create_or_update/mod.rs

@@ -4,21 +4,17 @@ pub mod private_message;
 
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::protocol::{
-    context::WithContext,
+    activities::create_or_update::{
-    objects::tests::file_to_json_object,
+      comment::CreateOrUpdateComment,
-    protocol::{
+      post::CreateOrUpdatePost,
-      activities::create_or_update::{
+      private_message::CreateOrUpdatePrivateMessage,
-        comment::CreateOrUpdateComment,
-        post::CreateOrUpdatePost,
-        private_message::CreateOrUpdatePrivateMessage,
-      },
-      tests::test_parse_lemmy_item,
     },
+    tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_create_or_update() {
+  fn test_parse_lemmy_create_or_update() {
     test_parse_lemmy_item::<CreateOrUpdatePost>(
       "assets/lemmy/activities/create_or_update/create_page.json",
     )
@@ -35,23 +31,5 @@ mod tests {
       "assets/lemmy/activities/create_or_update/create_private_message.json",
     )
     .unwrap();
-
-    file_to_json_object::<WithContext<CreateOrUpdateComment>>(
-      "assets/pleroma/activities/create_note.json",
-    )
-    .unwrap();
-    file_to_json_object::<WithContext<CreateOrUpdateComment>>(
-      "assets/smithereen/activities/create_note.json",
-    )
-    .unwrap();
-    file_to_json_object::<CreateOrUpdateComment>("assets/mastodon/activities/create_note.json")
-      .unwrap();
-
-    file_to_json_object::<CreateOrUpdatePost>("assets/lotide/activities/create_page.json").unwrap();
-    file_to_json_object::<CreateOrUpdateComment>("assets/lotide/activities/create_note_reply.json")
-      .unwrap();
-
-    file_to_json_object::<CreateOrUpdateComment>("assets/friendica/activities/create_note.json")
-      .unwrap();
   }
 }

crates/apub/src/protocol/activities/deletion/mod.rs

@@ -3,17 +3,13 @@ pub mod undo_delete;
 
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::protocol::{
-    context::WithContext,
+    activities::deletion::{delete::Delete, undo_delete::UndoDelete},
-    objects::tests::file_to_json_object,
+    tests::test_parse_lemmy_item,
-    protocol::{
-      activities::deletion::{delete::Delete, undo_delete::UndoDelete},
-      tests::test_parse_lemmy_item,
-    },
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_deletion() {
+  fn test_parse_lemmy_deletion() {
     test_parse_lemmy_item::<Delete>("assets/lemmy/activities/deletion/remove_note.json").unwrap();
     test_parse_lemmy_item::<Delete>("assets/lemmy/activities/deletion/delete_page.json").unwrap();
 
@@ -27,8 +23,5 @@ mod tests {
       "assets/lemmy/activities/deletion/undo_delete_private_message.json",
     )
     .unwrap();
-
-    file_to_json_object::<WithContext<Delete>>("assets/pleroma/activities/delete.json").unwrap();
-    file_to_json_object::<WithContext<Delete>>("assets/mastodon/activities/delete.json").unwrap();
   }
 }

crates/apub/src/protocol/activities/following/mod.rs

@@ -4,21 +4,17 @@ pub mod undo_follow;
 
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::protocol::{
-    context::WithContext,
+    activities::following::{
-    objects::tests::file_to_json_object,
+      accept::AcceptFollowCommunity,
-    protocol::{
+      follow::FollowCommunity,
-      activities::following::{
+      undo_follow::UndoFollowCommunity,
-        accept::AcceptFollowCommunity,
-        follow::FollowCommunity,
-        undo_follow::UndoFollowCommunity,
-      },
-      tests::test_parse_lemmy_item,
     },
+    tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_lemmy_accept_follow() {
+  fn test_parse_lemmy_accept_follow() {
     test_parse_lemmy_item::<FollowCommunity>("assets/lemmy/activities/following/follow.json")
       .unwrap();
     test_parse_lemmy_item::<AcceptFollowCommunity>("assets/lemmy/activities/following/accept.json")
@@ -27,8 +23,5 @@ mod tests {
       "assets/lemmy/activities/following/undo_follow.json",
     )
     .unwrap();
-
-    file_to_json_object::<WithContext<FollowCommunity>>("assets/pleroma/activities/follow.json")
-      .unwrap();
   }
 }

crates/apub/src/protocol/activities/mod.rs

@@ -13,3 +13,46 @@ pub enum CreateOrUpdateType {
   Create,
   Update,
 }
+
+#[cfg(test)]
+mod tests {
+  use crate::protocol::{
+    activities::{
+      create_or_update::{comment::CreateOrUpdateComment, post::CreateOrUpdatePost},
+      deletion::delete::Delete,
+      following::{follow::FollowCommunity, undo_follow::UndoFollowCommunity},
+    },
+    tests::test_json,
+  };
+
+  #[test]
+  fn test_parse_smithereen_activities() {
+    test_json::<CreateOrUpdateComment>("assets/smithereen/activities/create_note.json").unwrap();
+  }
+
+  #[test]
+  fn test_parse_pleroma_activities() {
+    test_json::<CreateOrUpdateComment>("assets/pleroma/activities/create_note.json").unwrap();
+    test_json::<Delete>("assets/pleroma/activities/delete.json").unwrap();
+    test_json::<FollowCommunity>("assets/pleroma/activities/follow.json").unwrap();
+  }
+
+  #[test]
+  fn test_parse_mastodon_activities() {
+    test_json::<CreateOrUpdateComment>("assets/mastodon/activities/create_note.json").unwrap();
+    test_json::<Delete>("assets/mastodon/activities/delete.json").unwrap();
+    test_json::<FollowCommunity>("assets/mastodon/activities/follow.json").unwrap();
+    test_json::<UndoFollowCommunity>("assets/mastodon/activities/undo_follow.json").unwrap();
+  }
+
+  #[test]
+  fn test_parse_lotide_activities() {
+    test_json::<CreateOrUpdatePost>("assets/lotide/activities/create_page.json").unwrap();
+    test_json::<CreateOrUpdateComment>("assets/lotide/activities/create_note_reply.json").unwrap();
+  }
+
+  #[test]
+  fn test_parse_friendica_activities() {
+    test_json::<CreateOrUpdateComment>("assets/friendica/activities/create_note.json").unwrap();
+  }
+}

crates/apub/src/protocol/activities/voting/mod.rs

@@ -8,8 +8,8 @@ mod tests {
     tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_lemmy_voting() {
+  fn test_parse_lemmy_voting() {
     test_parse_lemmy_item::<Vote>("assets/lemmy/activities/voting/like_note.json").unwrap();
     test_parse_lemmy_item::<Vote>("assets/lemmy/activities/voting/dislike_page.json").unwrap();
 

crates/apub/src/protocol/collections/mod.rs

@@ -15,8 +15,8 @@ mod tests {
     tests::test_parse_lemmy_item,
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_lemmy_collections() {
+  fn test_parse_lemmy_collections() {
     test_parse_lemmy_item::<GroupFollowers>("assets/lemmy/collections/group_followers.json")
       .unwrap();
     let outbox =

crates/apub/src/protocol/mod.rs

@@ -49,11 +49,21 @@ pub struct Unparsed(HashMap<String, serde_json::Value>);
 
 #[cfg(test)]
 pub(crate) mod tests {
-  use crate::objects::tests::file_to_json_object;
+  use crate::context::WithContext;
   use assert_json_diff::assert_json_include;
   use lemmy_utils::LemmyError;
   use serde::{de::DeserializeOwned, Serialize};
-  use std::collections::HashMap;
+  use std::{collections::HashMap, fs::File, io::BufReader};
+
+  pub(crate) fn file_to_json_object<T: DeserializeOwned>(path: &str) -> Result<T, LemmyError> {
+    let file = File::open(path)?;
+    let reader = BufReader::new(file);
+    Ok(serde_json::from_reader(reader)?)
+  }
+
+  pub(crate) fn test_json<T: DeserializeOwned>(path: &str) -> Result<WithContext<T>, LemmyError> {
+    file_to_json_object::<WithContext<T>>(path)
+  }
 
   /// Check that json deserialize -> serialize -> deserialize gives identical file as initial one.
   /// Ensures that there are no breaking changes in sent data.

crates/apub/src/protocol/objects/mod.rs

@@ -17,25 +17,21 @@ pub struct Endpoints {
 
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::protocol::{
-    context::WithContext,
+    objects::{
-    objects::tests::file_to_json_object,
+      chat_message::ChatMessage,
-    protocol::{
+      group::Group,
-      objects::{
+      instance::Instance,
-        chat_message::ChatMessage,
+      note::Note,
-        group::Group,
+      page::Page,
-        instance::Instance,
+      person::Person,
-        note::Note,
+      tombstone::Tombstone,
-        page::Page,
-        person::Person,
-        tombstone::Tombstone,
-      },
-      tests::test_parse_lemmy_item,
     },
+    tests::{test_json, test_parse_lemmy_item},
   };
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_objects_lemmy() {
+  fn test_parse_objects_lemmy() {
     test_parse_lemmy_item::<Instance>("assets/lemmy/objects/instance.json").unwrap();
     test_parse_lemmy_item::<Group>("assets/lemmy/objects/group.json").unwrap();
     test_parse_lemmy_item::<Person>("assets/lemmy/objects/person.json").unwrap();
@@ -45,38 +41,37 @@ mod tests {
     test_parse_lemmy_item::<Tombstone>("assets/lemmy/objects/tombstone.json").unwrap();
   }
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_objects_pleroma() {
+  fn test_parse_objects_pleroma() {
-    file_to_json_object::<WithContext<Person>>("assets/pleroma/objects/person.json").unwrap();
+    test_json::<Person>("assets/pleroma/objects/person.json").unwrap();
-    file_to_json_object::<WithContext<Note>>("assets/pleroma/objects/note.json").unwrap();
+    test_json::<Note>("assets/pleroma/objects/note.json").unwrap();
-    file_to_json_object::<WithContext<ChatMessage>>("assets/pleroma/objects/chat_message.json")
+    test_json::<ChatMessage>("assets/pleroma/objects/chat_message.json").unwrap();
-      .unwrap();
   }
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_objects_smithereen() {
+  fn test_parse_objects_smithereen() {
-    file_to_json_object::<WithContext<Person>>("assets/smithereen/objects/person.json").unwrap();
+    test_json::<Person>("assets/smithereen/objects/person.json").unwrap();
-    file_to_json_object::<Note>("assets/smithereen/objects/note.json").unwrap();
+    test_json::<Note>("assets/smithereen/objects/note.json").unwrap();
   }
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_objects_mastodon() {
+  fn test_parse_objects_mastodon() {
-    file_to_json_object::<WithContext<Person>>("assets/mastodon/objects/person.json").unwrap();
+    test_json::<Person>("assets/mastodon/objects/person.json").unwrap();
-    file_to_json_object::<WithContext<Note>>("assets/mastodon/objects/note.json").unwrap();
+    test_json::<Note>("assets/mastodon/objects/note.json").unwrap();
   }
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_objects_lotide() {
+  fn test_parse_objects_lotide() {
-    file_to_json_object::<WithContext<Group>>("assets/lotide/objects/group.json").unwrap();
+    test_json::<Group>("assets/lotide/objects/group.json").unwrap();
-    file_to_json_object::<WithContext<Person>>("assets/lotide/objects/person.json").unwrap();
+    test_json::<Person>("assets/lotide/objects/person.json").unwrap();
-    file_to_json_object::<WithContext<Note>>("assets/lotide/objects/note.json").unwrap();
+    test_json::<Note>("assets/lotide/objects/note.json").unwrap();
-    file_to_json_object::<WithContext<Page>>("assets/lotide/objects/page.json").unwrap();
+    test_json::<Page>("assets/lotide/objects/page.json").unwrap();
-    file_to_json_object::<WithContext<Tombstone>>("assets/lotide/objects/tombstone.json").unwrap();
+    test_json::<Tombstone>("assets/lotide/objects/tombstone.json").unwrap();
   }
 
-  #[actix_rt::test]
+  #[test]
-  async fn test_parse_object_friendica() {
+  fn test_parse_object_friendica() {
-    file_to_json_object::<WithContext<Person>>("assets/friendica/objects/person.json").unwrap();
+    test_json::<Person>("assets/friendica/objects/person.json").unwrap();
-    file_to_json_object::<WithContext<Note>>("assets/friendica/objects/note.json").unwrap();
+    test_json::<Note>("assets/friendica/objects/note.json").unwrap();
   }
 }