clean up test runner

Author: Boshen

src/case.rs

@@ -1,22 +1,23 @@
 use oxc::span::SourceType;
 
-use std::{
-    fs,
-    path::{Path, PathBuf},
-};
+use std::fs;
 
 use crate::{Diagnostic, Driver, NodeModulesRunner, Source};
 
 pub trait Case {
     fn name(&self) -> &'static str;
 
-    fn save_file(&self, path: &Path, source_type: SourceType) -> Option<PathBuf>;
+    fn run_test(&self, _source_type: SourceType) -> bool {
+        true
+    }
 
     fn test(&self, source: &Source) -> Result<(), Vec<Diagnostic>> {
-        let source_text = self.idempotency_test(source)?;
-        // Write js files for runtime test
-        if let Some(path) = self.save_file(&source.path, source.source_type) {
-            fs::write(path, source_text).unwrap();
+        if self.run_test(source.source_type) {
+            let source_text = self.idempotency_test(source)?;
+            // Write js files for runtime test
+            if source.source_type.is_javascript() {
+                fs::write(&source.path, source_text).unwrap();
+            }
         }
         Ok(())
     }

src/codegen.rs

@@ -1,7 +1,3 @@
-use std::path::{Path, PathBuf};
-
-use oxc::span::SourceType;
-
 use crate::{Case, Driver};
 
 pub struct CodegenRunner;
@@ -11,10 +7,6 @@ impl Case for CodegenRunner {
         "Codegen"
     }
 
-    fn save_file(&self, path: &Path, source_type: SourceType) -> Option<PathBuf> {
-        source_type.is_javascript().then(|| path.to_path_buf())
-    }
-
     fn driver(&self) -> Driver {
         Driver::default()
     }

src/compressor.rs

@@ -1,8 +1,6 @@
-use std::path::{Path, PathBuf};
-
 use oxc::span::SourceType;
 
-use crate::{driver::default_transformer_options, Case, Driver};
+use crate::{Case, Driver};
 
 pub struct CompressorRunner;
 
@@ -11,16 +9,11 @@ impl Case for CompressorRunner {
         "Compressor"
     }
 
-    fn save_file(&self, path: &Path, source_type: SourceType) -> Option<PathBuf> {
-        source_type.is_javascript().then(|| path.to_path_buf())
+    fn run_test(&self, source_type: SourceType) -> bool {
+        source_type.is_javascript() && !source_type.is_jsx()
     }
 
     fn driver(&self) -> Driver {
-        // always compress js files
-        Driver {
-            transform: Some(default_transformer_options()),
-            compress: true,
-            ..Driver::default()
-        }
+        Driver { compress: true, ..Driver::default() }
     }
 }

src/mangler.rs

@@ -1,8 +1,6 @@
-use std::path::{Path, PathBuf};
-
 use oxc::span::SourceType;
 
-use crate::{driver::default_transformer_options, Case, Driver};
+use crate::{Case, Driver};
 
 pub struct ManglerRunner;
 
@@ -11,11 +9,11 @@ impl Case for ManglerRunner {
         "Mangler"
     }
 
-    fn save_file(&self, path: &Path, source_type: SourceType) -> Option<PathBuf> {
-        source_type.is_javascript().then(|| path.to_path_buf())
+    fn run_test(&self, source_type: SourceType) -> bool {
+        source_type.is_javascript() && !source_type.is_jsx()
     }
 
     fn driver(&self) -> Driver {
-        Driver { transform: Some(default_transformer_options()), mangle: true, ..Driver::default() }
+        Driver { mangle: true, ..Driver::default() }
     }
 }

src/remove_whitespace.rs

@@ -1,5 +1,3 @@
-use std::path::{Path, PathBuf};
-
 use oxc::span::SourceType;
 
 use crate::{Case, Driver};
@@ -11,8 +9,8 @@ impl Case for RemoveWhitespaceRunner {
         "RemoveWhitespace"
     }
 
-    fn save_file(&self, path: &Path, source_type: SourceType) -> Option<PathBuf> {
-        source_type.is_javascript().then(|| path.to_path_buf())
+    fn run_test(&self, source_type: SourceType) -> bool {
+        source_type.is_javascript() && !source_type.is_jsx()
     }
 
     fn driver(&self) -> Driver {

src/transformer.rs

@@ -1,8 +1,6 @@
-use std::path::{Path, PathBuf};
+use std::fs;
 
-use oxc::span::SourceType;
-
-use crate::{driver::default_transformer_options, Case, Driver};
+use crate::{driver::default_transformer_options, Case, Diagnostic, Driver, Source};
 
 pub struct TransformerRunner;
 
@@ -11,10 +9,16 @@ impl Case for TransformerRunner {
         "Transformer"
     }
 
-    fn save_file(&self, path: &Path, _source_type: SourceType) -> Option<PathBuf> {
-        let new_extension = path.extension().unwrap().to_string_lossy().replace('t', "j");
-        let new_path = path.with_extension(new_extension);
-        Some(new_path)
+    fn test(&self, source: &Source) -> Result<(), Vec<Diagnostic>> {
+        if self.run_test(source.source_type) {
+            let path = &source.path;
+            let source_text = self.idempotency_test(source)?;
+            // Write js files for runtime test
+            let new_extension = path.extension().unwrap().to_string_lossy().replace('t', "j");
+            let new_path = path.with_extension(new_extension);
+            fs::write(new_path, source_text).unwrap();
+        }
+        Ok(())
     }
 
     fn driver(&self) -> Driver {