Fix unit tests on Windows (SonarSource#203)

saberduck · andrea-guarino-sonarsource · commit ed010b9b310d · 2019-02-21T17:43:06.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# force eol to LF so we don't have problem with tests on windows
+
+* text eol=lf
diff --git a/python-squid/src/test/java/org/sonar/python/DocstringExtractorTest.java b/python-squid/src/test/java/org/sonar/python/DocstringExtractorTest.java
@@ -45,7 +45,7 @@ public void test() {
     File file = new File(BASE_DIR, "docstring.py");
     TestPythonVisitorRunner.scanFile(file, new DocstringVisitor());
 
-    assertDocstring(PythonGrammar.FILE_INPUT, 1, String.format("%s%nThis is a module docstring%n%s", TRIPLE_QUOTES, TRIPLE_QUOTES));
+    assertDocstring(PythonGrammar.FILE_INPUT, 1, String.format("%s\nThis is a module docstring\n%s", TRIPLE_QUOTES, TRIPLE_QUOTES));
     assertDocstring(PythonGrammar.FUNCDEF, 5, TRIPLE_QUOTES + "This is a function docstring" + TRIPLE_QUOTES);
     assertDocstring(PythonGrammar.FUNCDEF, 12, TRIPLE_QUOTES + " " + TRIPLE_QUOTES);
     assertDocstring(PythonGrammar.FUNCDEF, 16, "\"This is a function docstring\"");
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintIssuesAnalyzerIT.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintIssuesAnalyzerIT.java
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.plugins.python.pylint.PylintIssuesAnalyzerTest.RESOURCE_DIR;
 
 public class PylintIssuesAnalyzerIT {
 
@@ -36,14 +37,13 @@ public class PylintIssuesAnalyzerIT {
 
   @Test
   public void issuesTest() throws Exception {
-    String pylintrcResource = "/org/sonar/plugins/python/pylint/pylintrc_sample";
+    String pylintrcResource = RESOURCE_DIR + "/org/sonar/plugins/python/pylint/pylintrc_sample";
     String codeChunksResource = "/org/sonar/plugins/python/code_chunks_2.py";
-    String pylintConfigPath = getClass().getResource(pylintrcResource).getPath();
     String codeChunksPathName = getClass().getResource(codeChunksResource).getPath();
     String pylintPath = null;
     File out = tempFolder.newFile();
 
-    List<Issue> issues = new PylintIssuesAnalyzer(pylintPath, pylintConfigPath).analyze(codeChunksPathName, StandardCharsets.UTF_8, out);
+    List<Issue> issues = new PylintIssuesAnalyzer(pylintPath, pylintrcResource).analyze(codeChunksPathName, StandardCharsets.UTF_8, out);
     assertThat(issues).isNotEmpty();
   }
 
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintIssuesAnalyzerTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintIssuesAnalyzerTest.java
@@ -36,25 +36,24 @@
 public class PylintIssuesAnalyzerTest {
 
   private static final Logger LOG = Loggers.get(PylintIssuesAnalyzerTest.class);
+  static final String RESOURCE_DIR = "src/test/resources";
 
   @Test
   public void shouldParseCorrectly() {
     String resourceName = "/org/sonar/plugins/python/pylint/sample_pylint_output.txt";
-    String pathName = getClass().getResource(resourceName).getPath();
     String pylintConfigPath = null;
     String pylintPath = null;
-    List<String> lines = readFile(pathName);
+    List<String> lines = readFile(resourceName);
     List<Issue> issues = analyzer(pylintPath, pylintConfigPath).parseOutput(lines);
     assertThat(issues.size()).isEqualTo(21);
   }
 
   @Test
   public void shouldParseCorrectlyNewFormat() {
     String resourceName = "/org/sonar/plugins/python/pylint/sample_pylint_output_new_format.txt";
-    String pathName = getClass().getResource(resourceName).getPath();
     String pylintConfigPath = null;
     String pylintPath = null;
-    List<String> lines = readFile(pathName);
+    List<String> lines = readFile(resourceName);
     List<Issue> issues = analyzer(pylintPath, pylintConfigPath).parseOutput(lines);
     assertThat(issues.size()).isEqualTo(1);
     assertThat(issues.get(0).getRuleId()).isEqualTo("C0111");
@@ -63,10 +62,9 @@ public void shouldParseCorrectlyNewFormat() {
   @Test
   public void shouldParseCorrectlyOutputWithWindowsPaths() {
     String resourceName = "/org/sonar/plugins/python/pylint/sample_pylint_output_with_win_paths.txt";
-    String pathName = getClass().getResource(resourceName).getPath();
     String pylintConfigPath = null;
     String pylintPath = null;
-    List<String> lines = readFile(pathName);
+    List<String> lines = readFile(resourceName);
     List<Issue> issues = analyzer(pylintPath, pylintConfigPath).parseOutput(lines);
     assertThat(issues.size()).isEqualTo(1);
   }
@@ -75,12 +73,10 @@ public void shouldParseCorrectlyOutputWithWindowsPaths() {
   public void shouldMapIssuesIdsCorrectly() {
     String resourceOld = "/org/sonar/plugins/python/pylint/sample_pylint_output_oldids.txt";
     String resourceNew = "/org/sonar/plugins/python/pylint/sample_pylint_output_newids.txt";
-    String pathNameOld = getClass().getResource(resourceOld).getPath();
-    String pathNameNew = getClass().getResource(resourceNew).getPath();
     String pylintConfigPath = null;
     String pylintPath = null;
-    List<String> linesOld = readFile(pathNameOld);
-    List<String> linesNew = readFile(pathNameNew);
+    List<String> linesOld = readFile(resourceOld);
+    List<String> linesNew = readFile(resourceNew);
     List<Issue> issuesOld = analyzer(pylintPath, pylintConfigPath).parseOutput(linesOld);
     List<Issue> issuesNew = analyzer(pylintPath, pylintConfigPath).parseOutput(linesNew);
     assertThat(getIds(issuesOld)).isEqualTo(getIds(issuesNew));
@@ -151,7 +147,7 @@ public void shouldFailIfGivenInvalidParams() {
 
   private static List<String> readFile(String path) {
     try {
-      return Files.readAllLines(Paths.get(path), UTF_8);
+      return Files.readAllLines(Paths.get(RESOURCE_DIR, path), UTF_8);
     } catch (IOException e) {
       LOG.error("Cannot read the file '{}'", path);
       return Collections.emptyList();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# force eol to LF so we don't have problem with tests on windows`
	`2`	`+`
	`3`	`+* text eol=lf`