From 444833ea6bd6b2695f4f491baab98d14855b08d3 Mon Sep 17 00:00:00 2001
From: Gaurav Mishra <mishra.gaurav@siemens.com>
Date: Wed, 28 Apr 2021 20:57:49 +0530
Subject: [PATCH] fix(test): Update the regex in test cases

Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
---
 nirjas/languages/tests/test_c.py          | 2 +-
 nirjas/languages/tests/test_c_sharp.py    | 4 ++--
 nirjas/languages/tests/test_cpp.py        | 4 ++--
 nirjas/languages/tests/test_go.py         | 4 ++--
 nirjas/languages/tests/test_haskell.py    | 4 ++--
 nirjas/languages/tests/test_java.py       | 4 ++--
 nirjas/languages/tests/test_javascript.py | 4 ++--
 nirjas/languages/tests/test_kotlin.py     | 4 ++--
 nirjas/languages/tests/test_matlab.py     | 4 ++--
 nirjas/languages/tests/test_perl.py       | 4 ++--
 nirjas/languages/tests/test_php.py        | 4 ++--
 nirjas/languages/tests/test_python.py     | 4 ++--
 nirjas/languages/tests/test_r.py          | 4 ++--
 nirjas/languages/tests/test_ruby.py       | 4 ++--
 nirjas/languages/tests/test_rust.py       | 4 ++--
 nirjas/languages/tests/test_scala.py      | 4 ++--
 nirjas/languages/tests/test_scss.py       | 4 ++--
 nirjas/languages/tests/test_shell.py      | 4 ++--
 nirjas/languages/tests/test_swift.py      | 4 ++--
 nirjas/languages/tests/test_typescript.py | 4 ++--
 testScript.py                             | 2 +-
 21 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/nirjas/languages/tests/test_c.py b/nirjas/languages/tests/test_c.py
