tests: Move gitlab and github api tests into api tests module (5bdd61ea) · Commits · Research Enablement / ACORN

acorn-lib/src/io/api/github.rs

+2 −57

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ pub(crate) async fn tree_paths(host: impl Into<String>, path: impl Into<String>,
		}
		Ok(all_paths)
		}
		fn collect_tree(entries: Vec<TreeEntry>, prefix: &str) -> (Vec<String>, Vec<(String, String)>) {
		pub(crate) fn collect_tree(entries: Vec<TreeEntry>, prefix: &str) -> (Vec<String>, Vec<(String, String)>) {
		entries.into_iter().fold((vec![], vec![]), \|(mut paths, mut pending), entry\| {
		let is_blob = entry.is_blob();
		let TreeEntry { path, sha, .. } = entry;
		@@ -134,65 +134,10 @@ async fn fetch_tree(endpoint: &Endpoint, path: &str, branch: &str, recursive: bo
		let response = endpoint.invoke("tree", Some(params)).await;
		endpoint.handle::<TreeResponse>(response)
		}
		fn path_for(prefix: &str, path: &str) -> String {
		pub(crate) fn path_for(prefix: &str, path: &str) -> String {
		if prefix.is_empty() {
		path.to_string()
		} else {
		format!("{prefix}/{path}")
		}
		}

		#[cfg(test)]
		mod tests {
		use super::*;

		#[test]
		fn test_template_endpoint_for() {
		let endpoint = Endpoint::from_template("github").map(\|e\| e.with_domain("api.github.com")).unwrap();
		assert_eq!(endpoint.base(), "https://api.github.com");
		assert!(endpoint.resources.iter().any(\|r\| r.name == "tree"));
		}
		#[test]
		fn test_path_for() {
		assert_eq!(path_for("", "README.md"), "README.md");
		assert_eq!(path_for("content", "index.json"), "content/index.json");
		}
		#[test]
		fn test_collect_tree_partitions_paths_and_subtrees() {
		let entries = vec![
		TreeEntry {
		path: "README.md".to_string(),
		mode: "100644".to_string(),
		entry_type: TreeEntryType::Blob,
		sha: "blob-sha".to_string(),
		size: Some(10),
		url: "https://example.invalid/blob".to_string(),
		},
		TreeEntry {
		path: "content".to_string(),
		mode: "040000".to_string(),
		entry_type: TreeEntryType::Tree,
		sha: "tree-sha".to_string(),
		size: None,
		url: "https://example.invalid/tree".to_string(),
		},
		];
		let (paths, pending) = collect_tree(entries, "");
		assert_eq!(paths, vec!["README.md".to_string()]);
		assert_eq!(pending, vec![("tree-sha".to_string(), "content".to_string())]);
		}
		#[test]
		fn test_collect_tree_prefixes_nested_entries() {
		let entries = vec![TreeEntry {
		path: "index.json".to_string(),
		mode: "100644".to_string(),
		entry_type: TreeEntryType::Blob,
		sha: "blob-sha".to_string(),
		size: Some(10),
		url: "https://example.invalid/blob".to_string(),
		}];
		let (paths, pending) = collect_tree(entries, "content");
		assert_eq!(paths, vec!["content/index.json".to_string()]);
		assert!(pending.is_empty());
		}
		}

acorn-lib/src/io/api/gitlab.rs

+0 −39

Original line number	Diff line number	Diff line
		@@ -892,42 +892,3 @@ pub(crate) async fn tree_paths(
		\| Err(why) => Err(why),
		}
		}
		#[cfg(test)]
		mod tests {
		use super::*;
		use crate::io::api::IntoBody;
		use core::iter::FromIterator;

		#[test]
		fn test_add_comment_payload_uses_body_field() {
		let payload = vec![param!(Body, "body", "This is a test comment!!!")].into_body();
		assert_eq!(payload, serde_json::json!({ "body": "This is a test comment!!!" }));
		}
		#[test]
		fn test_programming_languages_response_parse_filters_programming_only() {
		let data = HashMap::from_iter([
		(
		"Python".to_string(),
		ProgrammingLanguageDetails {
		language_id: Some(303),
		language_type: Some("programming".to_string()),
		color: Some("#3572A5".to_string()),
		group: None,
		},
		),
		(
		"YAML".to_string(),
		ProgrammingLanguageDetails {
		language_id: Some(407),
		language_type: Some("data".to_string()),
		color: Some("#cb171e".to_string()),
		group: None,
		},
		),
		]);
		let response = ProgrammingLanguagesResponse::parse(data);
		assert_eq!(response.languages.len(), 1);
		assert_eq!(response.languages[0].name, "Python");
		assert_eq!(response.languages[0].language_id, Some(303));
		}
		}

acorn-lib/src/io/api/tests/mod.rs

+91 −2

Original line number	Diff line number	Diff line
		use crate::io::api::citeas::{self, ToCitations};
		use crate::io::api::{
		self, extract_template_keys, orcid, ror, Endpoint, Param, ParamStyle, RemoteResource, Resource, ResponseContent, INCLUDED_ENDPOINTS,
		self, extract_template_keys, orcid, ror, Endpoint, IntoBody, Param, ParamStyle, RemoteResource, Resource, ResponseContent, INCLUDED_ENDPOINTS,
		};
		use crate::io::read_file;
		use crate::param;
		use crate::prelude::HashMap;
		use crate::schema::pid::{PersistentIdentifierParse, DOI};
		use crate::util::Searchable;
		use crate::{Location, Repository, Scheme};
		@@ -181,6 +182,11 @@ fn test_extract_template_keys() {
		assert_eq!(keys, expected);
		}
		#[test]
		fn test_into_body() {
		let payload = vec![param!(Body, "body", "This is a test comment!!!")].into_body();
		assert_eq!(payload, serde_json::json!({ "body": "This is a test comment!!!" }));
		}
		#[test]
		fn test_query_params_empty_field() {
		let params = vec![
		Param::of_type(api::ParamStyle::FieldList)
		@@ -200,9 +206,65 @@ fn test_ror_search_response() {
		insta::assert_snapshot!(format!("{:#?}", response));
		}
		#[cfg(test)]
		mod github_api {
		use super::*;
		use crate::io::api::github::{collect_tree, path_for, TreeEntry};
		use crate::io::api::TreeEntryType;

		#[test]
		fn test_template_endpoint_for() {
		let endpoint = Endpoint::from_template("github").map(\|e\| e.with_domain("api.github.com")).unwrap();
		assert_eq!(endpoint.base(), "https://api.github.com");
		assert!(endpoint.resources.iter().any(\|r\| r.name == "tree"));
		}
		#[test]
		fn test_path_for() {
		assert_eq!(path_for("", "README.md"), "README.md");
		assert_eq!(path_for("content", "index.json"), "content/index.json");
		}
		#[test]
		fn test_collect_tree_partitions_paths_and_subtrees() {
		let entries = vec![
		TreeEntry {
		path: "README.md".to_string(),
		mode: "100644".to_string(),
		entry_type: TreeEntryType::Blob,
		sha: "blob-sha".to_string(),
		size: Some(10),
		url: "https://example.invalid/blob".to_string(),
		},
		TreeEntry {
		path: "content".to_string(),
		mode: "040000".to_string(),
		entry_type: TreeEntryType::Tree,
		sha: "tree-sha".to_string(),
		size: None,
		url: "https://example.invalid/tree".to_string(),
		},
		];
		let (paths, pending) = collect_tree(entries, "");
		assert_eq!(paths, vec!["README.md".to_string()]);
		assert_eq!(pending, vec![("tree-sha".to_string(), "content".to_string())]);
		}
		#[test]
		fn test_collect_tree_prefixes_nested_entries() {
		let entries = vec![TreeEntry {
		path: "index.json".to_string(),
		mode: "100644".to_string(),
		entry_type: TreeEntryType::Blob,
		sha: "blob-sha".to_string(),
		size: Some(10),
		url: "https://example.invalid/blob".to_string(),
		}];
		let (paths, pending) = collect_tree(entries, "content");
		assert_eq!(paths, vec!["content/index.json".to_string()]);
		assert!(pending.is_empty());
		}
		}
		#[cfg(test)]
		mod gitlab_api {
		use super::*;
		use crate::io::api::gitlab::PaginationField;
		use crate::io::api::gitlab::{PaginationField, ProgrammingLanguageDetails, ProgrammingLanguagesResponse};

		#[test]
		fn test_query_string() {
		@@ -231,6 +293,33 @@ mod gitlab_api {
		let query = Param::to_query_string::<PaginationField, api::EmptyField>(params);
		assert!(query.is_empty());
		}
		#[test]
		fn test_programming_languages_response_parse_filters_programming_only() {
		let data = HashMap::from_iter([
		(
		"Python".to_string(),
		ProgrammingLanguageDetails {
		language_id: Some(303),
		language_type: Some("programming".to_string()),
		color: Some("#3572A5".to_string()),
		group: None,
		},
		),
		(
		"YAML".to_string(),
		ProgrammingLanguageDetails {
		language_id: Some(407),
		language_type: Some("data".to_string()),
		color: Some("#cb171e".to_string()),
		group: None,
		},
		),
		]);
		let response = ProgrammingLanguagesResponse::parse(data);
		assert_eq!(response.languages.len(), 1);
		assert_eq!(response.languages[0].name, "Python");
		assert_eq!(response.languages[0].language_id, Some(303));
		}
		}
		#[cfg(test)]
		mod orcid_api {