Merge pull request SonarOpenCommunity#1023 from guwirth/include-without-extension

test source code provider for include files without extension

Author: guwirth

cxx-squid/src/test/java/org/sonar/cxx/preprocessor/SourceCodeProviderTest.java

@@ -31,8 +31,9 @@
 public class SourceCodeProviderTest {
 
   private final SourceCodeProvider codeProvider = new SourceCodeProvider();
-  private final File expected = new File(new File("src/test/resources/codeprovider/source.hh").getAbsolutePath());
-
+  private final File expected1 = new File(new File("src/test/resources/codeprovider/source.hh").getAbsolutePath());
+  private final File expected2 = new File(new File("src/test/resources/codeprovider/source").getAbsolutePath());
+ 
   // ////////////////////////////////////////////////////////////////////////////
   // Behavior in the absolute path case
   @Test
@@ -41,13 +42,13 @@ public void getting_file_with_abspath() {
     // working directory and should work the same in the quoted and
     // unquoted case
 
-    String path = expected.getAbsolutePath();
+    String path = expected1.getAbsolutePath();
     String dummycwd = new File("src/test/resources/codeprovider").getAbsolutePath();
 
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, null, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, null, false));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, null, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, null, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, false));
   }
 
   // ////////////////////////////////////////////////////////////////////////////
@@ -66,10 +67,22 @@ public void getting_file_relpath_case1() {
     String includeRoot = new File("src/test/resources/codeprovider").getAbsolutePath();
 
     codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, false));
   }
 
+  @Test
+  public void getting_file_relpath_case1_without_extension() {
+    String baseDir = new File("src/test").getAbsolutePath();
+    String dummycwd = "/";
+    String path = "source";
+    String includeRoot = new File("src/test/resources/codeprovider").getAbsolutePath();
+
+    codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, false));
+  }
+  
   @Test
   public void getting_file_relpath_case2() {
     String baseDir = new File("src/test").getAbsolutePath();
@@ -78,10 +91,22 @@ public void getting_file_relpath_case2() {
     String includeRoot = "resources/codeprovider";
 
     codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, false));
   }
 
+  @Test
+  public void getting_file_relpath_case2_without_extension() {
+    String baseDir = new File("src/test").getAbsolutePath();
+    String dummycwd = "/";
+    String path = "source";
+    String includeRoot = "resources/codeprovider";
+
+    codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, false));
+  }
+  
   @Test
   public void getting_file_relpath_case3() {
     String baseDir = new File("src/test").getAbsolutePath();
@@ -90,10 +115,22 @@ public void getting_file_relpath_case3() {
     String includeRoot = new File("src/test/resources").getAbsolutePath();
 
     codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, false));
   }
 
+  @Test
+  public void getting_file_relpath_case3_without_extension() {
+    String baseDir = new File("src/test").getAbsolutePath();
+    String dummycwd = "/";
+    String path = "codeprovider/source";
+    String includeRoot = new File("src/test/resources").getAbsolutePath();
+
+    codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, false));
+  }
+  
   @Test
   public void getting_file_relpath_case4() {
     String baseDir = new File("src/test").getAbsolutePath();
@@ -102,39 +139,56 @@ public void getting_file_relpath_case4() {
     String includeRoot = "resources";
 
     codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, true));
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, dummycwd, false));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, dummycwd, false));
   }
 
+  @Test
+  public void getting_file_relpath_case4_without_extension() {
+    String baseDir = new File("src/test").getAbsolutePath();
+    String dummycwd = "/";
+    String path = "codeprovider/source";
+    String includeRoot = "resources";
+
+    codeProvider.setIncludeRoots(Arrays.asList(includeRoot), baseDir);
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, true));
+    assertEquals(expected2, codeProvider.getSourceCodeFile(path, dummycwd, false));
+  }
+  
   // ////////////////////////////////////////////////////////////////////////////
   // Special behavior in the quoted case
   // Lookup in the current directory. Has to fail for the angle case
   @Test
   public void getting_file_with_filename_and_cwd() {
     String cwd = new File("src/test/resources/codeprovider").getAbsolutePath();
     String path = "source.hh";
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, cwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, cwd, true));
     assertEquals(null, codeProvider.getSourceCodeFile(path, cwd, false));
   }
 
   @Test
   public void getting_file_with_relpath_and_cwd() {
     String cwd = new File("src/test/resources").getAbsolutePath();
     String path = "codeprovider/source.hh";
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, cwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, cwd, true));
     assertEquals(null, codeProvider.getSourceCodeFile(path, cwd, false));
   }
 
   @Test
   public void getting_file_with_relpath_containing_backsteps_and_cwd() {
     String cwd = new File("src/test/resources/codeprovider/folder").getAbsolutePath();
     String path = "../source.hh";
-    assertEquals(expected, codeProvider.getSourceCodeFile(path, cwd, true));
+    assertEquals(expected1, codeProvider.getSourceCodeFile(path, cwd, true));
     assertEquals(null, codeProvider.getSourceCodeFile(path, cwd, false));
   }
 
   @Test
-  public void getting_source_code() throws IOException {
-    assertEquals("source code", codeProvider.getSourceCode(expected, Charset.defaultCharset()));
+  public void getting_source_code1() throws IOException {
+    assertEquals("source code", codeProvider.getSourceCode(expected1, Charset.defaultCharset()));
+  }
+  
+  @Test
+  public void getting_source_code2() throws IOException {
+    assertEquals("source code", codeProvider.getSourceCode(expected2, Charset.defaultCharset()));
   }
 }

cxx-squid/src/test/resources/codeprovider/source

@@ -0,0 +1 @@
+source code