Merge pull request #133 from Ekopalypse/AdaptTestsToSci420

Adapt tests to sci420

Author: chcg

PythonScript/python_tests/tests/NotepadWrapperTestCase.py

@@ -10,7 +10,7 @@
 from threading import Timer
 import subprocess
 
-from Npp import *
+from Npp import notepad, editor, console, WINVER, LANGTYPE, MENUCOMMAND, BUFFERENCODING
 
 EnumWindowsProc = ctypes.WINFUNCTYPE(ctypes.c_bool,
                                      ctypes.wintypes.HWND,
@@ -193,7 +193,7 @@ def test_saveAsCopy(self):
         copyFilename = self.get_temp_filename()
         notepad.saveAs(realFilename)
         notepad.saveAsCopy(copyFilename)
-        editor.write('-OriginalChanged')
+        editor.appendText('-OriginalChanged')
         notepad.save()
         notepad.close()
         self.check_file_contents(realFilename, 'Hello world - saveAsCopy-OriginalChanged')
@@ -693,7 +693,7 @@ def test_getAppdataPluginsAllowed(self):
         npp_dir = notepad.getNppDir()
         appdata_plugins_allowed_file = os.path.join(npp_dir, 'allowAppDataPlugins.xml')
         appdata_plugins_allowed = os.path.exists(appdata_plugins_allowed_file)
-        do_local_conf_file = os.path.join(npp_dir, 'doLocalConf.xml')
+        _ = os.path.join(npp_dir, 'doLocalConf.xml')
         do_local_conf = os.path.exists(appdata_plugins_allowed_file)
 
         if appdata_plugins_allowed and do_local_conf:
@@ -854,9 +854,13 @@ def test_getNbUserLang(self):
         self.__test_invalid_parameter_passed(notepad.getNbUserLang)
         number_of_udls = notepad.getNbUserLang()
         userdefined_xml_file = os.path.join(self._get_config_directory(), r'userDefineLang.xml')
+        userdefined_xml_path = os.path.join(self._get_config_directory(), r'userDefineLangs')
+        number_of_user_langs_from_xml = 0
         if os.path.exists(userdefined_xml_file):
             udl_doc = et.parse(userdefined_xml_file)
-            number_of_user_langs_from_xml = len(udl_doc.findall('UserLang'))
+            number_of_user_langs_from_xml += len(udl_doc.findall('UserLang'))
+        if os.path.exists(userdefined_xml_path):
+            number_of_user_langs_from_xml += len([x for x in os.listdir(userdefined_xml_path) if x.endswith('.xml')])
         else:
             number_of_user_langs_from_xml = 0
         self.assertIsInstance(number_of_udls, int)

PythonScript/python_tests/tests/ReplaceAnsiPythonFunction.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
-from Npp import *
+from Npp import notepad, editor
 
 counter = 0
 
@@ -26,7 +26,7 @@ def setUp(self):
         global counter
         counter = 0
         notepad.new()
-        notepad.runMenuCommand("Encoding", "Encode in ANSI")
+        notepad.runMenuCommand("Encoding", "Convert to ANSI")
         editor.write(u'abc123 def5432 gh98\r\näbc123 üef5432 öh98\r\n'.encode('windows-1252'))
 
     def tearDown(self):

PythonScript/python_tests/tests/ReplaceAnsiTestCase.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 import unittest
-from Npp import *
+from Npp import notepad, editor
 
 class ReplaceAnsiTestCase(unittest.TestCase):
     def setUp(self):
         notepad.new()
-        notepad.runMenuCommand("Encoding", "Encode in ANSI")
+        notepad.runMenuCommand("Encoding", "Convert to ANSI")
         editor.write(u'Here is some text\r\nWith some umlauts XäXüXö\r\n'.encode('windows-1252'));
 
     def tearDown(self):

PythonScript/python_tests/tests/ScintillaWrapperTestCase.py

@@ -2,7 +2,10 @@
 import unittest
 import time
 
-from Npp import *
+from Npp import (
+    editor, notepad, SCINTILLANOTIFICATION, FINDOPTION, KEYMOD,
+    SCINTILLAMESSAGE, LEXER, MODIFICATIONFLAGS, LANGTYPE, Cell
+    )
 
 
 class ScintillaWrapperTestCase(unittest.TestCase):
@@ -801,7 +804,7 @@ def test_scintillawrapper_colour_int_void_in_callback(self):
         self.assertEqual(self.callbackCalled, True)
 
     def test_scintillawrapper_bool_int_void(self):
-        original = editor.getMarginSensitiveN(1)
+        _ = editor.getMarginSensitiveN(1)
         editor.setMarginSensitiveN(1, True)
         shouldBeTrue = editor.getMarginSensitiveN(1)
         editor.setMarginSensitiveN(1, False)
@@ -820,7 +823,7 @@ def test_scintillawrapper_bool_int_void_in_callback(self):
         self.assertEqual(self.callbackCalled, True)
 
     def test_scintillawrapper_void_void_string_lexerLanguage(self):
-        original = editor.getLexerLanguage()
+        _ = editor.getLexerLanguage()
         editor.setLexerLanguage('python')
         python = editor.getLexerLanguage()
         self.assertEqual(python, 'python')