Fix test cases under XP

N++ under returns short filenames for the various temp / session files
Tests altered to normalise all filenames to the long filename (using ctypes)

Author: bruderstein

PythonScript/python_tests/tests/NotepadWrapperTestCase.py

@@ -4,6 +4,8 @@
 import os
 import shlex
 import tempfile
+import ctypes
+
 from Npp import *
 
 class NotepadTestCase(unittest.TestCase):
@@ -162,7 +164,7 @@ def test_getFiles(self):
         # python temp files are all lowercase, so make the filenames from getFiles lowercase too
         lowercaseFiles = []
         for entry in files:
-            lowercaseFiles.append((entry[0].lower(), entry[1], entry[2], entry[3]))
+            lowercaseFiles.append((self.normalise_filename(entry[0]), entry[1], entry[2], entry[3]))
 
         # clean up
         notepad.activateBufferID(bufferID1)
@@ -172,8 +174,8 @@ def test_getFiles(self):
         editor.setSavePoint()
         notepad.close()
 
-        self.assertIn((file1, bufferID1, index1, 0), lowercaseFiles)
-        self.assertIn((file2, bufferID2, index2, 0), lowercaseFiles)
+        self.assertIn((self.normalise_filename(file1), bufferID1, index1, 0), lowercaseFiles)
+        self.assertIn((self.normalise_filename(file2), bufferID2, index2, 0), lowercaseFiles)
         self.assertEqual(len(files), 2)
 
 
@@ -212,6 +214,12 @@ def test_saveLoadSession(self):
         self.assertEqual(file1Content, 'File 1 session')
         self.assertEqual(file2Content, 'File 2 session')
 
+    def normalise_filename(self, filename):
+        buf = ctypes.create_unicode_buffer(260)
+        GetLongPathName = ctypes.windll.kernel32.GetLongPathNameW
+        GetLongPathName(filename.decode('windows-1252'), buf, 260)
+        return buf.value.lower()
+
     def test_getSessionFiles(self):
         # Create and open two files
         file1 = self.get_temp_filename()
@@ -232,8 +240,8 @@ def test_getSessionFiles(self):
         notepad.close()
         notepad.activateFile(file2)
         notepad.close()
-
-        self.assertEqual(sessionFiles, [file1, file2])
+        normalisedSessionFiles = [self.normalise_filename(f) for f in sessionFiles]
+        self.assertEqual(normalisedSessionFiles, [self.normalise_filename(file1), self.normalise_filename(file2)])
 
     def test_saveCurrentSession(self):
 
@@ -256,10 +264,10 @@ def test_saveCurrentSession(self):
         notepad.close()
 
         sessionFiles = notepad.getSessionFiles(sessionFile)
-        lowercaseSessionFiles = [file.lower() for file in sessionFiles]
+        lowercaseSessionFiles = [self.normalise_filename(file) for file in sessionFiles]
 
-        self.assertIn(file1, lowercaseSessionFiles)
-        self.assertIn(file2, lowercaseSessionFiles)
+        self.assertIn(self.normalise_filename(file1), lowercaseSessionFiles)
+        self.assertIn(self.normalise_filename(file2), lowercaseSessionFiles)
 
 
     def test_reloadFile(self):

PythonScript/python_tests/tests/ScintillaWrapperTestCase.py

@@ -243,6 +243,8 @@ def test_scintillawrapper_position_void_void(self):
         self.assertEqual(position, 4)
 
     def callback_scintillawrapper_position_void_void(self, args):
+        if args["modificationType"] & MODIFICATIONFLAGS.INSERTTEXT == 0:   # Ignore anything that isn't INSERTTEXT
+            return
         editor.clearCallbacks()
         editor.write("1234")
         position = editor.getCurrentPos()