index 4c15363..c244715 100644
--- a/nirjas/languages/tests/test_c.py
+++ b/nirjas/languages/tests/test_c.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
diff --git a/nirjas/languages/tests/test_c_sharp.py b/nirjas/languages/tests/test_c_sharp.py
index e8f6bbf..74ef7b5 100644
--- a/nirjas/languages/tests/test_c_sharp.py
+++ b/nirjas/languages/tests/test_c_sharp.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = c_sharp.c_sharpExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_cpp.py b/nirjas/languages/tests/test_cpp.py
index d67cbd8..a0c938e 100644
--- a/nirjas/languages/tests/test_cpp.py
+++ b/nirjas/languages/tests/test_cpp.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = cpp.cppExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_go.py b/nirjas/languages/tests/test_go.py
index 05533c2..89a854a 100644
--- a/nirjas/languages/tests/test_go.py
+++ b/nirjas/languages/tests/test_go.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = go.goExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_haskell.py b/nirjas/languages/tests/test_haskell.py
index 142500e..7286e05 100644
--- a/nirjas/languages/tests/test_haskell.py
+++ b/nirjas/languages/tests/test_haskell.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''\-\-\s*(.*)'''
+        regex = r'''(?<!["'`])\-\-\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''\-\-\s*(.*)'''
+        regex = r'''(?<!["'`])\-\-\s*(.*)'''
         syntax_start = "{-"
         syntax_end = "-}"
         expected = haskell.haskellExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_java.py b/nirjas/languages/tests/test_java.py
index d863456..0e2d07f 100644
--- a/nirjas/languages/tests/test_java.py
+++ b/nirjas/languages/tests/test_java.py
@@ -36,7 +36,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = java.javaExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_javascript.py b/nirjas/languages/tests/test_javascript.py
index 20ede78..1358e0b 100644
--- a/nirjas/languages/tests/test_javascript.py
+++ b/nirjas/languages/tests/test_javascript.py
@@ -36,7 +36,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = javascript.javascriptExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_kotlin.py b/nirjas/languages/tests/test_kotlin.py
index 9503c98..c28ceb8 100644
--- a/nirjas/languages/tests/test_kotlin.py
+++ b/nirjas/languages/tests/test_kotlin.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = kotlin.kotlinExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_matlab.py b/nirjas/languages/tests/test_matlab.py
index 9806d3d..fe096e5 100644
--- a/nirjas/languages/tests/test_matlab.py
+++ b/nirjas/languages/tests/test_matlab.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''\%\s*(.*)'''
+        regex = r'''(?<!["'`])\%\s*(.*)'''
         syntax_start = "%{"
         syntax_end = "%}"
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''\%\s*(.*)'''
+        regex = r'''(?<!["'`])\%\s*(.*)'''
         syntax_start = "%{"
         syntax_end = "%}"
         expected = matlab.matlabExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_perl.py b/nirjas/languages/tests/test_perl.py
index 3f56f50..72d6354 100644
--- a/nirjas/languages/tests/test_perl.py
+++ b/nirjas/languages/tests/test_perl.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         syntax_start = "=begin"
         syntax_end = "=cut"
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         syntax_start = "=begin"
         syntax_end = "=cut"
         expected = perl.perlExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_php.py b/nirjas/languages/tests/test_php.py
index 11c2ff1..7b6b2d7 100644
--- a/nirjas/languages/tests/test_php.py
+++ b/nirjas/languages/tests/test_php.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = php.phpExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_python.py b/nirjas/languages/tests/test_python.py
index 3059e26..35cb46f 100644
--- a/nirjas/languages/tests/test_python.py
+++ b/nirjas/languages/tests/test_python.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         syntax_single = "'''"
         syntax_double = '"""'
         comment_multi_single = readMultiLineSame(self.testfile, syntax_single)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         syntax_single = "'''"
         syntax_double = '"""'
         expected = python.pythonExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_r.py b/nirjas/languages/tests/test_r.py
index 5b297de..05a0308 100644
--- a/nirjas/languages/tests/test_r.py
+++ b/nirjas/languages/tests/test_r.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         comment_single = readSingleLine(self.testfile, regex)
         self.assertTrue(comment_single)
 
@@ -43,7 +43,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         expected = r.rExtractor(self.testfile).get_dict()
         comment_single = readSingleLine(self.testfile, regex)
         file = self.testfile.split("/")
diff --git a/nirjas/languages/tests/test_ruby.py b/nirjas/languages/tests/test_ruby.py
index 9b7b25e..1d59b6d 100644
--- a/nirjas/languages/tests/test_ruby.py
+++ b/nirjas/languages/tests/test_ruby.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+(?!\{)\s*(.*)'''
         syntax_start = "=begin"
         syntax_end = "=end"
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+(?!\{)\s*(.*)'''
         syntax_start = "=begin"
         syntax_end = "=cut"
         expected = ruby.rubyExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_rust.py b/nirjas/languages/tests/test_rust.py
index 1221144..c70463b 100644
--- a/nirjas/languages/tests/test_rust.py
+++ b/nirjas/languages/tests/test_rust.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -50,7 +50,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = rust.rustExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_scala.py b/nirjas/languages/tests/test_scala.py
index f03bd67..3cd1eaf 100644
--- a/nirjas/languages/tests/test_scala.py
+++ b/nirjas/languages/tests/test_scala.py
@@ -36,7 +36,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = scala.scalaExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_scss.py b/nirjas/languages/tests/test_scss.py
index 142416b..feb31a0 100644
--- a/nirjas/languages/tests/test_scss.py
+++ b/nirjas/languages/tests/test_scss.py
@@ -39,7 +39,7 @@ def test_output(self):
         Check for the scan correctness.
         '''
         regex1 = r'''(?<!\/)\/\/(?!\/)\s*(.*)'''
-        regex2 = r'''\/\/\/\s*(.*)'''
+        regex2 = r'''(?<!["'`])\/\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single_doubleSlash = readSingleLine(self.testfile, regex1)
@@ -59,7 +59,7 @@ def test_outputFormat(self):
         Check for the output format correctness.
         '''
         regex1 = r'''(?<!\/)\/\/(?!\/)\s*(.*)'''
-        regex2 = r'''\/\/\/\s*(.*)'''
+        regex2 = r'''(?<!["'`])\/\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = scss.scssExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_shell.py b/nirjas/languages/tests/test_shell.py
index 55aec6e..865b192 100644
--- a/nirjas/languages/tests/test_shell.py
+++ b/nirjas/languages/tests/test_shell.py
@@ -35,7 +35,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         comment_single = readSingleLine(self.testfile, regex)
         self.assertTrue(comment_single)
 
@@ -43,7 +43,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''#+\s*(.*)'''
+        regex = r'''(?<!["'`])#+\s*(.*)'''
         expected = shell.shellExtractor(self.testfile).get_dict()
         comment_single = readSingleLine(self.testfile, regex)
         comment_contSingleline = contSingleLines(comment_single)
diff --git a/nirjas/languages/tests/test_swift.py b/nirjas/languages/tests/test_swift.py
index 4c6c942..7f961d3 100644
--- a/nirjas/languages/tests/test_swift.py
+++ b/nirjas/languages/tests/test_swift.py
@@ -36,7 +36,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -51,7 +51,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = "*/"
         expected = swift.swiftExtractor(self.testfile).get_dict()
diff --git a/nirjas/languages/tests/test_typescript.py b/nirjas/languages/tests/test_typescript.py
index 0bb01f7..dcaf1b9 100644
--- a/nirjas/languages/tests/test_typescript.py
+++ b/nirjas/languages/tests/test_typescript.py
@@ -37,7 +37,7 @@ def test_output(self):
         '''
         Check for the scan correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         comment_single = readSingleLine(self.testfile, regex)
@@ -52,7 +52,7 @@ def test_outputFormat(self):
         '''
         Check for the output format correctness.
         '''
-        regex = r'''(?<![pst]:)\/\/\s*(.*)'''
+        regex = r'''(?<![pst'"`]:)\/\/\s*(.*)'''
         syntax_start = "/*"
         syntax_end = '*/'
         expected = typescript.typescriptExtractor(self.testfile).get_dict()
diff --git a/testScript.py b/testScript.py
index 2a1c385..1990af4 100755
--- a/testScript.py
+++ b/testScript.py
@@ -69,7 +69,7 @@ def download_files(cwd):
             ext = file_name[-1]
             with urllib.request.urlopen(url) as data:
                 filename = "textcomment." + ext
-                with open(os.path.join(directory, filename), 'w') as newfile:
+                with open(os.path.join(directory, filename), 'w', encoding='utf-8') as newfile:
                     newfile.write(data.read().decode('utf-8'))
             print(".", end="")
         print()