From e85d24b03a5c7883f39d59cc4463ce64d2852a54 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Imbert Date: Sun, 7 Sep 2014 00:05:07 +0200 Subject: [PATCH] Fix Issue #29 : - disable events during configuration recreation 430 tests OK. No failure. --- Source/ConfProd/vtkImportExportUtilities.bas | 2 ++ Source/VbaUnit/TestClassLister.cls | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/ConfProd/vtkImportExportUtilities.bas b/Source/ConfProd/vtkImportExportUtilities.bas index 2c3b1dc..a898f01 100644 --- a/Source/ConfProd/vtkImportExportUtilities.bas +++ b/Source/ConfProd/vtkImportExportUtilities.bas @@ -380,6 +380,7 @@ Public Sub vtkRecreateConfiguration(projectName As String, configurationName As Dim fso As New FileSystemObject On Error GoTo vtkRecreateConfiguration_Error + Application.EnableEvents = False ' Get the Conf Manager and the rootPath of the project If confManager Is Nothing Then @@ -456,6 +457,7 @@ Public Sub vtkRecreateConfiguration(projectName As String, configurationName As Wb.IsAddin = vtkDefaultIsAddIn(wbPath) Wb.SaveAs fileName:=tmpPath, FileFormat:=vtkDefaultFileFormat(wbPath) Wb.Close saveChanges:=False + Application.EnableEvents = True ' Delete the old workbook if it exists Dim fullWbpath As String diff --git a/Source/VbaUnit/TestClassLister.cls b/Source/VbaUnit/TestClassLister.cls index f3b54b7..7254af4 100644 --- a/Source/VbaUnit/TestClassLister.cls +++ b/Source/VbaUnit/TestClassLister.cls @@ -50,20 +50,20 @@ Public Function SelectTestClass(TestClassName As String) As ITest Case "vtkToolBarsTester": Set SelectTestClass = New vtkToolBarsTester Case "vtkExportOneModuleTester": Set SelectTestClass = New vtkExportOneModuleTester Case "vtkGitFunctionsTester": Set SelectTestClass = New vtkGitFunctionsTester + Case "vtkFileSystemUtilitiesTester": Set SelectTestClass = New vtkFileSystemUtilitiesTester Case "vtkConfigurationTester": Set SelectTestClass = New vtkConfigurationTester Case "vtkModuleTester": Set SelectTestClass = New vtkModuleTester Case "vtkExportConfigurationTester": Set SelectTestClass = New vtkExportConfigurationTester Case "vtkNormalizeTester": Set SelectTestClass = New vtkNormalizeTester + Case "vtkTestUtilitiesTester": Set SelectTestClass = New vtkTestUtilitiesTester Case "vtkXMLExportTester": Set SelectTestClass = New vtkXMLExportTester - Case "vtkFileSystemUtilitiesTester": Set SelectTestClass = New vtkFileSystemUtilitiesTester Case "vtkRecreateConfExcelTester": Set SelectTestClass = New vtkRecreateConfExcelTester Case "vtkExcelUtilitiesTester": Set SelectTestClass = New vtkExcelUtilitiesTester - Case "vtkConfManagerExcel10Tester": Set SelectTestClass = New vtkConfManagerExcel10Tester - Case "vtkConfManagerExcel11Tester": Set SelectTestClass = New vtkConfManagerExcel11Tester - Case "vtkTestUtilitiesTester": Set SelectTestClass = New vtkTestUtilitiesTester Case "vtkReferenceManagerTester": Set SelectTestClass = New vtkReferenceManagerTester Case "vtkConfManagerXML20Tester": Set SelectTestClass = New vtkConfManagerXML20Tester Case "vtkRecreateConfXMLTester": Set SelectTestClass = New vtkRecreateConfXMLTester + Case "vtkConfManagerExcel10Tester": Set SelectTestClass = New vtkConfManagerExcel10Tester + Case "vtkConfManagerExcel11Tester": Set SelectTestClass = New vtkConfManagerExcel11Tester Case Else: End Select End Function