make FontStyle tests more robust and cleanups

Author: Ekopalypse

PythonScript/python_tests/RunTests.py

@@ -14,7 +14,6 @@ def main():
     ) == MESSAGEBOXFLAGS.RESULTNO:
         return
 
-
     # unittest module expects argv to be set
     sys.argv = ['']
 

PythonScript/python_tests/tests/test_NotepadWrapperTestCase.py

@@ -1603,7 +1603,7 @@ def test_lineNumberWidthMode(self):
             revert_changed_mode = notepad.getLineNumberWidthMode()
             self.assertTrue(revert_changed_mode == mode, msg="Expected same modes, got {} and {}".format(mode, changed_mode))
 
-
+    # TODO: How can this be tested in a meaningful way?
     def test_getExternalLexerAutoIndentMode(self):
         ''' '''
         notepad_method = notepad.getExternalLexerAutoIndentMode
@@ -1618,19 +1618,20 @@ def test_getExternalLexerAutoIndentMode(self):
         with self.assertRaises(ArgumentError):
             self._invalid_parameter_passed(notepad_method, '','')
 
-
+    # TODO: How can this be tested in a meaningful way?
     def test_setExternalLexerAutoIndentMode(self):
         ''' '''
         self.__test_invalid_parameter_passed(notepad.setExternalLexerAutoIndentMode)
 
-
+    # TODO: How can this be tested in a meaningful way?
     def test_isAutoIndention(self):
         ''' '''
         self.__test_invalid_parameter_passed(notepad.isAutoIndention)
 
 
+suite = unittest.TestLoader().loadTestsFromTestCase(NotepadTestCase)
+
 if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(NotepadTestCase)
     alltests = unittest.TestSuite(suite)
 
     results = unittest.TestResult()
@@ -1653,10 +1654,7 @@ def writeTestFailure(error):
         console.writeError('Tests Run: {}\n  Errors  : {}\n  Failures: {}\n'.format(results.testsRun, len(results.errors), len(results.failures)))
     else:
         console.write('Tests Run: {}\n  Errors  : {}\n  Failures: {}\n'.format(results.testsRun, len(results.errors), len(results.failures)))
-        if results.skipped:
-            console.write('Skipped: {}\n'.format(len(results.skipped)))
-            for skipped_test in results.skipped:
-                console.write('     {}  -  {}\n'.format(skipped_test[0], skipped_test[1]))
-    # console.show()
-else:
-    suite = unittest.TestLoader().loadTestsFromTestCase(NotepadTestCase)
+    if results.skipped:
+        console.write('Skipped: {}\n'.format(len(results.skipped)))
+        for skipped_test in results.skipped:
+            console.write('     {}  -  {}\n'.format(skipped_test[0], skipped_test[1]))

PythonScript/python_tests/tests/test_ScintillaWrapperTestCase.py

@@ -347,8 +347,11 @@ def callback_scintillawrapper_void_int_string(self, args):
 
     def test_scintillawrapper_void_int_string_in_callback(self):
         editor.callback(lambda args: self.callback_scintillawrapper_void_int_string(args), [SCINTILLANOTIFICATION.MODIFIED])
+        original_mask = editor.getModEventMask()
+        editor.setModEventMask(MODIFICATIONFLAGS.INSERTTEXT)
         editor.write("test")
         self.poll_for_callback()
+        editor.setModEventMask(original_mask)
         self.assertEqual(self.callbackCalled, True)
 
     def test_scintillawrapper_int_void_void(self):
@@ -634,11 +637,13 @@ def callback_scintillawrapper_int_int_stringresult_styleGetFont(self, args):
 
     def test_scintillawrapper_int_int_stringresult_in_callback_styleGetFont(self):
         editor.callback(lambda args: self.callback_scintillawrapper_int_int_stringresult_styleGetFont(args), [SCINTILLANOTIFICATION.MODIFIED])
+        original_mask = editor.getModEventMask()
+        editor.setModEventMask(MODIFICATIONFLAGS.INSERTTEXT)
         editor.write("test")
         self.poll_for_callback()
+        editor.setModEventMask(original_mask)
         self.assertEqual(self.callbackCalled, True)
 
-
     def callback_scintillawrapper_int_int_stringresult_getLine(self, args):
         lineTwo = editor.getLine(1)
         lineThree = editor.getLine(2)