Add testing support for new functions

extractor/languages/css.py

@@ -40,8 +40,11 @@ def cssExtractor(file):
         "multi_line_comment": []
     }
     if result1:
-        for idx,i in enumerate(result1[0]):
-            output['multi_line_comment'].append({"start_line": result1[0][idx], "end_line": result1[1][idx], "comment": result1[2][idx]})
+        try:
+            for idx,i in enumerate(result1[0]):
+                output['multi_line_comment'].append({"start_line": result1[0][idx], "end_line": result1[1][idx], "comment": result1[2][idx]})
+        except:
+            pass
     return output
 
 

extractor/languages/tests/test_c.py

@@ -1,20 +1,22 @@
 import unittest
 import re, os
 from languages import c
-from binder import readSingleLine,readMultiLineDiff
+from binder import readSingleLine,readMultiLineDiff,contSingleLines
 
 class CTest(unittest.TestCase):
 
     def test_output(self):
         path = os.path.join(os.getcwd(),"languages/tests/TestFiles/textcomment.c")
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
+        sign = '//'
         self.syntax_start = "/*"
         self.syntax_end ='*/'
-        comment_single = c.readSingleLine(path,regex)
+        comment_single = c.readSingleLine(path,regex,sign)
         comment_multiline = c.readMultiLineDiff(path,self.syntax_start,self.syntax_end)
-
+        comment_contSinglelines = c.contSingleLines(comment_single)
         self.assertTrue(comment_single)
         self.assertTrue(comment_multiline)
+        self.assertTrue(comment_contSinglelines)
 
 
 
