revise test

2bndy5 · 2bndy5 · commit 29f72499b7ff · 2024-09-13T18:19:46.000-07:00
diff --git a/cpp-linter-lib/tests/reviews.rs b/cpp-linter-lib/tests/reviews.rs
@@ -22,21 +22,39 @@ async fn mock_server() -> ServerGuard {
     Server::new_async().await
 }
 
-async fn setup(
-    lib_root: &Path,
-    lines_changed_only: &str,
-    tidy_review: bool,
-    format_review: bool,
-    passive_reviews: bool,
-    no_lgtm: bool,
-    summary_only: bool,
-) {
+struct TestParams {
+    pub lines_changed_only: String,
+    pub tidy_review: bool,
+    pub format_review: bool,
+    pub passive_reviews: bool,
+    pub no_lgtm: bool,
+    pub summary_only: bool,
+    pub pr_state: String,
+    pub pr_draft: bool,
+}
+
+impl Default for TestParams {
+    fn default() -> Self {
+        Self {
+            lines_changed_only: "true".to_string(),
+            tidy_review: true,
+            format_review: true,
+            passive_reviews: Default::default(),
+            no_lgtm: true,
+            summary_only: Default::default(),
+            pr_state: "open".to_string(),
+            pr_draft: Default::default(),
+        }
+    }
+}
+
+async fn setup(lib_root: &Path, test_params: &TestParams) {
     env::set_var("GITHUB_EVENT_NAME", "pull_request");
     env::set_var("GITHUB_REPOSITORY", REPO);
     env::set_var("GITHUB_SHA", SHA);
     env::set_var("GITHUB_TOKEN", TOKEN);
     env::set_var("CI", "true");
-    if summary_only {
+    if test_params.summary_only {
         env::set_var("CPP_LINTER_PR_REVIEW_SUMMARY_ONLY", "true");
     }
     let mut event_payload_path = NamedTempFile::new().unwrap();
@@ -45,7 +63,8 @@ async fn setup(
         .expect("Failed to create mock event payload.");
     env::set_var("GITHUB_EVENT_PATH", event_payload_path.path());
     let reset_timestamp = (Utc::now().timestamp() + 60).to_string();
-    let is_lgtm = !no_lgtm || ((false, false) == (tidy_review, format_review));
+    let is_lgtm = !test_params.no_lgtm
+        || ((false, false) == (test_params.tidy_review, test_params.format_review));
     let asset_path = format!("{}/{MOCK_ASSETS_PATH}", lib_root.to_str().unwrap());
 
     let mut server = mock_server().await;
@@ -64,7 +83,9 @@ async fn setup(
         .mock("GET", pr_endpoint.as_str())
         .match_header("Accept", "application/vnd.github.raw+json")
         .match_header("Authorization", TOKEN)
-        .with_body_from_file(format!("{asset_path}pr_{PR}.json"))
+        .with_body(
+            json!({"state": test_params.pr_state, "draft": test_params.pr_draft}).to_string(),
+        )
         .with_header(REMAINING_RATE_LIMIT_HEADER, "50")
         .with_header(RESET_RATE_LIMIT_HEADER, reset_timestamp.as_str())
         .create();
@@ -89,7 +110,7 @@ async fn setup(
         .with_header(RESET_RATE_LIMIT_HEADER, reset_timestamp.as_str())
         .create();
 
-    let review_reaction = if passive_reviews {
+    let review_reaction = if test_params.passive_reviews {
         "COMMENT"
     } else if is_lgtm {
         "APPROVE"
@@ -108,7 +129,8 @@ async fn setup(
         .create();
 
     let mut tool_ignore = "**.c".to_string();
-    if !no_lgtm || (false, true) == (tidy_review, format_review) {
+    if !test_params.no_lgtm || (false, true) == (test_params.tidy_review, test_params.format_review)
+    {
         // force a LGTM condition by skipping analysis on all files
         tool_ignore.push('|');
         tool_ignore.push_str("src");
@@ -117,15 +139,15 @@ async fn setup(
         "cpp-linter".to_string(),
         "-v=debug".to_string(),
         format!("-V={}", env::var("CLANG_VERSION").unwrap_or("".to_string())),
-        format!("-l={lines_changed_only}"),
+        format!("-l={}", test_params.lines_changed_only),
         format!("--ignore-tidy={}", tool_ignore),
         format!("--ignore-format={}", tool_ignore),
         // "--tidy-checks=".to_string(), // use .clang-tidy file
         "--style=file".to_string(), // use .clang-format file
-        format!("--tidy-review={tidy_review}"),
-        format!("--format-review={format_review}"),
-        format!("--passive-reviews={passive_reviews}"),
-        format!("--no-lgtm={no_lgtm}"),
+        format!("--tidy-review={}", test_params.tidy_review),
+        format!("--format-review={}", test_params.format_review),
+        format!("--passive-reviews={}", test_params.passive_reviews),
+        format!("--no-lgtm={}", test_params.no_lgtm),
         "-p=build".to_string(),
         "-i=build".to_string(),
     ];
@@ -136,131 +158,103 @@ async fn setup(
     assert_eq!(result, 0);
 }
 
-async fn test_review(
-    lines_changed_only: &str,
-    tidy_review: bool,
-    format_review: bool,
-    passive_reviews: bool,
-    no_lgtm: bool,
-    summary_only: bool,
-) {
+async fn test_review(test_params: &TestParams) {
     let tmp_dir = create_test_space();
     let lib_root = env::current_dir().unwrap();
     env::set_current_dir(tmp_dir.path()).unwrap();
-    setup(
-        &lib_root,
-        lines_changed_only,
-        tidy_review,
-        format_review,
-        passive_reviews,
-        no_lgtm,
-        summary_only,
-    )
-    .await;
+    setup(&lib_root, &test_params).await;
     env::set_current_dir(lib_root.as_path()).unwrap();
     drop(tmp_dir);
 }
 
 #[tokio::test]
 async fn all_lines() {
-    test_review(
-        "false", // lines_changed_only
-        true,    // tidy-review
-        true,    // format-review
-        false,   // passive-reviews
-        true,    // no_lgtm
-        false,   // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn changed_lines() {
-    test_review(
-        "true", // lines_changed_only
-        true,   // tidy-review
-        true,   // format-review
-        false,  // passive-reviews
-        true,   // no_lgtm
-        false,  // summary_only
-    )
-    .await;
+    test_review(&TestParams::default()).await;
 }
 
 #[tokio::test]
 async fn all_lines_passive() {
-    test_review(
-        "false", // lines_changed_only
-        true,    // tidy-review
-        true,    // format-review
-        true,    // passive-reviews
-        true,    // no_lgtm
-        false,   // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        passive_reviews: true,
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn changed_lines_passive() {
-    test_review(
-        "true", // lines_changed_only
-        true,   // tidy-review
-        true,   // format-review
-        true,   // passive-reviews
-        true,   // no_lgtm
-        false,  // summary_only
-    )
+    test_review(&TestParams {
+        passive_reviews: true,
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn summary_only() {
-    test_review(
-        "false", // lines_changed_only
-        true,    // tidy-review
-        true,    // format-review
-        false,   // passive-reviews
-        true,    // no_lgtm
-        true,    // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        summary_only: true,
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn lgtm() {
-    test_review(
-        "false", // lines_changed_only
-        true,    // tidy-review
-        true,    // format-review
-        false,   // passive-reviews
-        false,   // no_lgtm
-        false,   // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        no_lgtm: false,
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn lgtm_passive() {
-    test_review(
-        "false", // lines_changed_only
-        true,    // tidy-review
-        true,    // format-review
-        true,    // passive-reviews
-        false,   // no_lgtm
-        false,   // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        no_lgtm: false,
+        passive_reviews: true,
+        ..Default::default()
+    })
     .await;
 }
 
 #[tokio::test]
 async fn no_lgtm() {
-    test_review(
-        "false", // lines_changed_only
-        false,   // tidy-review
-        true,    // format-review
-        false,   // passive-reviews
-        true,    // no_lgtm
-        false,   // summary_only
-    )
+    test_review(&TestParams {
+        lines_changed_only: "false".to_string(),
+        tidy_review: false,
+        ..Default::default()
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn is_draft() {
+    test_review(&TestParams {
+        pr_draft: true,
+        ..Default::default()
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn is_closed() {
+    test_review(&TestParams {
+        pr_state: "closed".to_string(),
+        ..Default::default()
+    })
     .await;
 }
