From 6a7bae1beab100a27ff6209b7e9449715b97828d Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Fri, 30 Nov 2018 15:50:31 -0600 Subject: SONAR-11464 Add ITs --- .../src/main/java/org/sonar/scanner/report/MetadataPublisher.java | 2 +- .../java/org/sonar/scanner/scan/DefaultInputModuleHierarchy.java | 7 +++++++ .../test/java/org/sonar/scanner/report/MetadataPublisherTest.java | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'sonar-scanner-engine/src') diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java index 2b36b3b5d28..fbbecab9fa1 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java @@ -125,7 +125,7 @@ public class MetadataPublisher implements ReportPublisherStep { while (!queue.isEmpty()) { DefaultInputModule module = queue.removeFirst(); queue.addAll(moduleHierarchy.children(module)); - String relativePath = moduleHierarchy.relativePath(module); + String relativePath = moduleHierarchy.relativePathToRoot(module); if (relativePath != null) { builder.putModulesProjectRelativePathByKey(module.key(), relativePath); } diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/DefaultInputModuleHierarchy.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/DefaultInputModuleHierarchy.java index 3c9995269be..067f830edbe 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/DefaultInputModuleHierarchy.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/DefaultInputModuleHierarchy.java @@ -91,4 +91,11 @@ public class DefaultInputModuleHierarchy implements InputModuleHierarchy { return PathResolver.relativize(parentBaseDir, moduleBaseDir).orElse(null); } + + public String relativePathToRoot(DefaultInputModule module) { + Path rootBaseDir = root.getBaseDir(); + Path moduleBaseDir = module.getBaseDir(); + + return PathResolver.relativize(rootBaseDir, moduleBaseDir).orElse(null); + } } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java index 744cabca3ed..466e016e62a 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java @@ -102,8 +102,8 @@ public class MetadataPublisherTest { .setBaseDir(moduleBaseDir.toFile()) .setWorkDir(temp.newFolder()), TestInputFileBuilder.nextBatchId()); when(inputModuleHierarchy.children(rootModule)).thenReturn(Collections.singletonList(child)); - when(inputModuleHierarchy.relativePath(child)).thenReturn("modulePath"); - when(inputModuleHierarchy.relativePath(rootModule)).thenReturn(""); + when(inputModuleHierarchy.relativePathToRoot(child)).thenReturn("modulePath"); + when(inputModuleHierarchy.relativePathToRoot(rootModule)).thenReturn(""); branches = mock(BranchConfiguration.class); scmConfiguration = mock(ScmConfiguration.class); when(scmConfiguration.provider()).thenReturn(scmProvider); -- cgit v1.2.3