test

Author: PolarGoose

build.ps1

@@ -79,11 +79,35 @@ Info "Build project"
     $root/DOpusScriptingExtensions.sln
 CheckReturnCodeOfPreviousCommand "build failed"
 
+Info "Run unit tests"
+& "$buildDir/x64/Release/UnitTest.exe"
+CheckReturnCodeOfPreviousCommand "unit tests failed"
+
+Info "Uninstall the existing DOpusScriptingExtensions"
+Info "Search if DOpusScriptingExtensions is installed"
+$app = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -match "DOpusScriptingExtensions" }
+if ($app) {
+  Info "Uninstall existing DOpusScriptingExtensions installation"
+  $app.Uninstall()
+}
+
+$installerPath = Resolve-Path "$buildDir/x64/Release/Installer.msi"
+Info "Install $installerPath"
+$msiexecProcess = Start-Process -FilePath "msiexec.exe" `
+                            -ArgumentList @("/i", $installerPath,
+                                            "/norestart",
+                                            "/L*v", "$buildDir/Installer.log") `
+                            -Wait `
+                            -PassThru
+if ($msiexecProcess.ExitCode -ne 0) {
+  Error "installation failed"
+}
+
 Info "Run tests"
 cscript $root/src/test/test.js
 CheckReturnCodeOfPreviousCommand "tests failed"
 
 Info "Copy installer to the Publish directory and create zip archive"
 New-Item -Force -ItemType "directory" $buildDir/Publish > $null
-Copy-Item -Force -Path $buildDir/x64/Release/Installer/Installer.msi -Destination $buildDir/Publish/DOpusScriptingExtensions.msi > $null
+Copy-Item -Force -Path $buildDir/x64/Release/Installer.msi -Destination $buildDir/Publish/DOpusScriptingExtensions.msi > $null
 Compress-Archive -Force -Path $buildDir/Publish/DOpusScriptingExtensions.msi -DestinationPath $buildDir/Publish/DOpusScriptingExtensions.msi.zip

src/DOpusScriptingExtensions/FileLockingInfoProvider/LockedFilesDatabase.h

@@ -92,13 +92,16 @@ class LockedFilesDatabase final : private boost::noncopyable {
       }
     }
     catch (const std::exception&) {
-      /* ignore the exception and exit the thread */
+
     }
   }
 
   // Examples:
   // * "C:\Test\File.txt" -> "c:\test\file.txt"
+  // * "C:/Test/File.txt" -> "c:\test\file.txt"
   // * "C:\Test\Directory" -> "c:\test\directory\"
+  // * "C:\Test\Directory\\" -> "c:\test\directory\"
+  // * "C:\Test\Directory\" -> "c:\test\directory\"
   static void NormalizeFilePath(std::wstring& path) {
     path = std::filesystem::canonical(path);
     if (std::filesystem::is_directory(path) && !path.ends_with(L'\\')) {

src/ProcessHandlesService/main.cpp

@@ -34,7 +34,7 @@ static void WINAPI ServiceMain(const DWORD /* argc */, LPWSTR* /* argv */) {
 
   SetState(serviceStatusHandle, SERVICE_RUNNING);
 
-  SPDLOG_INFO("ServiceMain wait for stop");
+  SPDLOG_INFO("ServiceMain waiting for stop signal");
   g_stopEvent.WaitForNotification();
 
   SPDLOG_INFO("ServiceMain stop signal received");
@@ -49,13 +49,15 @@ int main() {
                                                         /* max_files     */ 2));
   spdlog::flush_every(std::chrono::seconds(2));
 
+  SPDLOG_INFO("Initialize ProcessHandlesServiceGrpcImpl");
+  ProcessHandlesServiceGrpcImpl processHandlesServiceGrpc;
   SPDLOG_INFO("Start GRPC server on port 43786");
+  std::unique_ptr<grpc::Server> grpcServer;
   try {
     grpc::ServerBuilder builder;
-    ProcessHandlesServiceGrpcImpl processHandlesServiceGrpc;
     builder.AddListeningPort("127.0.0.1:43786", grpc::InsecureServerCredentials());
     builder.RegisterService(&processHandlesServiceGrpc);
-    const auto grpcServer = builder.BuildAndStart();
+    grpcServer = builder.BuildAndStart();
     SPDLOG_INFO("GRPC server started");
   } catch (const std::exception& ex) {
     SPDLOG_ERROR("Failed to start GRPC server: {}", ex.what());
@@ -66,6 +68,7 @@ int main() {
                                    { nullptr, nullptr } };
 
   if (!StartServiceCtrlDispatcherW(table)) {
+    SPDLOG_INFO("Failed to call StartServiceCtrlDispatcherW");
     return static_cast<int>(GetLastError());
   }