Simplify test module matching

Author: timfish

tests/class_method_cjs/mod.rs

@@ -7,7 +7,7 @@ fn class_method_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/class_method_cjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::class_method("Undici", "fetch", FunctionKind::Async),
             "Undici_fetch",
         )),

tests/common/mod.rs

@@ -83,14 +83,17 @@ fn transpile(
     .unwrap()
 }
 
+static TEST_MODULE_NAME: &'static str = "undici";
+static TEST_MODULE_PATH: &'static str = "index.mjs";
+
 pub fn transpile_and_test(test_file: &str, mjs: bool, config: Config) {
     let test_file = PathBuf::from(test_file);
     let test_dir = test_file.parent().expect("Couldn't find test directory");
 
-    let file_path = test_dir.join("index.mjs");
+    let file_path = PathBuf::from("index.mjs");
     let mut instrumentor = Instrumentor::new(config);
     let mut instrumentations =
-        instrumentor.get_matching_instrumentations("undici", "0.0.1", &file_path);
+        instrumentor.get_matching_instrumentations(TEST_MODULE_NAME, "0.0.1", &file_path);
 
     let extension = if mjs { "mjs" } else { "js" };
     let instrumentable = test_dir.join(format!("mod.{}", extension));
@@ -113,3 +116,7 @@ pub fn transpile_and_test(test_file: &str, mjs: bool, config: Config) {
         .assert()
         .success();
 }
+
+pub fn test_module_matcher() -> ModuleMatcher {
+    ModuleMatcher::new(TEST_MODULE_NAME, ">=0.0.1", TEST_MODULE_PATH).unwrap()
+}

tests/constructor_cjs/mod.rs

@@ -7,7 +7,7 @@ fn constructor_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/constructor_cjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::class_constructor("Undici"),
             "Undici_constructor",
         )),

tests/constructor_mjs/mod.rs

@@ -7,7 +7,7 @@ fn constructor_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/constructor_mjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::class_constructor("Undici"),
             "Undici_constructor",
         )),

tests/decl_cjs/mod.rs

@@ -7,7 +7,7 @@ fn decl_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/decl_cjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::function_declaration("fetch", FunctionKind::Async),
             "fetch_decl",
         )),

tests/decl_mjs/mod.rs

@@ -7,7 +7,7 @@ fn decl_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/decl_mjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::function_declaration("fetch", FunctionKind::Async),
             "fetch_decl",
         )),

tests/expr_cjs/mod.rs

@@ -7,7 +7,7 @@ fn expr_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/expr_cjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::function_expression("fetch", FunctionKind::Async),
             "fetch_expr",
         )),

tests/expr_mjs/mod.rs

@@ -7,7 +7,7 @@ fn expr_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/expr_mjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::function_expression("fetch", FunctionKind::Async),
             "fetch_expr",
         )),

tests/index_cjs/mod.rs

@@ -7,7 +7,7 @@ fn index_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
-            ModuleMatcher::new("undici", ">=0.0.1", "tests/index_cjs/index.mjs").unwrap(),
+            test_module_matcher(),
             FunctionQuery::ClassMethod {
                 class_name: "Undici".to_string(),
                 method_name: "fetch".to_string(),

tests/multiple_class_method_cjs/mod.rs

@@ -9,22 +9,12 @@ fn multiple_class_method_cjs() {
         Config::new(
             vec![
                 InstrumentationConfig::new(
-                    ModuleMatcher::new(
-                        "undici",
-                        ">=0.0.1",
-                        "tests/multiple_class_method_cjs/index.mjs",
-                    )
-                    .unwrap(),
+                    test_module_matcher(),
                     FunctionQuery::class_method("Undici", "fetch1", FunctionKind::Async),
                     "Undici_fetch1",
                 ),
                 InstrumentationConfig::new(
-                    ModuleMatcher::new(
-                        "undici",
-                        ">=0.0.1",
-                        "tests/multiple_class_method_cjs/index.mjs",
-                    )
-                    .unwrap(),
+                    test_module_matcher(),
                     FunctionQuery::class_method("Undici", "fetch2", FunctionKind::Async),
                     "Undici_fetch2",
                 ),