@@ -23,9 +25,11 @@ def test_outputFormat(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end = "*/"
+        sign = '//'
         expected = c.cExtractor(path)
-        comment_single = readSingleLine(path,regex)
+        comment_single = readSingleLine(path,regex,sign)
         comment_multiline = readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSinglelines = contSingleLines(comment_single)
         file = path.split("/")
         output = {
         "metadata": [{
@@ -37,16 +41,27 @@ def test_outputFormat(self):
         "sloc": comment_single[1]-(comment_single[3]+comment_multiline[3]+comment_single[2])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
-    }
+        }
+
+        if comment_contSinglelines:
+            comment_single = comment_contSinglelines[0]
+
         if comment_single:
             for i in comment_single[0]:
                 output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
-        if comment_multiline:
-            for idx,i in enumerate(comment_multiline[0]):
-                output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+        if comment_contSinglelines:
+            for idx,i in enumerate(comment_contSinglelines[1]):
+                output['cont_single_line_comment'].append({"start_line": comment_contSinglelines[1][idx], "end_line": comment_contSinglelines[2][idx], "comment": comment_contSinglelines[3][idx]})
 
+        if comment_multiline:
+            try:
+                for idx,i in enumerate(comment_multiline[0]):
+                    output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            except:
+                pass
         self.assertEqual(output,expected)  
 
     def test_Source(self):

extractor/languages/tests/test_c_sharp.py

@@ -1,7 +1,7 @@
 import unittest
 import re, os
 from languages import c_sharp
-from binder import readSingleLine,readMultiLineDiff
+from binder import readSingleLine,readMultiLineDiff,contSingleLines
 
 class CSharpTest(unittest.TestCase):
 
@@ -10,11 +10,14 @@ def test_output(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
-        comment_single = c_sharp.readSingleLine(path,regex)
+        sign = '//'
+        comment_single = c_sharp.readSingleLine(path,regex,sign)
         comment_multiline = c_sharp.readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSingleline = c_sharp.contSingleLines(comment_single)
 
         self.assertTrue(comment_single)
         self.assertTrue(comment_multiline)
+        self.assertTrue(comment_contSingleline)
 
 
 
@@ -23,9 +26,11 @@ def test_outputFormat(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
+        sign = '//'
         expected = c_sharp.c_sharpExtractor(path)
-        comment_single = readSingleLine(path,regex)
+        comment_single = readSingleLine(path,regex,sign)
         comment_multiline = readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSingleline = contSingleLines(comment_single)
         file = path.split("/")
         output = {
         "metadata": [{
@@ -37,12 +42,21 @@ def test_outputFormat(self):
         "sloc": comment_single[1]-(comment_single[3]+comment_multiline[3]+comment_single[2])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
-    }
+        }
+
+        if comment_contSingleline:
+            comment_single = comment_contSingleline[0]
+
         if comment_single:
             for i in comment_single[0]:
                 output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
+        if comment_contSingleline:
+            for idx,i in enumerate(comment_contSingleline[1]):
+                output['cont_single_line_comment'].append({"start_line": comment_contSingleline[1][idx], "end_line": comment_contSingleline[2][idx], "comment": comment_contSingleline[3][idx]})
+
         if comment_multiline:
             for idx,i in enumerate(comment_multiline[0]):
                 output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})

extractor/languages/tests/test_cpp.py

@@ -1,7 +1,7 @@
 import unittest
 import re, os
 from languages import cpp
-from binder import readSingleLine,readMultiLineDiff
+from binder import readSingleLine,readMultiLineDiff,contSingleLines
 
 class CPPTest(unittest.TestCase):
 
@@ -10,11 +10,13 @@ def test_output(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
-        comment_single = cpp.readSingleLine(path,regex)
+        sign = '//'
+        comment_single = cpp.readSingleLine(path,regex,sign)
         comment_multiline = cpp.readMultiLineDiff(path,self.syntax_start,self.syntax_end)
-
+        comment_contSingleline = cpp.contSingleLines(comment_single)
         self.assertTrue(comment_single)
         self.assertTrue(comment_multiline)
+        self.assertTrue(comment_contSingleline)
 
 
 
@@ -23,9 +25,11 @@ def test_outputFormat(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
+        sign = '//'
         expected = cpp.cppExtractor(path)
-        comment_single = readSingleLine(path,regex)
+        comment_single = readSingleLine(path,regex,sign)
         comment_multiline = readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSingleline = contSingleLines(comment_single)
         file = path.split("/")
         output = {
         "metadata": [{
@@ -37,15 +41,27 @@ def test_outputFormat(self):
         "sloc": comment_single[1]-(comment_single[3]+comment_multiline[3]+comment_single[2])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
-    }
+        }
+
+        if comment_contSingleline:
+            comment_single = comment_contSingleline[0]
+
         if comment_single:
             for i in comment_single[0]:
                 output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
+        if comment_contSingleline:
+            for idx,i in enumerate(comment_contSingleline[1]):
+                output['cont_single_line_comment'].append({"start_line": comment_contSingleline[1][idx], "end_line": comment_contSingleline[2][idx], "comment": comment_contSingleline[3][idx]})
+
         if comment_multiline:
-            for idx,i in enumerate(comment_multiline[0]):
-                output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            try:
+                for idx,i in enumerate(comment_multiline[0]):
+                    output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            except:
+                pass
 
         self.assertEqual(output,expected)  
 

extractor/languages/tests/test_css.py

@@ -35,8 +35,11 @@ def test_outputFormat(self):
         "multi_line_comment": []
         }
         if comment_multiline:
-            for idx,i in enumerate(comment_multiline[0]):
-                output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            try:
+                for idx,i in enumerate(comment_multiline[0]):
+                    output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            except:
+                pass
 
         self.assertEqual(output,expected)  
 

extractor/languages/tests/test_go.py

@@ -1,7 +1,7 @@
 import unittest
 import re, os
 from languages import go
-from binder import readSingleLine,readMultiLineDiff
+from binder import readSingleLine,readMultiLineDiff,contSingleLines
 
 class GoTest(unittest.TestCase):
 
@@ -10,11 +10,13 @@ def test_output(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
-        comment_single = go.readSingleLine(path,regex)
+        sign = '//'
+        comment_single = go.readSingleLine(path,regex,sign)
         comment_multiline = go.readMultiLineDiff(path,self.syntax_start,self.syntax_end)
-
+        comment_contSingleline = go.contSingleLines(comment_single)
         self.assertTrue(comment_single)
         self.assertTrue(comment_multiline)
+        self.assertTrue(comment_contSingleline)
 
 
 
@@ -23,9 +25,11 @@ def test_outputFormat(self):
         regex = r'''(\/\/\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
+        sign = '//'
         expected = go.goExtractor(path)
-        comment_single = readSingleLine(path,regex)
+        comment_single = readSingleLine(path,regex,sign)
         comment_multiline = readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSingleline = contSingleLines(comment_single)
         file = path.split("/")
         output = {
         "metadata": [{
@@ -37,12 +41,21 @@ def test_outputFormat(self):
         "sloc": comment_single[1]-(comment_single[3]+comment_multiline[3]+comment_single[2])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
         }
+
+        if comment_contSingleline:
+            comment_single = comment_contSingleline[0]
+
         if comment_single:
             for i in comment_single[0]:
                 output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
+        if comment_contSingleline:
+            for idx,i in enumerate(comment_contSingleline[1]):
+                output['cont_single_line_comment'].append({"start_line": comment_contSingleline[1][idx], "end_line": comment_contSingleline[2][idx], "comment": comment_contSingleline[3][idx]})
+
         if comment_multiline:
             for idx,i in enumerate(comment_multiline[0]):
                 output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})

extractor/languages/tests/test_haskell.py

@@ -1,7 +1,7 @@
 import unittest
 import re, os
 from languages import haskell
-from binder import readSingleLine,readMultiLineDiff
+from binder import readSingleLine,readMultiLineDiff,contSingleLines
 
 class HaskellTest(unittest.TestCase):
 
@@ -10,11 +10,13 @@ def test_output(self):
         regex = r'''(\-\-\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "/*"
         self.syntax_end ='*/'
-        comment_single = haskell.readSingleLine(path,regex)
+        sign = '--'
+        comment_single = haskell.readSingleLine(path,regex,sign)
         comment_multiline = haskell.readMultiLineDiff(path,self.syntax_start,self.syntax_end)
-
+        comment_contSingleline = haskell.contSingleLines(comment_single)
         self.assertTrue(comment_single)
         self.assertTrue(comment_multiline)
+        self.assertTrue(comment_contSingleline)
 
 
 
@@ -23,9 +25,11 @@ def test_outputFormat(self):
         regex = r'''(\-\-\s*[\w #\.()@+-_*\d]*)'''
         self.syntax_start = "{-"
         self.syntax_end = "-}"
+        sign = '--'
         expected = haskell.haskellExtractor(path)
-        comment_single = readSingleLine(path,regex)
+        comment_single = readSingleLine(path,regex,sign)
         comment_multiline = readMultiLineDiff(path,self.syntax_start,self.syntax_end)
+        comment_contSingleline = contSingleLines(comment_single)
         file = path.split("/")
         output = {
         "metadata": [{
@@ -37,12 +41,21 @@ def test_outputFormat(self):
         "sloc": comment_single[1]-(comment_single[3]+comment_multiline[3]+comment_single[2])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
-    }
+        }
+
+        if comment_contSingleline:
+            comment_single = comment_contSingleline[0]
+
         if comment_single:
             for i in comment_single[0]:
                 output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
+        if comment_contSingleline:
+            for idx,i in enumerate(comment_contSingleline[1]):
+                output['cont_single_line_comment'].append({"start_line": comment_contSingleline[1][idx], "end_line": comment_contSingleline[2][idx], "comment": comment_contSingleline[3][idx]})
+
         if comment_multiline:
             for idx,i in enumerate(comment_multiline[0]):
                 output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})

extractor/languages/tests/test_html.py

@@ -39,15 +39,24 @@ def test_outputFormat(self):
         "sloc": comment_single[4]-(comment_single[3]+comment_multiline[3]+comment_single[5])
         }],
         "single_line_comment": [],
+        "cont_single_line_comment": [],
         "multi_line_comment": []
         }
-        if comment_single:
-            for i in comment_single[0]:
-                output['single_line_comment'].append({"line_number" :i[0],"comment": i[1]})
 
+
+        if comment_single:
+            try:
+                for idx,i in enumerate(comment_single[0]):
+                    output['multi_line_comment'].append({"start_line": comment_single[0][idx], "end_line": comment_single[1][idx], "comment": comment_single[2][idx]})
+            except:
+                pass
+
         if comment_multiline:
-            for idx,i in enumerate(comment_multiline[0]):
-                output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            try:
+                for idx,i in enumerate(comment_multiline[0]):
+                    output['multi_line_comment'].append({"start_line": comment_multiline[0][idx], "end_line": comment_multiline[1][idx], "comment": comment_multiline[2][idx]})
+            except:
+                pass
 
         self.assertEqual(output,expected)