FixUp: tests broken by overzealous checking in java tests; we can probably relax a lot of these now

Author: puremourning

ycmd/tests/java/subcommands_test.py

@@ -27,7 +27,6 @@
                        instance_of,
                        is_not,
                        matches_regexp )
-from pprint import pformat
 import itertools
 import requests
 import json
@@ -108,15 +107,16 @@ def RunTest( app, test, contents = None ):
         expect_errors = True
       )
 
-      print( f'completer response: { pformat( response.json ) }' )
-
       assert_that( response.status_code,
                    equal_to( test[ 'expect' ][ 'response' ] ) )
 
       assert_that( response.json, test[ 'expect' ][ 'data' ] )
       break
     except AssertionError:
       if time.time() > expiry:
+        print( 'completer response: '
+               f'{ json.dumps( response.json, indent=2 ) }' )
+
         raise
 
       time.sleep( 0.25 )
@@ -1089,6 +1089,10 @@ def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
                               LocationMatcher( filepath, 25, 5 ) ),
               ),
             } ),
+            has_entries( {
+              'kind': 'quickassist',
+              'text': "Add Javadoc for 'Wimble'"
+            } ),
           )
         } )
 
@@ -1147,6 +1151,9 @@ def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
               LocationMatcher( filepath, 25, 5 ) ),
           ),
         } ),
+        has_entries( {
+          'text': "Add Javadoc for 'getWidget'"
+        } ),
       )
     } )
 
@@ -1179,21 +1186,42 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
         # FixIt (and nonetheless, the previous tests ensure that we correctly
         # populate the chunks list; the contents all come from jdt.ls)
         has_entries( {
-          'text': "Create getter and setter for 'testString'",
+          'text': "Organize imports",
           'chunks': instance_of( list )
         } ),
         has_entries( {
-          'text': "Organize imports",
+          'text': "Generate Getter and Setter for 'testString'",
           'chunks': instance_of( list )
         } ),
         has_entries( {
           'text': "Generate Getters and Setters",
           'chunks': instance_of( list )
         } ),
+        has_entries( {
+          'text': "Generate Getters",
+          'chunks': instance_of( list )
+        } ),
+        has_entries( {
+          'text': "Generate Setters",
+          'chunks': instance_of( list )
+        } ),
+        has_entries( {
+          'text': "Generate Getter for 'testString'",
+          'chunks': instance_of( list )
+        } ),
+        has_entries( {
+          'text': "Generate Setter for 'testString'",
+          'chunks': instance_of( list )
+        } ),
         has_entries( {
           'text': 'Change modifiers to final where possible',
           'chunks': instance_of( list )
         } ),
+        has_entries( {
+          'kind': 'quickassist',
+          'text': "Add Javadoc for 'testString'",
+          'chunks': instance_of( list )
+        } ),
       )
     } )
 
@@ -1272,6 +1300,10 @@ def test_Subcommands_FixIt_MultipleDiags( self, app ):
             'text': 'Change modifiers to final where possible',
             'chunks': instance_of( list ),
           } ),
+          has_entries( {
+            'text': "Add Javadoc for 'getWidget'",
+            'chunks': instance_of( list ),
+          } ),
         ]
 
         FIXITS = {
@@ -1396,6 +1428,10 @@ def test_Subcommands_FixIt_Range( self, app ):
               'text': 'Change modifiers to final where possible',
               'chunks': instance_of( list ),
             } ),
+            has_entries( {
+              'text': "Add Javadoc for 'launch'",
+              'chunks': instance_of( list ),
+            } ),
           )
         } )
       }
@@ -1460,10 +1496,19 @@ def test_Subcommands_FixIt_Unicode( self, app ):
           'text': 'Change modifiers to final where possible',
           'chunks': instance_of( list ),
         } ),
+        has_entries( {
+          'text': "Generate Getters",
+        } ),
+        has_entries( {
+          'text': "Generate Setters",
+        } ),
         has_entries( {
           'text': "Generate Getters and Setters",
           'chunks': instance_of( list ),
         } ),
+        has_entries( {
+          'text': "Add Javadoc for 'DoWhatever'"
+        } ),
       )
     } )
 
@@ -1525,6 +1570,9 @@ def test_Subcommands_FixIt_InvalidURI( self, app ):
                           LocationMatcher( '', 32, 4 ) ),
           ),
         } ),
+        has_entries( {
+          'text': "Add Javadoc for 'getWidget'"
+        } ),
       )
     } )
 
@@ -1638,6 +1686,9 @@ def test_Subcommands_Format_WholeFile_Spaces( self, app ):
               ChunkMatcher( '\n    ',
                             LocationMatcher( TEST_JAVA, 24, 27 ),
                             LocationMatcher( TEST_JAVA, 25,  3 ) ),
+              ChunkMatcher( '\n',
+                            LocationMatcher( TEST_JAVA, 26, 2 ),
+                            LocationMatcher( TEST_JAVA, 28, 1 ) ),
             )
           } ) )
         } )
@@ -1724,6 +1775,9 @@ def test_Subcommands_Format_WholeFile_Tabs( self, app ):
               ChunkMatcher( '\n\t',
                             LocationMatcher( TEST_JAVA, 24, 27 ),
                             LocationMatcher( TEST_JAVA, 25,  3 ) ),
+              ChunkMatcher( '\n',
+                            LocationMatcher( TEST_JAVA, 26, 2 ),
+                            LocationMatcher( TEST_JAVA, 28, 1 ) ),
             )
           } ) )
         } )