diff --git a/SafeExamBrowser.Browser/BrowserApplicationController.cs b/SafeExamBrowser.Browser/BrowserApplicationController.cs index 57efa3b8..da7a6592 100644 --- a/SafeExamBrowser.Browser/BrowserApplicationController.cs +++ b/SafeExamBrowser.Browser/BrowserApplicationController.cs @@ -10,7 +10,7 @@ using System; using System.Collections.Generic; using System.Linq; using CefSharp; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Browser; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.I18n; diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs index 811a58fd..408eb4b1 100644 --- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs +++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs @@ -7,8 +7,8 @@ */ using SafeExamBrowser.Browser.Handlers; -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.Events; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.Events; using SafeExamBrowser.Contracts.Browser; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; diff --git a/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs b/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs index bcc743e2..8545c4dd 100644 --- a/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs +++ b/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; namespace SafeExamBrowser.Browser { diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs index 571a9b6b..7ff5eebe 100644 --- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs +++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; //using Moq; //using SafeExamBrowser.Client.Behaviour; -//using SafeExamBrowser.Contracts.Behaviour.OperationModel; +//using SafeExamBrowser.Contracts.Core.OperationModel; //using SafeExamBrowser.Contracts.Communication.Proxies; //using SafeExamBrowser.Contracts.Logging; //using SafeExamBrowser.Contracts.Monitoring; diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/BrowserOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs similarity index 93% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/BrowserOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs index 690fe4d9..dea65dfb 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/BrowserOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs @@ -8,14 +8,14 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class BrowserOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ClipboardOperationTests.cs similarity index 90% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/ClipboardOperationTests.cs index 2189efbe..638eafab 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/ClipboardOperationTests.cs @@ -8,11 +8,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class ClipboardOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/DisplayMonitorOperationTests.cs similarity index 94% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/DisplayMonitorOperationTests.cs index 71fba235..a35e99bf 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/DisplayMonitorOperationTests.cs @@ -8,12 +8,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class DisplayMonitorOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/KeyboardInterceptorOperationTests.cs similarity index 92% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/KeyboardInterceptorOperationTests.cs index 30cfce8d..b6f399c7 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/KeyboardInterceptorOperationTests.cs @@ -8,12 +8,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class KeyboardInterceptorOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/MouseInterceptorOperationTests.cs similarity index 92% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/MouseInterceptorOperationTests.cs index 6c0d3eaa..1f8815b8 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/MouseInterceptorOperationTests.cs @@ -8,12 +8,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class MouseInterceptorOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs similarity index 94% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs index 1261d3fa..8a3c5259 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs @@ -8,12 +8,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class ProcessMonitorOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs similarity index 95% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs index 981fca16..d0457e54 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs @@ -8,8 +8,8 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Client.Operations; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.I18n; @@ -18,7 +18,7 @@ using SafeExamBrowser.Contracts.SystemComponents; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class TaskbarOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs similarity index 93% rename from SafeExamBrowser.Client.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs rename to SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs index 66a47178..3a9aff8e 100644 --- a/SafeExamBrowser.Client.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs @@ -8,11 +8,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Client.Behaviour.Operations; +using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; -namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Client.UnitTests.Operations { [TestClass] public class WindowMonitorOperationTests diff --git a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj index 48c27aad..3a1067c9 100644 --- a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj +++ b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj @@ -77,14 +77,14 @@ - - - - - - - - + + + + + + + + @@ -101,6 +101,10 @@ {7CC5A895-E0D3-4E43-9B39-CCEC05A5A6A7} SafeExamBrowser.Client + + {c9416a62-0623-4d38-96aa-92516b32f02f} + SafeExamBrowser.Communication + {47DA5933-BEF8-4729-94E6-ABDE2DB12262} SafeExamBrowser.Contracts diff --git a/SafeExamBrowser.Client/Behaviour/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs similarity index 98% rename from SafeExamBrowser.Client/Behaviour/ClientController.cs rename to SafeExamBrowser.Client/ClientController.cs index 5973a041..07f47a62 100644 --- a/SafeExamBrowser.Client/Behaviour/ClientController.cs +++ b/SafeExamBrowser.Client/ClientController.cs @@ -9,8 +9,6 @@ using System; using System.ComponentModel; using System.IO; -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Browser; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Events; @@ -18,6 +16,8 @@ using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; @@ -27,7 +27,7 @@ using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Windows; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.Behaviour +namespace SafeExamBrowser.Client { internal class ClientController : IClientController { diff --git a/SafeExamBrowser.Client/Communication/ClientHost.cs b/SafeExamBrowser.Client/Communication/ClientHost.cs index 732edc39..6d0da5bd 100644 --- a/SafeExamBrowser.Client/Communication/ClientHost.cs +++ b/SafeExamBrowser.Client/Communication/ClientHost.cs @@ -11,7 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Hosts; +using SafeExamBrowser.Communication.Hosts; namespace SafeExamBrowser.Client.Communication { diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index cfe7bdb0..09a99a4b 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -9,29 +9,31 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; +using System.Reflection; using SafeExamBrowser.Browser; -using SafeExamBrowser.Client.Behaviour; -using SafeExamBrowser.Client.Behaviour.Operations; using SafeExamBrowser.Client.Communication; using SafeExamBrowser.Client.Notifications; +using SafeExamBrowser.Client.Operations; +using SafeExamBrowser.Communication.Hosts; +using SafeExamBrowser.Communication.Proxies; using SafeExamBrowser.Configuration; -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Browser; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.MessageBox; using SafeExamBrowser.Contracts.WindowsApi; -using SafeExamBrowser.Core.Behaviour.OperationModel; -using SafeExamBrowser.Core.Communication.Hosts; -using SafeExamBrowser.Core.Communication.Proxies; -using SafeExamBrowser.Core.I18n; -using SafeExamBrowser.Core.Logging; +using SafeExamBrowser.Core.OperationModel; +using SafeExamBrowser.Core.Operations; +using SafeExamBrowser.I18n; +using SafeExamBrowser.Logging; using SafeExamBrowser.Monitoring.Display; using SafeExamBrowser.Monitoring.Keyboard; using SafeExamBrowser.Monitoring.Mouse; @@ -59,6 +61,7 @@ namespace SafeExamBrowser.Client private IRuntimeProxy runtimeProxy; private ISystemInfo systemInfo; private IText text; + private ITextResource textResource; private IUserInterfaceFactory uiFactory; internal IClientController ClientController { get; private set; } @@ -74,8 +77,8 @@ namespace SafeExamBrowser.Client systemInfo = new SystemInfo(); InitializeLogging(); + InitializeText(); - text = new Text(logger); messageBox = new MessageBox(text); processMonitor = new ProcessMonitor(new ModuleLogger(logger, typeof(ProcessMonitor)), nativeMethods); uiFactory = new UserInterfaceFactory(text); @@ -89,7 +92,7 @@ namespace SafeExamBrowser.Client var operations = new Queue(); - operations.Enqueue(new I18nOperation(logger, text)); + operations.Enqueue(new I18nOperation(logger, text, textResource)); operations.Enqueue(new RuntimeConnectionOperation(logger, runtimeProxy, startupToken)); operations.Enqueue(new ConfigurationOperation(configuration, logger, runtimeProxy)); operations.Enqueue(new DelegateOperation(UpdateAppConfig)); @@ -153,6 +156,15 @@ namespace SafeExamBrowser.Client logger.Subscribe(logFileWriter); } + private void InitializeText() + { + var location = Assembly.GetAssembly(typeof(XmlTextResource)).Location; + var path = $@"{Path.GetDirectoryName(location)}\Text.xml"; + + text = new Text(logger); + textResource = new XmlTextResource(path); + } + private IOperation BuildBrowserOperation() { var moduleLogger = new ModuleLogger(logger, "BrowserController"); diff --git a/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs b/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs index cb411a43..a708a3d7 100644 --- a/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs +++ b/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; diff --git a/SafeExamBrowser.Client/Notifications/LogNotificationController.cs b/SafeExamBrowser.Client/Notifications/LogNotificationController.cs index 6cc4b1a4..845fc6a9 100644 --- a/SafeExamBrowser.Client/Notifications/LogNotificationController.cs +++ b/SafeExamBrowser.Client/Notifications/LogNotificationController.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; diff --git a/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs b/SafeExamBrowser.Client/Operations/BrowserOperation.cs similarity index 92% rename from SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs rename to SafeExamBrowser.Client/Operations/BrowserOperation.cs index 260513da..de7b0c62 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs +++ b/SafeExamBrowser.Client/Operations/BrowserOperation.cs @@ -6,15 +6,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class BrowserOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs b/SafeExamBrowser.Client/Operations/ClipboardOperation.cs similarity index 91% rename from SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs rename to SafeExamBrowser.Client/Operations/ClipboardOperation.cs index acf187c4..681caf96 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs +++ b/SafeExamBrowser.Client/Operations/ClipboardOperation.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class ClipboardOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs similarity index 94% rename from SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs rename to SafeExamBrowser.Client/Operations/ConfigurationOperation.cs index f308deb7..c78fce78 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs +++ b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs @@ -7,14 +7,14 @@ */ using System; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class ConfigurationOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs b/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs similarity index 93% rename from SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs rename to SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs index aae069ab..8bd8896a 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class DisplayMonitorOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs b/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs similarity index 93% rename from SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs rename to SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs index 0098ee19..444ea1cd 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs +++ b/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class KeyboardInterceptorOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs b/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs similarity index 93% rename from SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs rename to SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs index 85ae98ae..d47c173a 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs +++ b/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class MouseInterceptorOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs similarity index 93% rename from SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs rename to SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs index 0516e0da..92f0f9d1 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class ProcessMonitorOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs b/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs similarity index 94% rename from SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs rename to SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs index d4f4daee..5d20ac3a 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs +++ b/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs @@ -7,13 +7,13 @@ */ using System; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class RuntimeConnectionOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs b/SafeExamBrowser.Client/Operations/TaskbarOperation.cs similarity index 96% rename from SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs rename to SafeExamBrowser.Client/Operations/TaskbarOperation.cs index 14f8d695..e5174df4 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs +++ b/SafeExamBrowser.Client/Operations/TaskbarOperation.cs @@ -6,8 +6,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.I18n; @@ -16,7 +16,7 @@ using SafeExamBrowser.Contracts.SystemComponents; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class TaskbarOperation : IOperation { diff --git a/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs similarity index 92% rename from SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs rename to SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs index d0b566d8..1f1b0c78 100644 --- a/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.Monitoring; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Client.Behaviour.Operations +namespace SafeExamBrowser.Client.Operations { internal class WindowMonitorOperation : IOperation { diff --git a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj index 735142bd..2f719d68 100644 --- a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj +++ b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj @@ -71,9 +71,9 @@ - - - + + + @@ -82,14 +82,14 @@ - - - - - - - - + + + + + + + + Code @@ -121,6 +121,10 @@ {04E653F1-98E6-4E34-9DD7-7F2BC1A8B767} SafeExamBrowser.Browser + + {c9416a62-0623-4d38-96aa-92516b32f02f} + SafeExamBrowser.Communication + {C388C4DD-A159-457D-AF92-89F7AD185109} SafeExamBrowser.Configuration @@ -133,6 +137,14 @@ {3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC} SafeExamBrowser.Core + + {10c62628-8e6a-45aa-9d97-339b119ad21d} + SafeExamBrowser.I18n + + + {e107026c-2011-4552-a7d8-3a0d37881df6} + SafeExamBrowser.Logging + {EF563531-4EB5-44B9-A5EC-D6D6F204469B} SafeExamBrowser.Monitoring diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostStub.cs b/SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostStub.cs similarity index 92% rename from SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostStub.cs rename to SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostStub.cs index f0c1165b..3cabe727 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostStub.cs +++ b/SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostStub.cs @@ -7,12 +7,12 @@ */ using System; +using SafeExamBrowser.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Hosts; -namespace SafeExamBrowser.Core.UnitTests.Communication.Hosts +namespace SafeExamBrowser.Communication.UnitTests.Hosts { internal class BaseHostStub : BaseHost { diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostTests.cs b/SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostTests.cs similarity index 99% rename from SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostTests.cs rename to SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostTests.cs index 508c265d..20c58198 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostTests.cs +++ b/SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostTests.cs @@ -16,7 +16,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.UnitTests.Communication.Hosts +namespace SafeExamBrowser.Communication.UnitTests.Hosts { [TestClass] public class BaseHostTests diff --git a/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..48de0933 --- /dev/null +++ b/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("SafeExamBrowser.Communication.UnitTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.Communication.UnitTests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("21137d66-7d01-4327-92d2-0304c25cd7df")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyImpl.cs b/SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyImpl.cs similarity index 92% rename from SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyImpl.cs rename to SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyImpl.cs index acf01418..a4e88a14 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyImpl.cs +++ b/SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyImpl.cs @@ -10,9 +10,9 @@ using System; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Proxies; +using SafeExamBrowser.Communication.Proxies; -namespace SafeExamBrowser.Core.UnitTests.Communication.Proxies +namespace SafeExamBrowser.Communication.UnitTests.Proxies { internal class BaseProxyImpl : BaseProxy { diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyTests.cs b/SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyTests.cs similarity index 99% rename from SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyTests.cs rename to SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyTests.cs index b2880f74..5a4e31de 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyTests.cs +++ b/SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyTests.cs @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.UnitTests.Communication.Proxies +namespace SafeExamBrowser.Communication.UnitTests.Proxies { [TestClass] public class BaseProxyTests diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/ClientProxyTests.cs b/SafeExamBrowser.Communication.UnitTests/Proxies/ClientProxyTests.cs similarity index 97% rename from SafeExamBrowser.Core.UnitTests/Communication/Proxies/ClientProxyTests.cs rename to SafeExamBrowser.Communication.UnitTests/Proxies/ClientProxyTests.cs index 652e0871..b0897a1a 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/ClientProxyTests.cs +++ b/SafeExamBrowser.Communication.UnitTests/Proxies/ClientProxyTests.cs @@ -13,9 +13,9 @@ using Moq; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Proxies; +using SafeExamBrowser.Communication.Proxies; -namespace SafeExamBrowser.Core.UnitTests.Communication.Proxies +namespace SafeExamBrowser.Communication.UnitTests.Proxies { [TestClass] public class ClientProxyTests diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/RuntimeProxyTests.cs b/SafeExamBrowser.Communication.UnitTests/Proxies/RuntimeProxyTests.cs similarity index 98% rename from SafeExamBrowser.Core.UnitTests/Communication/Proxies/RuntimeProxyTests.cs rename to SafeExamBrowser.Communication.UnitTests/Proxies/RuntimeProxyTests.cs index cf249bcb..c9142d4a 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/RuntimeProxyTests.cs +++ b/SafeExamBrowser.Communication.UnitTests/Proxies/RuntimeProxyTests.cs @@ -14,9 +14,9 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Proxies; +using SafeExamBrowser.Communication.Proxies; -namespace SafeExamBrowser.Core.UnitTests.Communication.Proxies +namespace SafeExamBrowser.Communication.UnitTests.Proxies { [TestClass] public class RuntimeProxyTests diff --git a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/ServiceProxyTests.cs b/SafeExamBrowser.Communication.UnitTests/Proxies/ServiceProxyTests.cs similarity index 95% rename from SafeExamBrowser.Core.UnitTests/Communication/Proxies/ServiceProxyTests.cs rename to SafeExamBrowser.Communication.UnitTests/Proxies/ServiceProxyTests.cs index c496e3a6..e3d45c6f 100644 --- a/SafeExamBrowser.Core.UnitTests/Communication/Proxies/ServiceProxyTests.cs +++ b/SafeExamBrowser.Communication.UnitTests/Proxies/ServiceProxyTests.cs @@ -13,9 +13,9 @@ using Moq; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Proxies; +using SafeExamBrowser.Communication.Proxies; -namespace SafeExamBrowser.Core.UnitTests.Communication.Proxies +namespace SafeExamBrowser.Communication.UnitTests.Proxies { [TestClass] public class ServiceProxyTests diff --git a/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj b/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj new file mode 100644 index 00000000..f8dc2db0 --- /dev/null +++ b/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj @@ -0,0 +1,116 @@ + + + + + + Debug + AnyCPU + {21137D66-7D01-4327-92D2-0304C25CD7DF} + Library + Properties + SafeExamBrowser.Communication.UnitTests + SafeExamBrowser.Communication.UnitTests + v4.5.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Moq.4.9.0\lib\net45\Moq.dll + + + + + + + ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + + + + + + + + + + + + + + + + + {c9416a62-0623-4d38-96aa-92516b32f02f} + SafeExamBrowser.Communication + + + {47da5933-bef8-4729-94e6-abde2db12262} + SafeExamBrowser.Contracts + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Communication.UnitTests/packages.config b/SafeExamBrowser.Communication.UnitTests/packages.config new file mode 100644 index 00000000..7a311d3f --- /dev/null +++ b/SafeExamBrowser.Communication.UnitTests/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core/Communication/Hosts/BaseHost.cs b/SafeExamBrowser.Communication/Hosts/BaseHost.cs similarity index 99% rename from SafeExamBrowser.Core/Communication/Hosts/BaseHost.cs rename to SafeExamBrowser.Communication/Hosts/BaseHost.cs index 85df3f6d..b8825c33 100644 --- a/SafeExamBrowser.Core/Communication/Hosts/BaseHost.cs +++ b/SafeExamBrowser.Communication/Hosts/BaseHost.cs @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Communication.Hosts +namespace SafeExamBrowser.Communication.Hosts { /// /// The base implementation of an . Runs the host on a new, separate thread. diff --git a/SafeExamBrowser.Core/Communication/Hosts/HostObjectFactory.cs b/SafeExamBrowser.Communication/Hosts/HostObjectFactory.cs similarity index 95% rename from SafeExamBrowser.Core/Communication/Hosts/HostObjectFactory.cs rename to SafeExamBrowser.Communication/Hosts/HostObjectFactory.cs index 063bb24f..dd5f346a 100644 --- a/SafeExamBrowser.Core/Communication/Hosts/HostObjectFactory.cs +++ b/SafeExamBrowser.Communication/Hosts/HostObjectFactory.cs @@ -11,7 +11,7 @@ using System.ServiceModel; using SafeExamBrowser.Contracts.Communication; using SafeExamBrowser.Contracts.Communication.Hosts; -namespace SafeExamBrowser.Core.Communication.Hosts +namespace SafeExamBrowser.Communication.Hosts { /// /// Default implementation of the utilizing WCF (). diff --git a/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs b/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..6858de06 --- /dev/null +++ b/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SafeExamBrowser.Communication")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.Communication")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c9416a62-0623-4d38-96aa-92516b32f02f")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Core/Communication/Proxies/BaseProxy.cs b/SafeExamBrowser.Communication/Proxies/BaseProxy.cs similarity index 99% rename from SafeExamBrowser.Core/Communication/Proxies/BaseProxy.cs rename to SafeExamBrowser.Communication/Proxies/BaseProxy.cs index b32ca39d..d3e5cb99 100644 --- a/SafeExamBrowser.Core/Communication/Proxies/BaseProxy.cs +++ b/SafeExamBrowser.Communication/Proxies/BaseProxy.cs @@ -15,7 +15,7 @@ using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Communication.Proxies +namespace SafeExamBrowser.Communication.Proxies { /// /// Base implementation of an . diff --git a/SafeExamBrowser.Core/Communication/Proxies/ClientProxy.cs b/SafeExamBrowser.Communication/Proxies/ClientProxy.cs similarity index 98% rename from SafeExamBrowser.Core/Communication/Proxies/ClientProxy.cs rename to SafeExamBrowser.Communication/Proxies/ClientProxy.cs index e940abbc..f3d93a01 100644 --- a/SafeExamBrowser.Core/Communication/Proxies/ClientProxy.cs +++ b/SafeExamBrowser.Communication/Proxies/ClientProxy.cs @@ -11,7 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Communication.Proxies +namespace SafeExamBrowser.Communication.Proxies { /// /// Default implementation of the , to be used for communication with the client application component. diff --git a/SafeExamBrowser.Core/Communication/Proxies/ProxyObjectFactory.cs b/SafeExamBrowser.Communication/Proxies/ProxyObjectFactory.cs similarity index 94% rename from SafeExamBrowser.Core/Communication/Proxies/ProxyObjectFactory.cs rename to SafeExamBrowser.Communication/Proxies/ProxyObjectFactory.cs index 0dd9462c..550943d3 100644 --- a/SafeExamBrowser.Core/Communication/Proxies/ProxyObjectFactory.cs +++ b/SafeExamBrowser.Communication/Proxies/ProxyObjectFactory.cs @@ -9,7 +9,7 @@ using System.ServiceModel; using SafeExamBrowser.Contracts.Communication.Proxies; -namespace SafeExamBrowser.Core.Communication.Proxies +namespace SafeExamBrowser.Communication.Proxies { /// /// Default implementation of the utilizing WCF (). diff --git a/SafeExamBrowser.Core/Communication/Proxies/RuntimeProxy.cs b/SafeExamBrowser.Communication/Proxies/RuntimeProxy.cs similarity index 98% rename from SafeExamBrowser.Core/Communication/Proxies/RuntimeProxy.cs rename to SafeExamBrowser.Communication/Proxies/RuntimeProxy.cs index 7406e2cd..afa78715 100644 --- a/SafeExamBrowser.Core/Communication/Proxies/RuntimeProxy.cs +++ b/SafeExamBrowser.Communication/Proxies/RuntimeProxy.cs @@ -11,7 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Communication.Proxies +namespace SafeExamBrowser.Communication.Proxies { /// /// Default implementation of the , to be used for communication with the runtime application component. diff --git a/SafeExamBrowser.Core/Communication/Proxies/ServiceProxy.cs b/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs similarity index 97% rename from SafeExamBrowser.Core/Communication/Proxies/ServiceProxy.cs rename to SafeExamBrowser.Communication/Proxies/ServiceProxy.cs index da5dd5d6..9f792ef3 100644 --- a/SafeExamBrowser.Core/Communication/Proxies/ServiceProxy.cs +++ b/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs @@ -11,7 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Communication.Proxies +namespace SafeExamBrowser.Communication.Proxies { /// /// Default implementation of the , to be used for communication with the service application component. diff --git a/SafeExamBrowser.Communication/SafeExamBrowser.Communication.csproj b/SafeExamBrowser.Communication/SafeExamBrowser.Communication.csproj new file mode 100644 index 00000000..7d52218f --- /dev/null +++ b/SafeExamBrowser.Communication/SafeExamBrowser.Communication.csproj @@ -0,0 +1,73 @@ + + + + + Debug + AnyCPU + {C9416A62-0623-4D38-96AA-92516B32F02F} + Library + Properties + SafeExamBrowser.Communication + SafeExamBrowser.Communication + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + + {47DA5933-BEF8-4729-94E6-ABDE2DB12262} + SafeExamBrowser.Contracts + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs b/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs index 4310302e..3d973adb 100644 --- a/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs +++ b/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; namespace SafeExamBrowser.Contracts.Browser { diff --git a/SafeExamBrowser.Contracts/Behaviour/Events/InstanceTerminatedEventHandler.cs b/SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs similarity index 71% rename from SafeExamBrowser.Contracts/Behaviour/Events/InstanceTerminatedEventHandler.cs rename to SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs index ddad6d91..31bbb9ae 100644 --- a/SafeExamBrowser.Contracts/Behaviour/Events/InstanceTerminatedEventHandler.cs +++ b/SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs @@ -7,10 +7,10 @@ */ -namespace SafeExamBrowser.Contracts.Behaviour.Events +namespace SafeExamBrowser.Contracts.Core.Events { /// - /// Event handler used to indicate that an application instance with a particular ID has terminated. + /// Event handler used to indicate that an with a particular ID has terminated. /// public delegate void InstanceTerminatedEventHandler(InstanceIdentifier id); } diff --git a/SafeExamBrowser.Contracts/Behaviour/Events/NameChangedEventHandler.cs b/SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs similarity index 89% rename from SafeExamBrowser.Contracts/Behaviour/Events/NameChangedEventHandler.cs rename to SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs index 2e3537bd..d25b80b0 100644 --- a/SafeExamBrowser.Contracts/Behaviour/Events/NameChangedEventHandler.cs +++ b/SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Contracts.Behaviour.Events +namespace SafeExamBrowser.Contracts.Core.Events { /// /// Event handler used to indicate that a name has changed to a new value. diff --git a/SafeExamBrowser.Contracts/Behaviour/IApplicationController.cs b/SafeExamBrowser.Contracts/Core/IApplicationController.cs similarity index 95% rename from SafeExamBrowser.Contracts/Behaviour/IApplicationController.cs rename to SafeExamBrowser.Contracts/Core/IApplicationController.cs index b6407a79..e8e9eff0 100644 --- a/SafeExamBrowser.Contracts/Behaviour/IApplicationController.cs +++ b/SafeExamBrowser.Contracts/Core/IApplicationController.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Controls the lifetime and functionality of a (third-party) application which can be accessed via the . diff --git a/SafeExamBrowser.Contracts/Behaviour/IApplicationInstance.cs b/SafeExamBrowser.Contracts/Core/IApplicationInstance.cs similarity index 92% rename from SafeExamBrowser.Contracts/Behaviour/IApplicationInstance.cs rename to SafeExamBrowser.Contracts/Core/IApplicationInstance.cs index 668fc4a8..214b248f 100644 --- a/SafeExamBrowser.Contracts/Behaviour/IApplicationInstance.cs +++ b/SafeExamBrowser.Contracts/Core/IApplicationInstance.cs @@ -6,10 +6,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.Events; +using SafeExamBrowser.Contracts.Core.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Defines an instance of a (third-party) application which can be accessed via the . diff --git a/SafeExamBrowser.Contracts/Behaviour/IClientController.cs b/SafeExamBrowser.Contracts/Core/IClientController.cs similarity index 97% rename from SafeExamBrowser.Contracts/Behaviour/IClientController.cs rename to SafeExamBrowser.Contracts/Core/IClientController.cs index cb12b680..832c2120 100644 --- a/SafeExamBrowser.Contracts/Behaviour/IClientController.cs +++ b/SafeExamBrowser.Contracts/Core/IClientController.cs @@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Controls the lifetime and is responsible for the event handling of the client application component. diff --git a/SafeExamBrowser.Contracts/Behaviour/INotificationController.cs b/SafeExamBrowser.Contracts/Core/INotificationController.cs similarity index 94% rename from SafeExamBrowser.Contracts/Behaviour/INotificationController.cs rename to SafeExamBrowser.Contracts/Core/INotificationController.cs index 14bae7d6..712f2962 100644 --- a/SafeExamBrowser.Contracts/Behaviour/INotificationController.cs +++ b/SafeExamBrowser.Contracts/Core/INotificationController.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Controls the lifetime and functionality of a notification which is part of the . diff --git a/SafeExamBrowser.Contracts/Behaviour/IRuntimeController.cs b/SafeExamBrowser.Contracts/Core/IRuntimeController.cs similarity index 94% rename from SafeExamBrowser.Contracts/Behaviour/IRuntimeController.cs rename to SafeExamBrowser.Contracts/Core/IRuntimeController.cs index 5da7352d..b6a10564 100644 --- a/SafeExamBrowser.Contracts/Behaviour/IRuntimeController.cs +++ b/SafeExamBrowser.Contracts/Core/IRuntimeController.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Controls the lifetime and is responsible for the event handling of the runtime application component. diff --git a/SafeExamBrowser.Contracts/Behaviour/InstanceIdentifier.cs b/SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs similarity index 97% rename from SafeExamBrowser.Contracts/Behaviour/InstanceIdentifier.cs rename to SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs index 5b23d6c4..642dc7ba 100644 --- a/SafeExamBrowser.Contracts/Behaviour/InstanceIdentifier.cs +++ b/SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Contracts.Behaviour +namespace SafeExamBrowser.Contracts.Core { /// /// Defines an identifier which uniquely identifies an in the context of a (third-party) application. diff --git a/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs b/SafeExamBrowser.Contracts/Core/OperationModel/IOperation.cs similarity index 94% rename from SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs rename to SafeExamBrowser.Contracts/Core/OperationModel/IOperation.cs index a170f216..f6070470 100644 --- a/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs +++ b/SafeExamBrowser.Contracts/Core/OperationModel/IOperation.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Contracts.Behaviour.OperationModel +namespace SafeExamBrowser.Contracts.Core.OperationModel { /// /// Defines an operation which will be executed as part of an . diff --git a/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs b/SafeExamBrowser.Contracts/Core/OperationModel/IOperationSequence.cs similarity index 96% rename from SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs rename to SafeExamBrowser.Contracts/Core/OperationModel/IOperationSequence.cs index fc90baf5..8a450f74 100644 --- a/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs +++ b/SafeExamBrowser.Contracts/Core/OperationModel/IOperationSequence.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Contracts.Behaviour.OperationModel +namespace SafeExamBrowser.Contracts.Core.OperationModel { /// /// A sequence of s which can be used for sequential procedures, e.g. the initialization & finalization of diff --git a/SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs b/SafeExamBrowser.Contracts/Core/OperationModel/OperationResult.cs similarity index 93% rename from SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs rename to SafeExamBrowser.Contracts/Core/OperationModel/OperationResult.cs index e8547b6e..de69ec60 100644 --- a/SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs +++ b/SafeExamBrowser.Contracts/Core/OperationModel/OperationResult.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Contracts.Behaviour.OperationModel +namespace SafeExamBrowser.Contracts.Core.OperationModel { /// /// Defines the result of the sequential execution of s (as part of an ). diff --git a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj index 4234a881..aa03c755 100644 --- a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj +++ b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj @@ -52,13 +52,13 @@ - - - - - - - + + + + + + + @@ -104,12 +104,12 @@ - - - + + + - + diff --git a/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs b/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs index efb3c5f7..b234be5b 100644 --- a/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs +++ b/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events { diff --git a/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs b/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs index 2175d12d..1bddab3b 100644 --- a/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs +++ b/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; namespace SafeExamBrowser.Contracts.UserInterface.Taskbar diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/OperationSequenceTests.cs b/SafeExamBrowser.Core.UnitTests/OperationModel/OperationSequenceTests.cs similarity index 99% rename from SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/OperationSequenceTests.cs rename to SafeExamBrowser.Core.UnitTests/OperationModel/OperationSequenceTests.cs index 5866ddcd..d078e1c1 100644 --- a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/OperationSequenceTests.cs +++ b/SafeExamBrowser.Core.UnitTests/OperationModel/OperationSequenceTests.cs @@ -10,12 +10,12 @@ using System; using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -using SafeExamBrowser.Core.Behaviour.OperationModel; +using SafeExamBrowser.Core.OperationModel; -namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel +namespace SafeExamBrowser.Core.UnitTests.OperationModel { [TestClass] public class OperationSequenceTests diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/CommunicationOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Operations/CommunicationOperationTests.cs similarity index 92% rename from SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/CommunicationOperationTests.cs rename to SafeExamBrowser.Core.UnitTests/Operations/CommunicationOperationTests.cs index 1decf907..d2d73ed7 100644 --- a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/CommunicationOperationTests.cs +++ b/SafeExamBrowser.Core.UnitTests/Operations/CommunicationOperationTests.cs @@ -8,12 +8,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Communication; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Behaviour.OperationModel; +using SafeExamBrowser.Core.Operations; -namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel +namespace SafeExamBrowser.Core.UnitTests.Operations { [TestClass] public class CommunicationOperationTests diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelayedInitializationOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Operations/DelayedInitializationOperationTests.cs similarity index 94% rename from SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelayedInitializationOperationTests.cs rename to SafeExamBrowser.Core.UnitTests/Operations/DelayedInitializationOperationTests.cs index d7734a79..db84d032 100644 --- a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelayedInitializationOperationTests.cs +++ b/SafeExamBrowser.Core.UnitTests/Operations/DelayedInitializationOperationTests.cs @@ -9,11 +9,11 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.UserInterface; -using SafeExamBrowser.Core.Behaviour.OperationModel; +using SafeExamBrowser.Core.Operations; -namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel +namespace SafeExamBrowser.Core.UnitTests.Operations { [TestClass] public class DelayedInitializationOperationTests diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelegateOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Operations/DelegateOperationTests.cs similarity index 88% rename from SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelegateOperationTests.cs rename to SafeExamBrowser.Core.UnitTests/Operations/DelegateOperationTests.cs index f89bb325..83744cd8 100644 --- a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelegateOperationTests.cs +++ b/SafeExamBrowser.Core.UnitTests/Operations/DelegateOperationTests.cs @@ -7,10 +7,10 @@ */ using Microsoft.VisualStudio.TestTools.UnitTesting; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; -using SafeExamBrowser.Core.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; +using SafeExamBrowser.Core.Operations; -namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel +namespace SafeExamBrowser.Core.UnitTests.Operations { [TestClass] public class DelegateOperationTests diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/I18nOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Operations/I18nOperationTests.cs similarity index 62% rename from SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/I18nOperationTests.cs rename to SafeExamBrowser.Core.UnitTests/Operations/I18nOperationTests.cs index 862907ad..afcad325 100644 --- a/SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/I18nOperationTests.cs +++ b/SafeExamBrowser.Core.UnitTests/Operations/I18nOperationTests.cs @@ -8,28 +8,30 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Behaviour.OperationModel; +using SafeExamBrowser.Core.Operations; -namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel +namespace SafeExamBrowser.Core.UnitTests.Operations { [TestClass] public class I18nOperationTests { - private Mock loggerMock; - private Mock textMock; + private Mock logger; + private Mock text; + private Mock textResource; private I18nOperation sut; [TestInitialize] public void Initialize() { - loggerMock = new Mock(); - textMock = new Mock(); + logger = new Mock(); + text = new Mock(); + textResource = new Mock(); - sut = new I18nOperation(loggerMock.Object, textMock.Object); + sut = new I18nOperation(logger.Object, text.Object, textResource.Object); } [TestMethod] @@ -37,7 +39,7 @@ namespace SafeExamBrowser.Core.UnitTests.Behaviour.OperationModel { var result = sut.Perform(); - textMock.Verify(t => t.Initialize(It.IsAny()), Times.Once); + text.Verify(t => t.Initialize(It.Is(r => r == textResource.Object)), Times.Once); Assert.AreEqual(OperationResult.Success, result); } diff --git a/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj index bab8b185..67d8cc24 100644 --- a/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj +++ b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj @@ -78,24 +78,11 @@ - - - - - - - - - - - - - - - - - - + + + + + @@ -108,17 +95,6 @@ SafeExamBrowser.Core - - - Always - - - Always - - - Always - - diff --git a/SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs b/SafeExamBrowser.Core/OperationModel/OperationSequence.cs similarity index 96% rename from SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs rename to SafeExamBrowser.Core/OperationModel/OperationSequence.cs index 0c9596dd..6530f72f 100644 --- a/SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs +++ b/SafeExamBrowser.Core/OperationModel/OperationSequence.cs @@ -9,11 +9,11 @@ using System; using System.Collections.Generic; using System.Linq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Core.Behaviour.OperationModel +namespace SafeExamBrowser.Core.OperationModel { /// /// Default implementation of the . diff --git a/SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs b/SafeExamBrowser.Core/Operations/CommunicationOperation.cs similarity index 93% rename from SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs rename to SafeExamBrowser.Core/Operations/CommunicationOperation.cs index 84682de1..b9348ef4 100644 --- a/SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs +++ b/SafeExamBrowser.Core/Operations/CommunicationOperation.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Communication; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Core.Behaviour.OperationModel +namespace SafeExamBrowser.Core.Operations { /// /// An operation to handle the lifetime of an . The host is started during , diff --git a/SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs b/SafeExamBrowser.Core/Operations/DelayedInitializationOperation.cs similarity index 92% rename from SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs rename to SafeExamBrowser.Core/Operations/DelayedInitializationOperation.cs index 37c2ac00..0ac3bdae 100644 --- a/SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs +++ b/SafeExamBrowser.Core/Operations/DelayedInitializationOperation.cs @@ -7,10 +7,10 @@ */ using System; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Core.Behaviour.OperationModel +namespace SafeExamBrowser.Core.Operations { /// /// A wrapper operation to allow for a delayed (just-in-time) instantiation of an operation. Is useful when e.g. dependencies for a diff --git a/SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs b/SafeExamBrowser.Core/Operations/DelegateOperation.cs similarity index 91% rename from SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs rename to SafeExamBrowser.Core/Operations/DelegateOperation.cs index 3444258a..d1193dee 100644 --- a/SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs +++ b/SafeExamBrowser.Core/Operations/DelegateOperation.cs @@ -7,10 +7,10 @@ */ using System; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Core.Behaviour.OperationModel +namespace SafeExamBrowser.Core.Operations { /// /// A generic operation to allow for the (inline) definition of an operation via delegates. Useful if implementing a complete diff --git a/SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs b/SafeExamBrowser.Core/Operations/I18nOperation.cs similarity index 73% rename from SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs rename to SafeExamBrowser.Core/Operations/I18nOperation.cs index 00522c58..25454d10 100644 --- a/SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs +++ b/SafeExamBrowser.Core/Operations/I18nOperation.cs @@ -7,15 +7,12 @@ */ using System.Globalization; -using System.IO; -using System.Reflection; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -using SafeExamBrowser.Core.I18n; -namespace SafeExamBrowser.Core.Behaviour.OperationModel +namespace SafeExamBrowser.Core.Operations { /// /// An operation to handle the initialization of an module with text data from the default directory. @@ -24,23 +21,21 @@ namespace SafeExamBrowser.Core.Behaviour.OperationModel { private ILogger logger; private IText text; + private ITextResource textResource; public IProgressIndicator ProgressIndicator { private get; set; } - public I18nOperation(ILogger logger, IText text) + public I18nOperation(ILogger logger, IText text, ITextResource textResource) { this.logger = logger; this.text = text; + this.textResource = textResource; } public OperationResult Perform() { logger.Info($"Loading default text data (the currently active culture is '{CultureInfo.CurrentCulture.Name}')..."); - var location = Assembly.GetAssembly(typeof(XmlTextResource)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text.xml"; - var textResource = new XmlTextResource(path); - text.Initialize(textResource); return OperationResult.Success; diff --git a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj index 444e494f..761050ee 100644 --- a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj +++ b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj @@ -54,35 +54,13 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + - - - Always - Designer - - {47DA5933-BEF8-4729-94E6-ABDE2DB12262} diff --git a/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..163d3023 --- /dev/null +++ b/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("SafeExamBrowser.I18n.UnitTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.I18n.UnitTests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("9abb1bde-03e1-4076-8f8b-fda1e61ed675")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj b/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj new file mode 100644 index 00000000..e272b258 --- /dev/null +++ b/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj @@ -0,0 +1,122 @@ + + + + + + Debug + AnyCPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675} + Library + Properties + SafeExamBrowser.I18n.UnitTests + SafeExamBrowser.I18n.UnitTests + v4.5.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Moq.4.9.0\lib\net45\Moq.dll + + + + + + ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + + + + + + + + + + + + + Always + + + Always + + + Always + + + + + {47da5933-bef8-4729-94e6-abde2db12262} + SafeExamBrowser.Contracts + + + {10c62628-8e6a-45aa-9d97-339b119ad21d} + SafeExamBrowser.I18n + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core.UnitTests/I18n/TextTests.cs b/SafeExamBrowser.I18n.UnitTests/TextTests.cs similarity index 95% rename from SafeExamBrowser.Core.UnitTests/I18n/TextTests.cs rename to SafeExamBrowser.I18n.UnitTests/TextTests.cs index 080302cf..d1ac976a 100644 --- a/SafeExamBrowser.Core.UnitTests/I18n/TextTests.cs +++ b/SafeExamBrowser.I18n.UnitTests/TextTests.cs @@ -12,9 +12,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.I18n; +using SafeExamBrowser.I18n; -namespace SafeExamBrowser.Core.UnitTests.I18n +namespace SafeExamBrowser.I18n.UnitTests { [TestClass] public class TextTests diff --git a/SafeExamBrowser.Core.UnitTests/I18n/Text_Incompatible.xml b/SafeExamBrowser.I18n.UnitTests/Text_Incompatible.xml similarity index 100% rename from SafeExamBrowser.Core.UnitTests/I18n/Text_Incompatible.xml rename to SafeExamBrowser.I18n.UnitTests/Text_Incompatible.xml diff --git a/SafeExamBrowser.Core.UnitTests/I18n/Text_Invalid.txt b/SafeExamBrowser.I18n.UnitTests/Text_Invalid.txt similarity index 100% rename from SafeExamBrowser.Core.UnitTests/I18n/Text_Invalid.txt rename to SafeExamBrowser.I18n.UnitTests/Text_Invalid.txt diff --git a/SafeExamBrowser.Core.UnitTests/I18n/Text_Valid.xml b/SafeExamBrowser.I18n.UnitTests/Text_Valid.xml similarity index 100% rename from SafeExamBrowser.Core.UnitTests/I18n/Text_Valid.xml rename to SafeExamBrowser.I18n.UnitTests/Text_Valid.xml diff --git a/SafeExamBrowser.Core.UnitTests/I18n/XmlTextResourceTests.cs b/SafeExamBrowser.I18n.UnitTests/XmlTextResourceTests.cs similarity index 82% rename from SafeExamBrowser.Core.UnitTests/I18n/XmlTextResourceTests.cs rename to SafeExamBrowser.I18n.UnitTests/XmlTextResourceTests.cs index b3f7140a..f5a9f7f7 100644 --- a/SafeExamBrowser.Core.UnitTests/I18n/XmlTextResourceTests.cs +++ b/SafeExamBrowser.I18n.UnitTests/XmlTextResourceTests.cs @@ -12,9 +12,8 @@ using System.Reflection; using System.Xml; using Microsoft.VisualStudio.TestTools.UnitTesting; using SafeExamBrowser.Contracts.I18n; -using SafeExamBrowser.Core.I18n; -namespace SafeExamBrowser.Core.UnitTests.I18n +namespace SafeExamBrowser.I18n.UnitTests { [TestClass] public class XmlTextResourceTests @@ -23,7 +22,7 @@ namespace SafeExamBrowser.Core.UnitTests.I18n public void MustCorrectlyLoadData() { var location = Assembly.GetAssembly(typeof(XmlTextResourceTests)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text_Valid.xml"; + var path = $@"{Path.GetDirectoryName(location)}\Text_Valid.xml"; var sut = new XmlTextResource(path); var text = sut.LoadText(); @@ -39,7 +38,7 @@ namespace SafeExamBrowser.Core.UnitTests.I18n public void MustFailWithInvalidData() { var location = Assembly.GetAssembly(typeof(XmlTextResourceTests)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text_Invalid.txt"; + var path = $@"{Path.GetDirectoryName(location)}\Text_Invalid.txt"; var sut = new XmlTextResource(path); sut.LoadText(); @@ -49,7 +48,7 @@ namespace SafeExamBrowser.Core.UnitTests.I18n public void MustNeverReturnNull() { var location = Assembly.GetAssembly(typeof(XmlTextResourceTests)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text_Incompatible.xml"; + var path = $@"{Path.GetDirectoryName(location)}\Text_Incompatible.xml"; var sut = new XmlTextResource(path); var text = sut.LoadText(); @@ -62,7 +61,7 @@ namespace SafeExamBrowser.Core.UnitTests.I18n public void MustNeverSetNullValue() { var location = Assembly.GetAssembly(typeof(XmlTextResourceTests)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text_Valid.xml"; + var path = $@"{Path.GetDirectoryName(location)}\Text_Valid.xml"; var sut = new XmlTextResource(path); var text = sut.LoadText(); @@ -89,7 +88,7 @@ namespace SafeExamBrowser.Core.UnitTests.I18n public void MustTrimValues() { var location = Assembly.GetAssembly(typeof(XmlTextResourceTests)).Location; - var path = Path.GetDirectoryName(location) + $@"\{nameof(I18n)}\Text_Valid.xml"; + var path = $@"{Path.GetDirectoryName(location)}\Text_Valid.xml"; var sut = new XmlTextResource(path); var text = sut.LoadText(); diff --git a/SafeExamBrowser.I18n.UnitTests/packages.config b/SafeExamBrowser.I18n.UnitTests/packages.config new file mode 100644 index 00000000..7a311d3f --- /dev/null +++ b/SafeExamBrowser.I18n.UnitTests/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs b/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..93008086 --- /dev/null +++ b/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SafeExamBrowser.I18n")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.I18n")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("10c62628-8e6a-45aa-9d97-339b119ad21d")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.I18n/SafeExamBrowser.I18n.csproj b/SafeExamBrowser.I18n/SafeExamBrowser.I18n.csproj new file mode 100644 index 00000000..17b133b0 --- /dev/null +++ b/SafeExamBrowser.I18n/SafeExamBrowser.I18n.csproj @@ -0,0 +1,75 @@ + + + + + Debug + AnyCPU + {10C62628-8E6A-45AA-9D97-339B119AD21D} + Library + Properties + SafeExamBrowser.I18n + SafeExamBrowser.I18n + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + Designer + Always + + + + + {47da5933-bef8-4729-94e6-abde2db12262} + SafeExamBrowser.Contracts + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core/I18n/Text.cs b/SafeExamBrowser.I18n/Text.cs similarity index 97% rename from SafeExamBrowser.Core/I18n/Text.cs rename to SafeExamBrowser.I18n/Text.cs index be3225f1..6654e026 100644 --- a/SafeExamBrowser.Core/I18n/Text.cs +++ b/SafeExamBrowser.I18n/Text.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.I18n +namespace SafeExamBrowser.I18n { /// /// Default implementation of the module. diff --git a/SafeExamBrowser.Core/I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml similarity index 100% rename from SafeExamBrowser.Core/I18n/Text.xml rename to SafeExamBrowser.I18n/Text.xml diff --git a/SafeExamBrowser.Core/I18n/XmlTextResource.cs b/SafeExamBrowser.I18n/XmlTextResource.cs similarity index 97% rename from SafeExamBrowser.Core/I18n/XmlTextResource.cs rename to SafeExamBrowser.I18n/XmlTextResource.cs index 769ff62f..96426e2b 100644 --- a/SafeExamBrowser.Core/I18n/XmlTextResource.cs +++ b/SafeExamBrowser.I18n/XmlTextResource.cs @@ -12,7 +12,7 @@ using System.IO; using System.Xml.Linq; using SafeExamBrowser.Contracts.I18n; -namespace SafeExamBrowser.Core.I18n +namespace SafeExamBrowser.I18n { /// /// Default implementation of to load text data from XML files. diff --git a/SafeExamBrowser.Core.UnitTests/Logging/DefaultLogFormatterTests.cs b/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs similarity index 94% rename from SafeExamBrowser.Core.UnitTests/Logging/DefaultLogFormatterTests.cs rename to SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs index 9829f9db..29e3ec9a 100644 --- a/SafeExamBrowser.Core.UnitTests/Logging/DefaultLogFormatterTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs @@ -9,9 +9,8 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Logging; -namespace SafeExamBrowser.Core.UnitTests.Logging +namespace SafeExamBrowser.Logging.UnitTests { [TestClass] public class DefaultLogFormatterTests diff --git a/SafeExamBrowser.Core.UnitTests/Logging/LoggerTests.cs b/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs similarity index 98% rename from SafeExamBrowser.Core.UnitTests/Logging/LoggerTests.cs rename to SafeExamBrowser.Logging.UnitTests/LoggerTests.cs index 97b5f0c0..29f18ef9 100644 --- a/SafeExamBrowser.Core.UnitTests/Logging/LoggerTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs @@ -11,9 +11,9 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Logging; +using SafeExamBrowser.Logging; -namespace SafeExamBrowser.Core.UnitTests.Logging +namespace SafeExamBrowser.Logging.UnitTests { [TestClass] public class LoggerTests diff --git a/SafeExamBrowser.Core.UnitTests/Logging/ModuleLoggerTests.cs b/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs similarity index 95% rename from SafeExamBrowser.Core.UnitTests/Logging/ModuleLoggerTests.cs rename to SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs index bfdbaca2..9f0aff5d 100644 --- a/SafeExamBrowser.Core.UnitTests/Logging/ModuleLoggerTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs @@ -10,9 +10,9 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Logging; +using SafeExamBrowser.Logging; -namespace SafeExamBrowser.Core.UnitTests.Logging +namespace SafeExamBrowser.Logging.UnitTests { [TestClass] public class ModuleLoggerTests diff --git a/SafeExamBrowser.Core.UnitTests/Logging/NewLogContentType.cs b/SafeExamBrowser.Logging.UnitTests/NewLogContentType.cs similarity index 90% rename from SafeExamBrowser.Core.UnitTests/Logging/NewLogContentType.cs rename to SafeExamBrowser.Logging.UnitTests/NewLogContentType.cs index cce6ac31..443f968a 100644 --- a/SafeExamBrowser.Core.UnitTests/Logging/NewLogContentType.cs +++ b/SafeExamBrowser.Logging.UnitTests/NewLogContentType.cs @@ -9,7 +9,7 @@ using System; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.UnitTests.Logging +namespace SafeExamBrowser.Logging.UnitTests { class NewLogContentType : ILogContent { diff --git a/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..4b8fa17d --- /dev/null +++ b/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("SafeExamBrowser.Logging.UnitTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.Logging.UnitTests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("7f012305-1125-47ce-9c2a-146c891c0924")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj new file mode 100644 index 00000000..e3b193d6 --- /dev/null +++ b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj @@ -0,0 +1,112 @@ + + + + + + Debug + AnyCPU + {7F012305-1125-47CE-9C2A-146C891C0924} + Library + Properties + SafeExamBrowser.Logging.UnitTests + SafeExamBrowser.Logging.UnitTests + v4.5.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Moq.4.9.0\lib\net45\Moq.dll + + + + + + ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + + + + + + + + + + + + + + {47da5933-bef8-4729-94e6-abde2db12262} + SafeExamBrowser.Contracts + + + {e107026c-2011-4552-a7d8-3a0d37881df6} + SafeExamBrowser.Logging + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Logging.UnitTests/packages.config b/SafeExamBrowser.Logging.UnitTests/packages.config new file mode 100644 index 00000000..7a311d3f --- /dev/null +++ b/SafeExamBrowser.Logging.UnitTests/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core/Logging/DefaultLogFormatter.cs b/SafeExamBrowser.Logging/DefaultLogFormatter.cs similarity index 96% rename from SafeExamBrowser.Core/Logging/DefaultLogFormatter.cs rename to SafeExamBrowser.Logging/DefaultLogFormatter.cs index ece3f9e8..62f156db 100644 --- a/SafeExamBrowser.Core/Logging/DefaultLogFormatter.cs +++ b/SafeExamBrowser.Logging/DefaultLogFormatter.cs @@ -9,7 +9,7 @@ using System; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Default implementation of . diff --git a/SafeExamBrowser.Core/Logging/LogFileWriter.cs b/SafeExamBrowser.Logging/LogFileWriter.cs similarity index 96% rename from SafeExamBrowser.Core/Logging/LogFileWriter.cs rename to SafeExamBrowser.Logging/LogFileWriter.cs index 863ca779..9062e5fe 100644 --- a/SafeExamBrowser.Core/Logging/LogFileWriter.cs +++ b/SafeExamBrowser.Logging/LogFileWriter.cs @@ -10,7 +10,7 @@ using System.IO; using System.Text; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// which immediately saves new log content to disk. diff --git a/SafeExamBrowser.Core/Logging/LogMessage.cs b/SafeExamBrowser.Logging/LogMessage.cs similarity index 96% rename from SafeExamBrowser.Core/Logging/LogMessage.cs rename to SafeExamBrowser.Logging/LogMessage.cs index 6a323164..5de212e4 100644 --- a/SafeExamBrowser.Core/Logging/LogMessage.cs +++ b/SafeExamBrowser.Logging/LogMessage.cs @@ -9,7 +9,7 @@ using System; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Default implementation of . diff --git a/SafeExamBrowser.Core/Logging/LogText.cs b/SafeExamBrowser.Logging/LogText.cs similarity index 94% rename from SafeExamBrowser.Core/Logging/LogText.cs rename to SafeExamBrowser.Logging/LogText.cs index a7c04412..77e2b7ce 100644 --- a/SafeExamBrowser.Core/Logging/LogText.cs +++ b/SafeExamBrowser.Logging/LogText.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Default implementation of . diff --git a/SafeExamBrowser.Core/Logging/Logger.cs b/SafeExamBrowser.Logging/Logger.cs similarity index 98% rename from SafeExamBrowser.Core/Logging/Logger.cs rename to SafeExamBrowser.Logging/Logger.cs index c910dc3e..c0136040 100644 --- a/SafeExamBrowser.Core/Logging/Logger.cs +++ b/SafeExamBrowser.Logging/Logger.cs @@ -13,7 +13,7 @@ using System.Text; using System.Threading; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Default, thread-safe implementation of . diff --git a/SafeExamBrowser.Core/Logging/ModuleLogger.cs b/SafeExamBrowser.Logging/ModuleLogger.cs similarity index 97% rename from SafeExamBrowser.Core/Logging/ModuleLogger.cs rename to SafeExamBrowser.Logging/ModuleLogger.cs index d7ba37b0..b366dcfc 100644 --- a/SafeExamBrowser.Core/Logging/ModuleLogger.cs +++ b/SafeExamBrowser.Logging/ModuleLogger.cs @@ -10,7 +10,7 @@ using System; using System.Collections.Generic; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Wraps an implementation of in order to append information about the module from which messages are logged. diff --git a/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs b/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..018dbd0a --- /dev/null +++ b/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SafeExamBrowser.Logging")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SafeExamBrowser.Logging")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("e107026c-2011-4552-a7d8-3a0d37881df6")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj b/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj new file mode 100644 index 00000000..d378c825 --- /dev/null +++ b/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj @@ -0,0 +1,72 @@ + + + + + Debug + AnyCPU + {E107026C-2011-4552-A7D8-3A0D37881DF6} + Library + Properties + SafeExamBrowser.Logging + SafeExamBrowser.Logging + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + {47da5933-bef8-4729-94e6-abde2db12262} + SafeExamBrowser.Contracts + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core/Logging/ThreadInfo.cs b/SafeExamBrowser.Logging/ThreadInfo.cs similarity index 95% rename from SafeExamBrowser.Core/Logging/ThreadInfo.cs rename to SafeExamBrowser.Logging/ThreadInfo.cs index 2f3baa1b..51fbfb2e 100644 --- a/SafeExamBrowser.Core/Logging/ThreadInfo.cs +++ b/SafeExamBrowser.Logging/ThreadInfo.cs @@ -9,7 +9,7 @@ using System; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.Core.Logging +namespace SafeExamBrowser.Logging { /// /// Default implementation of . diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs similarity index 97% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs index 36e73bda..20968778 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs @@ -9,16 +9,16 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.WindowsApi; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Runtime.Operations; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class ClientOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientTerminationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientTerminationOperationTests.cs similarity index 95% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientTerminationOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/ClientTerminationOperationTests.cs index eeddfbb1..728c5abb 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ClientTerminationOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientTerminationOperationTests.cs @@ -14,9 +14,9 @@ using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.WindowsApi; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Runtime.Operations; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class ClientTerminationOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs similarity index 99% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs index 1f621e01..a18bb79a 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs @@ -10,7 +10,7 @@ using System; using System.IO; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; @@ -22,9 +22,9 @@ using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.MessageBox; using SafeExamBrowser.Contracts.UserInterface.Windows; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Runtime.Operations; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class ConfigurationOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/KioskModeOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs similarity index 87% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/KioskModeOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs index 4872f701..47f40dcf 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/KioskModeOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs @@ -8,7 +8,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class KioskModeOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/PasswordDialogResultStub.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/PasswordDialogResultStub.cs similarity index 88% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/PasswordDialogResultStub.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/PasswordDialogResultStub.cs index ed553b45..8fc620a9 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/PasswordDialogResultStub.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/PasswordDialogResultStub.cs @@ -8,7 +8,7 @@ using SafeExamBrowser.Contracts.UserInterface.Windows; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { internal class PasswordDialogResultStub : IPasswordDialogResult { diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs similarity index 97% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs index 90a71111..3ace2794 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs @@ -9,16 +9,16 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Runtime.Operations; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class ServiceOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/SessionInitializationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/SessionInitializationOperationTests.cs similarity index 94% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/SessionInitializationOperationTests.cs rename to SafeExamBrowser.Runtime.UnitTests/Operations/SessionInitializationOperationTests.cs index c2bb8cc9..7ff8c536 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/SessionInitializationOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/SessionInitializationOperationTests.cs @@ -12,9 +12,9 @@ using Moq; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Runtime.Operations; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations +namespace SafeExamBrowser.Runtime.UnitTests.Operations { [TestClass] public class SessionInitializationOperationTests diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/RuntimeControllerTests.cs b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs similarity index 89% rename from SafeExamBrowser.Runtime.UnitTests/Behaviour/RuntimeControllerTests.cs rename to SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs index c0359d81..4e7e7830 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/RuntimeControllerTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs @@ -8,7 +8,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace SafeExamBrowser.Runtime.UnitTests.Behaviour +namespace SafeExamBrowser.Runtime.UnitTests { [TestClass] public class RuntimeControllerTests diff --git a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj index 9c24e99f..ffb33672 100644 --- a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj +++ b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj @@ -79,14 +79,14 @@ - - - - - - - - + + + + + + + + @@ -95,6 +95,10 @@ + + {c9416a62-0623-4d38-96aa-92516b32f02f} + SafeExamBrowser.Communication + {47DA5933-BEF8-4729-94E6-ABDE2DB12262} SafeExamBrowser.Contracts diff --git a/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs b/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs index 56d50504..a9c52b08 100644 --- a/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs +++ b/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs @@ -8,8 +8,8 @@ using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Proxies; -using SafeExamBrowser.Core.Logging; +using SafeExamBrowser.Communication.Proxies; +using SafeExamBrowser.Logging; namespace SafeExamBrowser.Runtime.Communication { diff --git a/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs b/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs index 2ca3b207..fecdd5e1 100644 --- a/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs +++ b/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs @@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Communication.Hosts; +using SafeExamBrowser.Communication.Hosts; namespace SafeExamBrowser.Runtime.Communication { diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs index c5b3a037..51409b8e 100644 --- a/SafeExamBrowser.Runtime/CompositionRoot.cs +++ b/SafeExamBrowser.Runtime/CompositionRoot.cs @@ -8,19 +8,22 @@ using System; using System.Collections.Generic; +using System.IO; +using System.Reflection; +using SafeExamBrowser.Communication.Hosts; +using SafeExamBrowser.Communication.Proxies; using SafeExamBrowser.Configuration; -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; +using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; -using SafeExamBrowser.Core.Behaviour.OperationModel; -using SafeExamBrowser.Core.Communication.Hosts; -using SafeExamBrowser.Core.Communication.Proxies; -using SafeExamBrowser.Core.I18n; -using SafeExamBrowser.Core.Logging; -using SafeExamBrowser.Runtime.Behaviour; -using SafeExamBrowser.Runtime.Behaviour.Operations; +using SafeExamBrowser.Core.OperationModel; +using SafeExamBrowser.Core.Operations; +using SafeExamBrowser.I18n; +using SafeExamBrowser.Logging; using SafeExamBrowser.Runtime.Communication; +using SafeExamBrowser.Runtime.Operations; using SafeExamBrowser.UserInterface.Classic; using SafeExamBrowser.WindowsApi; @@ -31,6 +34,8 @@ namespace SafeExamBrowser.Runtime private AppConfig appConfig; private ILogger logger; private ISystemInfo systemInfo; + private IText text; + private ITextResource textResource; internal IRuntimeController RuntimeController { get; private set; } @@ -47,8 +52,8 @@ namespace SafeExamBrowser.Runtime systemInfo = new SystemInfo(); InitializeLogging(); + InitializeText(); - var text = new Text(logger); var messageBox = new MessageBox(text); var desktopFactory = new DesktopFactory(new ModuleLogger(logger, typeof(DesktopFactory))); var explorerShell = new ExplorerShell(new ModuleLogger(logger, typeof(ExplorerShell)), nativeMethods); @@ -62,7 +67,7 @@ namespace SafeExamBrowser.Runtime var bootstrapOperations = new Queue(); var sessionOperations = new Queue(); - bootstrapOperations.Enqueue(new I18nOperation(logger, text)); + bootstrapOperations.Enqueue(new I18nOperation(logger, text, textResource)); bootstrapOperations.Enqueue(new CommunicationOperation(runtimeHost, logger)); sessionOperations.Enqueue(new ConfigurationOperation(appConfig, configuration, logger, messageBox, resourceLoader, runtimeHost, text, uiFactory, args)); @@ -103,5 +108,14 @@ namespace SafeExamBrowser.Runtime logFileWriter.Initialize(); logger.Subscribe(logFileWriter); } + + private void InitializeText() + { + var location = Assembly.GetAssembly(typeof(XmlTextResource)).Location; + var path = $@"{Path.GetDirectoryName(location)}\Text.xml"; + + text = new Text(logger); + textResource = new XmlTextResource(path); + } } } diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ClientOperation.cs b/SafeExamBrowser.Runtime/Operations/ClientOperation.cs similarity index 98% rename from SafeExamBrowser.Runtime/Behaviour/Operations/ClientOperation.cs rename to SafeExamBrowser.Runtime/Operations/ClientOperation.cs index 25de60ef..939cb0b9 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/ClientOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ClientOperation.cs @@ -7,18 +7,18 @@ */ using System.Threading; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.WindowsApi; using SafeExamBrowser.Contracts.WindowsApi.Events; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class ClientOperation : IOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ClientTerminationOperation.cs b/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs similarity index 92% rename from SafeExamBrowser.Runtime/Behaviour/Operations/ClientTerminationOperation.cs rename to SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs index 5ca7265d..88ac8830 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/ClientTerminationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class ClientTerminationOperation : ClientOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs similarity index 98% rename from SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs rename to SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs index 03ac810b..a1781a75 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs @@ -9,7 +9,7 @@ using System; using System.IO; using System.Threading; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Data; using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; @@ -20,7 +20,7 @@ using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.MessageBox; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class ConfigurationOperation : IOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs similarity index 97% rename from SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs rename to SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs index 078089b8..9f1e0caa 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; using SafeExamBrowser.Contracts.I18n; @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.WindowsApi; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class KioskModeOperation : IOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceOperation.cs b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs similarity index 96% rename from SafeExamBrowser.Runtime/Behaviour/Operations/ServiceOperation.cs rename to SafeExamBrowser.Runtime/Operations/ServiceOperation.cs index 90ae10ac..51ec7e48 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class ServiceOperation : IOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionInitializationOperation.cs b/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs similarity index 94% rename from SafeExamBrowser.Runtime/Behaviour/Operations/SessionInitializationOperation.cs rename to SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs index b75d0912..870a7812 100644 --- a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionInitializationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Contracts.Behaviour.OperationModel; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; -namespace SafeExamBrowser.Runtime.Behaviour.Operations +namespace SafeExamBrowser.Runtime.Operations { internal class SessionInitializationOperation : IOperation { diff --git a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs b/SafeExamBrowser.Runtime/RuntimeController.cs similarity index 98% rename from SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs rename to SafeExamBrowser.Runtime/RuntimeController.cs index 14fd0fd7..3ec11cad 100644 --- a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs +++ b/SafeExamBrowser.Runtime/RuntimeController.cs @@ -7,20 +7,20 @@ */ using System; -using SafeExamBrowser.Contracts.Behaviour; -using SafeExamBrowser.Contracts.Behaviour.OperationModel; using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Communication.Proxies; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.Configuration.Settings; +using SafeExamBrowser.Contracts.Core; +using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.MessageBox; using SafeExamBrowser.Contracts.UserInterface.Windows; -namespace SafeExamBrowser.Runtime.Behaviour +namespace SafeExamBrowser.Runtime { internal class RuntimeController : IRuntimeController { diff --git a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj index 9f194f71..18e52cc9 100644 --- a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj +++ b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj @@ -86,12 +86,12 @@ - - - - - - + + + + + + @@ -108,7 +108,7 @@ Settings.settings True - + ResXFileCodeGenerator Resources.Designer.cs @@ -124,6 +124,10 @@ + + {c9416a62-0623-4d38-96aa-92516b32f02f} + SafeExamBrowser.Communication + {c388c4dd-a159-457d-af92-89f7ad185109} SafeExamBrowser.Configuration @@ -136,6 +140,14 @@ {3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc} SafeExamBrowser.Core + + {10c62628-8e6a-45aa-9d97-339b119ad21d} + SafeExamBrowser.I18n + + + {e107026c-2011-4552-a7d8-3a0d37881df6} + SafeExamBrowser.Logging + {a502df54-7169-4647-94bd-18b192924866} SafeExamBrowser.UserInterface.Classic diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs index 5c13f5a6..67aef476 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Media; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs b/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs index 1e926a25..d4bf8212 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs @@ -8,7 +8,7 @@ using System.Windows; using System.Windows.Controls; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.UserInterface.Classic.Utilities; diff --git a/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationButton.xaml.cs index 92e2d482..503f9628 100644 --- a/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationButton.xaml.cs @@ -12,7 +12,7 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Media; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; diff --git a/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationInstanceButton.xaml.cs b/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationInstanceButton.xaml.cs index 7e654685..e3e79b47 100644 --- a/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationInstanceButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationInstanceButton.xaml.cs @@ -8,7 +8,7 @@ using System.Windows; using System.Windows.Controls; -using SafeExamBrowser.Contracts.Behaviour; +using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.UserInterface.Windows10.Utilities; diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln index 46584cd9..8e420cc1 100644 --- a/SafeExamBrowser.sln +++ b/SafeExamBrowser.sln @@ -42,6 +42,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Client.Unit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime.UnitTests", "SafeExamBrowser.Runtime.UnitTests\SafeExamBrowser.Runtime.UnitTests.csproj", "{B716A8B2-DF72-4143-9941-25E033089F5F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Communication", "SafeExamBrowser.Communication\SafeExamBrowser.Communication.csproj", "{C9416A62-0623-4D38-96AA-92516B32F02F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Communication.UnitTests", "SafeExamBrowser.Communication.UnitTests\SafeExamBrowser.Communication.UnitTests.csproj", "{21137D66-7D01-4327-92D2-0304C25CD7DF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.I18n", "SafeExamBrowser.I18n\SafeExamBrowser.I18n.csproj", "{10C62628-8E6A-45AA-9D97-339B119AD21D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.I18n.UnitTests", "SafeExamBrowser.I18n.UnitTests\SafeExamBrowser.I18n.UnitTests.csproj", "{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Logging", "SafeExamBrowser.Logging\SafeExamBrowser.Logging.csproj", "{E107026C-2011-4552-A7D8-3A0D37881DF6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Logging.UnitTests", "SafeExamBrowser.Logging.UnitTests\SafeExamBrowser.Logging.UnitTests.csproj", "{7F012305-1125-47CE-9C2A-146C891C0924}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -162,6 +174,54 @@ Global {B716A8B2-DF72-4143-9941-25E033089F5F}.Release|Any CPU.Build.0 = Release|Any CPU {B716A8B2-DF72-4143-9941-25E033089F5F}.Release|x86.ActiveCfg = Release|x86 {B716A8B2-DF72-4143-9941-25E033089F5F}.Release|x86.Build.0 = Release|x86 + {C9416A62-0623-4D38-96AA-92516B32F02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9416A62-0623-4D38-96AA-92516B32F02F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9416A62-0623-4D38-96AA-92516B32F02F}.Debug|x86.ActiveCfg = Debug|x86 + {C9416A62-0623-4D38-96AA-92516B32F02F}.Debug|x86.Build.0 = Debug|x86 + {C9416A62-0623-4D38-96AA-92516B32F02F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9416A62-0623-4D38-96AA-92516B32F02F}.Release|Any CPU.Build.0 = Release|Any CPU + {C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.ActiveCfg = Release|Any CPU + {C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.Build.0 = Release|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|x86.ActiveCfg = Debug|x86 + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|x86.Build.0 = Debug|x86 + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|Any CPU.Build.0 = Release|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.ActiveCfg = Release|Any CPU + {21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.Build.0 = Release|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|x86.ActiveCfg = Debug|x86 + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|x86.Build.0 = Debug|x86 + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|Any CPU.Build.0 = Release|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.ActiveCfg = Release|Any CPU + {10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.Build.0 = Release|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|x86.ActiveCfg = Debug|x86 + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|x86.Build.0 = Debug|x86 + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|Any CPU.Build.0 = Release|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.ActiveCfg = Release|Any CPU + {9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.Build.0 = Release|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|x86.ActiveCfg = Debug|x86 + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|x86.Build.0 = Debug|x86 + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|Any CPU.Build.0 = Release|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.ActiveCfg = Release|Any CPU + {E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.Build.0 = Release|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Debug|x86.ActiveCfg = Debug|x86 + {7F012305-1125-47CE-9C2A-146C891C0924}.Debug|x86.Build.0 = Debug|x86 + {7F012305-1125-47CE-9C2A-146C891C0924}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Release|Any CPU.Build.0 = Release|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.ActiveCfg = Release|Any CPU + {7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.yml b/appveyor.yml index 8ef76a30..13a70a8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,10 @@ build_script: - msbuild /verbosity:minimal "SafeExamBrowser.sln" test_script: - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor SafeExamBrowser.Client.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -output:"coverage.xml" + - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Communication.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Communication.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml" - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Core.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Core.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml" + - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.I18n.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.I18n.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml" + - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Logging.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Logging.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml" - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Runtime.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Runtime.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml" after_test: - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"