updating tests

Author: Dionysios Grapsas

test/test_server_folding.py

@@ -15,43 +15,63 @@ def validate_folding(results: list, ref: list):
         assert results[i] == ref[i]
 
 
-def test_if_folding():
+def test_folding_if():
     """Test the ranges for several blocks are correct"""
     string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
-    file_path = test_dir / "subdir" / "test_if_folding.f90"
+    file_path = test_dir / "subdir" / "test_folding_if.f90"
     string += folding_req(file_path)
     errcode, results = run_request(string)
     assert errcode == 0
+    print(results[1])
     ref = [
-        {"startLine": 0, "endLine": 42},
-        {"startLine": 10, "endLine": 20},
-        {"startLine": 21, "endLine": 22},
-        {"startLine": 11, "endLine": 19},
-        {"startLine": 13, "endLine": 14},
-        {"startLine": 15, "endLine": 16},
-        {"startLine": 17, "endLine": 18},
-        {"startLine": 30, "endLine": 34},
-        {"startLine": 35, "endLine": 38},
-        {"startLine": 39, "endLine": 40},
-        {"startLine": 2, "endLine": 5},
-        {"startLine": 25, "endLine": 27},
-        {"startLine": 31, "endLine": 33},
+        {"startLine": 0, "endLine": 43},
+        {"startLine": 11, "endLine": 21},
+        {"startLine": 22, "endLine": 23},
+        {"startLine": 12, "endLine": 20},
+        {"startLine": 14, "endLine": 15},
+        {"startLine": 16, "endLine": 17},
+        {"startLine": 18, "endLine": 19},
+        {"startLine": 31, "endLine": 35},
+        {"startLine": 36, "endLine": 39},
+        {"startLine": 40, "endLine": 41},
+        {"startLine": 2, "endLine": 6},
+        {"startLine": 26, "endLine": 28},
+        {"startLine": 32, "endLine": 34},
+    ]
+    validate_folding(results[1], ref)
+
+
+def test_folding_select_case():
+    """Test the ranges for several blocks are correct"""
+    string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
+    file_path = test_dir / "subdir" / "test_folding_select_case.f90"
+    string += folding_req(file_path)
+    errcode, results = run_request(string)
+    assert errcode == 0
+    ref = [
+        {"startLine": 0, "endLine": 14},
+        {"startLine": 4, "endLine": 4},
+        {"startLine": 5, "endLine": 6},
+        {"startLine": 7, "endLine": 8},
+        {"startLine": 9, "endLine": 10},
+        {"startLine": 11, "endLine": 12},
     ]
     validate_folding(results[1], ref)
 
 
-def test_mline_sub_folding():
+def test_folding_subroutine():
     """Test the ranges for several blocks are correct"""
     string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
-    file_path = test_dir / "subdir" / "test_mline_sub_folding.f90"
+    file_path = test_dir / "subdir" / "test_folding_subroutine.f90"
     string += folding_req(file_path)
     errcode, results = run_request(string)
     assert errcode == 0
+    print(results[1])
     ref = [
-        {"startLine": 0, "endLine": 3},
-        {"startLine": 4, "endLine": 14},
-        {"startLine": 0, "endLine": 4},
-        {"startLine": 6, "endLine": 9},
-        {"startLine": 12, "endLine": 13},
+        {"startLine": 1, "endLine": 4},
+        {"startLine": 5, "endLine": 17},
+        {"startLine": 1, "endLine": 5},
+        {"startLine": 8, "endLine": 11},
+        {"startLine": 15, "endLine": 16},
     ]
     validate_folding(results[1], ref)

test/test_source/subdir/test_if_folding.f90 renamed to test/test_source/subdir/test_folding_if.f90

@@ -1,12 +1,13 @@
-program test_if_folding
+program if
 
+!test comment folding
     ! adding some comment lines
     ! to check is comment folding
     ! works
     ! as expected
 
-        implicit none
-        integer   :: i, j
+implicit none
+integer   :: i, j
 
         if (i > 0 .and. j > 0) then
             if (i > j) then
@@ -41,4 +42,4 @@ program test_if_folding
         print*, "something else"
         end if
 
-    end program test_if_folding
+    end program if

test/test_source/subdir/test_select_case_folding.f90 renamed to test/test_source/subdir/test_folding_select_case.f90

@@ -1,3 +1,7 @@
+program select_case
+
+integer :: to_test, six
+
 select case (to_test)
 case (1)
     six = 6*to_test
@@ -8,3 +12,5 @@
 case default
     six = 6
 end select
+
+end program select_case

test/test_source/subdir/test_mline_sub_folding.f90 renamed to test/test_source/subdir/test_folding_subroutine.f90

@@ -1,15 +1,18 @@
+!test folding of subroutine arguments and of subroutine body
 subroutine too_many_args(one, two, &
     three,    &
     four,     &
     five,     &
     six       )
 
+!test multiline folding
 integer, intent(in)  :: one, two,&
      three,   &
      four,    &
      five
 integer, intent(out) :: six
 
+!test_multiline_folding
 six = five + one + four - two + &
 2*three