Fix exclusions by absolute path on Windows

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileFilterContext.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileFilterContext.java
index 3a5219d28d3af46600b417e426daaf088408f404..3fe6428edd7686b77e185d3d0657796c75ef926d 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileFilterContext.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileFilterContext.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.batch.scan.filesystem;
 
+import org.apache.commons.io.FilenameUtils;
 import org.sonar.api.batch.FileFilter;
 import org.sonar.api.scan.filesystem.FileType;
 import org.sonar.api.scan.filesystem.ModuleFileSystem;
@@ -72,7 +73,7 @@ class FileFilterContext implements FileFilter.Context {
   }
 
   FileFilterContext setCanonicalPath(String s) {
-    this.fileCanonicalPath = s;
+    this.fileCanonicalPath = FilenameUtils.separatorsToUnix(s);
     return this;
   }
 }

diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/FileFilterContextTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/FileFilterContextTest.java
new file mode 100644 (file)
index 0000000..49f7970
--- /dev/null
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/FileFilterContextTest.java
@@ -0,0 +1,45 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.batch.scan.filesystem;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.sonar.api.scan.filesystem.ModuleFileSystem;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class FileFilterContextTest {
+  @Rule
+  public TemporaryFolder temp = new TemporaryFolder();
+
+  @Test
+  public void should_use_slash_for_canonical_path() throws IOException {
+    // even on windows
+    File file = temp.newFile("foo.txt");
+    FileFilterContext context = new FileFilterContext(mock(ModuleFileSystem.class));
+    context.setCanonicalPath(file.getCanonicalPath());
+    assertThat(context.canonicalPath()).doesNotContain("\\").contains("/");
+  }
+}

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
index c7bc9ba88310fc7ba64d12899c103bea52e1f82f..3a0ce8e54fdc7ecae2d2c708c724ac7d794a1597 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
@@ -49,7 +49,7 @@ public interface FileSystemFilter extends BatchExtension {
     String relativePath();
 
     /**
-     * Absolute file path. Never return null.
+     * Absolute file path. Directory separator is slash, even on windows. Never return null.
      */
     String canonicalPath();
   }