From 5bdc72c564d984f224faf3ff765765df1099843e Mon Sep 17 00:00:00 2001 From: ynfeng Date: Fri, 26 Feb 2021 10:13:38 +0800 Subject: [PATCH] fix(psa): fix duplicate content root path. --- psa/src/jvm/maven_module.rs | 1 - psa/src/jvm/psa_jvm.rs | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/psa/src/jvm/maven_module.rs b/psa/src/jvm/maven_module.rs index 8829fed6..0ed715a0 100644 --- a/psa/src/jvm/maven_module.rs +++ b/psa/src/jvm/maven_module.rs @@ -10,7 +10,6 @@ impl MavenModuleAnalyzer { fn detect_sub_modules(&self, module_path: &str, module: &mut Option) { let sub_modules = &mut self.analysis_sub_modules(module_path); module.as_mut().unwrap().add_sub_modules(sub_modules); - self.detect_content_root(module_path, module); } fn analysis_sub_modules(&self, module_path: &str) -> Vec { diff --git a/psa/src/jvm/psa_jvm.rs b/psa/src/jvm/psa_jvm.rs index af51c1a4..8408560c 100644 --- a/psa/src/jvm/psa_jvm.rs +++ b/psa/src/jvm/psa_jvm.rs @@ -138,6 +138,7 @@ mod tests { let expect_source_path = join_path(project_module.path.as_str(), vec!["src", "main", "java"]); + assert_eq!(project_content_root.source_root.len(), 1); assert_eq!( project_content_root.source_root.get(0).unwrap().as_str(), expect_source_path.as_str() @@ -147,6 +148,7 @@ mod tests { project_module.path.as_str(), vec!["src", "main", "resources"], ); + assert_eq!(project_content_root.resource_root.len(), 1); assert_eq!( project_content_root.resource_root.get(0).unwrap().as_str(), expect_resource_path.as_str() @@ -154,6 +156,7 @@ mod tests { let expect_test_source_root = join_path(project_module.path.as_str(), vec!["src", "test", "java"]); + assert_eq!(project_content_root.test_source_root.len(), 1); assert_eq!( project_content_root .test_source_root @@ -167,6 +170,7 @@ mod tests { project_module.path.as_str(), vec!["src", "test", "resources"], ); + assert_eq!(project_content_root.test_resource_root.len(), 1); assert_eq!( project_content_root.test_resource_root.get(0).unwrap(), expect_test_resources_root.as_str()