zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-220: Extracted concerns from core namespace (communication, i18n, logging) and removed behaviour namespace.

Browse source
This commit is contained in:
dbuechel 2018-08-31 10:06:27 +02:00
parent ef31db9920
commit ec3f2b7ff2
130 changed files with 1146 additions and 311 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Browser/BrowserApplicationController.cs
View file

@ -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;

4
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -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;

2
SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs
View file

@ -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
{

2
SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
View file

@ -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;

6
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/BrowserOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/ClipboardOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/DisplayMonitorOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/KeyboardInterceptorOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/MouseInterceptorOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs
View file

@ -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

6
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs
View file

@ -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

4
SafeExamBrowser.Client.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs
View file

@ -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

20
SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj
View file

@ -77,14 +77,14 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Operations\BrowserOperationTests.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperationTests.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperationTests.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperationTests.cs" />
<Compile Include="Operations\BrowserOperationTests.cs" />
<Compile Include="Operations\ClipboardOperationTests.cs" />
<Compile Include="Operations\DisplayMonitorOperationTests.cs" />
<Compile Include="Operations\KeyboardInterceptorOperationTests.cs" />
<Compile Include="Operations\MouseInterceptorOperationTests.cs" />
<Compile Include="Operations\ProcessMonitorOperationTests.cs" />
<Compile Include="Operations\TaskbarOperationTests.cs" />
<Compile Include="Operations\WindowMonitorOperationTests.cs" />
<Compile Include="Communication\ClientHostTests.cs" />
<Compile Include="Notifications\AboutNotificationControllerTests.cs" />
<Compile Include="Notifications\LogNotificationControllerTests.cs" />
@ -101,6 +101,10 @@
<Project>{7CC5A895-E0D3-4E43-9B39-CCEC05A5A6A7}</Project>
<Name>SafeExamBrowser.Client</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Communication\SafeExamBrowser.Communication.csproj">
<Project>{c9416a62-0623-4d38-96aa-92516b32f02f}</Project>
<Name>SafeExamBrowser.Communication</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47DA5933-BEF8-4729-94E6-ABDE2DB12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>

6
SafeExamBrowser.Client/Behaviour/ClientController.cs → SafeExamBrowser.Client/ClientController.cs
View file

@ -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
{

2
SafeExamBrowser.Client/Communication/ClientHost.cs
View file

@ -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
{

34
SafeExamBrowser.Client/CompositionRoot.cs
View file

@ -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<IOperation>();
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");

2
SafeExamBrowser.Client/Notifications/AboutNotificationController.cs
View file

@ -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;

2
SafeExamBrowser.Client/Notifications/LogNotificationController.cs
View file

@ -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;

6
SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs → SafeExamBrowser.Client/Operations/BrowserOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs → SafeExamBrowser.Client/Operations/ClipboardOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs → SafeExamBrowser.Client/Operations/ConfigurationOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs → SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs → SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs → SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs → SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs → SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs
View file

@ -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
{

6
SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs → SafeExamBrowser.Client/Operations/TaskbarOperation.cs
View file

@ -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
{

4
SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs → SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs
View file

@ -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
{

34
SafeExamBrowser.Client/SafeExamBrowser.Client.csproj
View file

@ -71,9 +71,9 @@
</ItemGroup>
<ItemGroup>
<Compile Include="App.cs" />
<Compile Include="Behaviour\ClientController.cs" />
<Compile Include="Behaviour\Operations\ConfigurationOperation.cs" />
<Compile Include="Behaviour\Operations\RuntimeConnectionOperation.cs" />
<Compile Include="ClientController.cs" />
<Compile Include="Operations\ConfigurationOperation.cs" />
<Compile Include="Operations\RuntimeConnectionOperation.cs" />
<Compile Include="Communication\ClientHost.cs" />
<Compile Include="CompositionRoot.cs" />
<Compile Include="Notifications\AboutNotificationController.cs" />
@ -82,14 +82,14 @@
<Compile Include="Notifications\LogNotificationController.cs" />
<Compile Include="Notifications\LogNotificationIconResource.cs" />
<Compile Include="Notifications\LogNotificationInfo.cs" />
<Compile Include="Behaviour\Operations\BrowserOperation.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperation.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperation.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperation.cs" />
<Compile Include="Operations\BrowserOperation.cs" />
<Compile Include="Operations\ClipboardOperation.cs" />
<Compile Include="Operations\DisplayMonitorOperation.cs" />
<Compile Include="Operations\KeyboardInterceptorOperation.cs" />
<Compile Include="Operations\MouseInterceptorOperation.cs" />
<Compile Include="Operations\ProcessMonitorOperation.cs" />
<Compile Include="Operations\TaskbarOperation.cs" />
<Compile Include="Operations\WindowMonitorOperation.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
@ -121,6 +121,10 @@
<Project>{04E653F1-98E6-4E34-9DD7-7F2BC1A8B767}</Project>
<Name>SafeExamBrowser.Browser</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Communication\SafeExamBrowser.Communication.csproj">
<Project>{c9416a62-0623-4d38-96aa-92516b32f02f}</Project>
<Name>SafeExamBrowser.Communication</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Configuration\SafeExamBrowser.Configuration.csproj">
<Project>{C388C4DD-A159-457D-AF92-89F7AD185109}</Project>
<Name>SafeExamBrowser.Configuration</Name>
@ -133,6 +137,14 @@
<Project>{3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}</Project>
<Name>SafeExamBrowser.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.I18n\SafeExamBrowser.I18n.csproj">
<Project>{10c62628-8e6a-45aa-9d97-339b119ad21d}</Project>
<Name>SafeExamBrowser.I18n</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Logging\SafeExamBrowser.Logging.csproj">
<Project>{e107026c-2011-4552-a7d8-3a0d37881df6}</Project>
<Name>SafeExamBrowser.Logging</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Monitoring\SafeExamBrowser.Monitoring.csproj">
<Project>{EF563531-4EB5-44B9-A5EC-D6D6F204469B}</Project>
<Name>SafeExamBrowser.Monitoring</Name>

4
SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostStub.cs → SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostStub.cs
View file

@ -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
{

2
SafeExamBrowser.Core.UnitTests/Communication/Hosts/BaseHostTests.cs → SafeExamBrowser.Communication.UnitTests/Hosts/BaseHostTests.cs
View file

@ -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

20
SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs Normal file
View file

@ -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")]

4
SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyImpl.cs → SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyImpl.cs
View file

@ -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
{

2
SafeExamBrowser.Core.UnitTests/Communication/Proxies/BaseProxyTests.cs → SafeExamBrowser.Communication.UnitTests/Proxies/BaseProxyTests.cs
View file

@ -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

4
SafeExamBrowser.Core.UnitTests/Communication/Proxies/ClientProxyTests.cs → SafeExamBrowser.Communication.UnitTests/Proxies/ClientProxyTests.cs
View file

@ -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

4
SafeExamBrowser.Core.UnitTests/Communication/Proxies/RuntimeProxyTests.cs → SafeExamBrowser.Communication.UnitTests/Proxies/RuntimeProxyTests.cs
View file

@ -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

4
SafeExamBrowser.Core.UnitTests/Communication/Proxies/ServiceProxyTests.cs → SafeExamBrowser.Communication.UnitTests/Proxies/ServiceProxyTests.cs
View file

@ -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

116
SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj Normal file
View file

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{21137D66-7D01-4327-92D2-0304C25CD7DF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.Communication.UnitTests</RootNamespace>
<AssemblyName>SafeExamBrowser.Communication.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.9.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.9.0\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Hosts\BaseHostStub.cs" />
<Compile Include="Hosts\BaseHostTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Proxies\BaseProxyImpl.cs" />
<Compile Include="Proxies\BaseProxyTests.cs" />
<Compile Include="Proxies\ClientProxyTests.cs" />
<Compile Include="Proxies\RuntimeProxyTests.cs" />
<Compile Include="Proxies\ServiceProxyTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Communication\SafeExamBrowser.Communication.csproj">
<Project>{c9416a62-0623-4d38-96aa-92516b32f02f}</Project>
<Name>SafeExamBrowser.Communication</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47da5933-bef8-4729-94e6-abde2db12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
</Project>

9
SafeExamBrowser.Communication.UnitTests/packages.config Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.3.1" targetFramework="net452" />
<package id="Moq" version="4.9.0" targetFramework="net452" />
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net452" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net452" />
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
</packages>

2
SafeExamBrowser.Core/Communication/Hosts/BaseHost.cs → SafeExamBrowser.Communication/Hosts/BaseHost.cs
View file

@ -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
{
/// <summary>
/// The base implementation of an <see cref="ICommunicationHost"/>. Runs the host on a new, separate thread.

2
SafeExamBrowser.Core/Communication/Hosts/HostObjectFactory.cs → SafeExamBrowser.Communication/Hosts/HostObjectFactory.cs
View file

@ -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
{
/// <summary>
/// Default implementation of the <see cref="IHostObjectFactory"/> utilizing WCF (<see cref="ServiceHost"/>).

36
SafeExamBrowser.Communication/Properties/AssemblyInfo.cs Normal file
View file

@ -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")]

2
SafeExamBrowser.Core/Communication/Proxies/BaseProxy.cs → SafeExamBrowser.Communication/Proxies/BaseProxy.cs
View file

@ -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
{
/// <summary>
/// Base implementation of an <see cref="ICommunicationProxy"/>.

2
SafeExamBrowser.Core/Communication/Proxies/ClientProxy.cs → SafeExamBrowser.Communication/Proxies/ClientProxy.cs
View file

@ -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
{
/// <summary>
/// Default implementation of the <see cref="IClientProxy"/>, to be used for communication with the client application component.

2
SafeExamBrowser.Core/Communication/Proxies/ProxyObjectFactory.cs → SafeExamBrowser.Communication/Proxies/ProxyObjectFactory.cs
View file

@ -9,7 +9,7 @@
using System.ServiceModel;
using SafeExamBrowser.Contracts.Communication.Proxies;
namespace SafeExamBrowser.Core.Communication.Proxies
namespace SafeExamBrowser.Communication.Proxies
{
/// <summary>
/// Default implementation of the <see cref="IProxyObjectFactory"/> utilizing WCF (<see cref="ChannelFactory"/>).

2
SafeExamBrowser.Core/Communication/Proxies/RuntimeProxy.cs → SafeExamBrowser.Communication/Proxies/RuntimeProxy.cs
View file

@ -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
{
/// <summary>
/// Default implementation of the <see cref="IRuntimeProxy"/>, to be used for communication with the runtime application component.

2
SafeExamBrowser.Core/Communication/Proxies/ServiceProxy.cs → SafeExamBrowser.Communication/Proxies/ServiceProxy.cs
View file

@ -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
{
/// <summary>
/// Default implementation of the <see cref="IServiceProxy"/>, to be used for communication with the service application component.

73
SafeExamBrowser.Communication/SafeExamBrowser.Communication.csproj Normal file
View file

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C9416A62-0623-4D38-96AA-92516B32F02F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.Communication</RootNamespace>
<AssemblyName>SafeExamBrowser.Communication</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.ServiceModel" />
</ItemGroup>
<ItemGroup>
<Compile Include="Hosts\BaseHost.cs" />
<Compile Include="Hosts\HostObjectFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Proxies\BaseProxy.cs" />
<Compile Include="Proxies\ClientProxy.cs" />
<Compile Include="Proxies\ProxyObjectFactory.cs" />
<Compile Include="Proxies\RuntimeProxy.cs" />
<Compile Include="Proxies\ServiceProxy.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47DA5933-BEF8-4729-94E6-ABDE2DB12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

2
SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs
View file

@ -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
{

4
SafeExamBrowser.Contracts/Behaviour/Events/InstanceTerminatedEventHandler.cs → SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs
View file

@ -7,10 +7,10 @@
*/
namespace SafeExamBrowser.Contracts.Behaviour.Events
namespace SafeExamBrowser.Contracts.Core.Events
{
/// <summary>
/// Event handler used to indicate that an application instance with a particular ID has terminated.
/// Event handler used to indicate that an <see cref="IApplicationInstance"/> with a particular ID has terminated.
/// </summary>
public delegate void InstanceTerminatedEventHandler(InstanceIdentifier id);
}

2
SafeExamBrowser.Contracts/Behaviour/Events/NameChangedEventHandler.cs → SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs
View file

@ -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
{
/// <summary>
/// Event handler used to indicate that a name has changed to a new value.

2
SafeExamBrowser.Contracts/Behaviour/IApplicationController.cs → SafeExamBrowser.Contracts/Core/IApplicationController.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Contracts.Behaviour
namespace SafeExamBrowser.Contracts.Core
{
/// <summary>
/// Controls the lifetime and functionality of a (third-party) application which can be accessed via the <see cref="ITaskbar"/>.

4
SafeExamBrowser.Contracts/Behaviour/IApplicationInstance.cs → SafeExamBrowser.Contracts/Core/IApplicationInstance.cs
View file

@ -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
{
/// <summary>
/// Defines an instance of a (third-party) application which can be accessed via the <see cref="UserInterface.Taskbar.ITaskbar"/>.

2
SafeExamBrowser.Contracts/Behaviour/IClientController.cs → SafeExamBrowser.Contracts/Core/IClientController.cs
View file

@ -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
{
/// <summary>
/// Controls the lifetime and is responsible for the event handling of the client application component.

2
SafeExamBrowser.Contracts/Behaviour/INotificationController.cs → SafeExamBrowser.Contracts/Core/INotificationController.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Contracts.Behaviour
namespace SafeExamBrowser.Contracts.Core
{
/// <summary>
/// Controls the lifetime and functionality of a notification which is part of the <see cref="ITaskbar"/>.

2
SafeExamBrowser.Contracts/Behaviour/IRuntimeController.cs → SafeExamBrowser.Contracts/Core/IRuntimeController.cs
View file

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace SafeExamBrowser.Contracts.Behaviour
namespace SafeExamBrowser.Contracts.Core
{
/// <summary>
/// Controls the lifetime and is responsible for the event handling of the runtime application component.

2
SafeExamBrowser.Contracts/Behaviour/InstanceIdentifier.cs → SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs
View file

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace SafeExamBrowser.Contracts.Behaviour
namespace SafeExamBrowser.Contracts.Core
{
/// <summary>
/// Defines an identifier which uniquely identifies an <see cref="IApplicationInstance"/> in the context of a (third-party) application.

2
SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs → SafeExamBrowser.Contracts/Core/OperationModel/IOperation.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Contracts.Behaviour.OperationModel
namespace SafeExamBrowser.Contracts.Core.OperationModel
{
/// <summary>
/// Defines an operation which will be executed as part of an <see cref="IOperationSequence"/>.

2
SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs → SafeExamBrowser.Contracts/Core/OperationModel/IOperationSequence.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Contracts.Behaviour.OperationModel
namespace SafeExamBrowser.Contracts.Core.OperationModel
{
/// <summary>
/// A sequence of <see cref="IOperation"/>s which can be used for sequential procedures, e.g. the initialization &amp; finalization of

2
SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs → SafeExamBrowser.Contracts/Core/OperationModel/OperationResult.cs
View file

@ -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
{
/// <summary>
/// Defines the result of the sequential execution of <see cref="IOperation"/>s (as part of an <see cref="IOperationSequence"/>).

22
SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
View file

@ -52,13 +52,13 @@
<Reference Include="System.ServiceModel" />
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Events\InstanceTerminatedEventHandler.cs" />
<Compile Include="Behaviour\Events\NameChangedEventHandler.cs" />
<Compile Include="Behaviour\IApplicationController.cs" />
<Compile Include="Behaviour\InstanceIdentifier.cs" />
<Compile Include="Behaviour\IRuntimeController.cs" />
<Compile Include="Behaviour\OperationModel\IOperationSequence.cs" />
<Compile Include="Behaviour\OperationModel\OperationResult.cs" />
<Compile Include="Core\Events\InstanceTerminatedEventHandler.cs" />
<Compile Include="Core\Events\NameChangedEventHandler.cs" />
<Compile Include="Core\IApplicationController.cs" />
<Compile Include="Core\InstanceIdentifier.cs" />
<Compile Include="Core\IRuntimeController.cs" />
<Compile Include="Core\OperationModel\IOperationSequence.cs" />
<Compile Include="Core\OperationModel\OperationResult.cs" />
<Compile Include="Browser\DownloadEventArgs.cs" />
<Compile Include="Browser\DownloadFinishedCallback.cs" />
<Compile Include="Browser\DownloadRequestedEventHandler.cs" />
@ -104,12 +104,12 @@
<Compile Include="Configuration\AppConfig.cs" />
<Compile Include="Configuration\ISessionData.cs" />
<Compile Include="Configuration\Settings\ConfigurationMode.cs" />
<Compile Include="Behaviour\INotificationController.cs" />
<Compile Include="Behaviour\OperationModel\IOperation.cs" />
<Compile Include="Behaviour\IClientController.cs" />
<Compile Include="Core\INotificationController.cs" />
<Compile Include="Core\OperationModel\IOperation.cs" />
<Compile Include="Core\IClientController.cs" />
<Compile Include="Configuration\IIconResource.cs" />
<Compile Include="Configuration\IApplicationInfo.cs" />
<Compile Include="Behaviour\IApplicationInstance.cs" />
<Compile Include="Core\IApplicationInstance.cs" />
<Compile Include="Configuration\INotificationInfo.cs" />
<Compile Include="Configuration\ISystemInfo.cs" />
<Compile Include="Configuration\OperatingSystem.cs" />

2
SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs
View file

@ -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
{

2
SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs
View file

@ -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

6
SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/OperationSequenceTests.cs → SafeExamBrowser.Core.UnitTests/OperationModel/OperationSequenceTests.cs
View file

@ -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

6
SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/CommunicationOperationTests.cs → SafeExamBrowser.Core.UnitTests/Operations/CommunicationOperationTests.cs
View file

@ -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

6
SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelayedInitializationOperationTests.cs → SafeExamBrowser.Core.UnitTests/Operations/DelayedInitializationOperationTests.cs
View file

@ -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

6
SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/DelegateOperationTests.cs → SafeExamBrowser.Core.UnitTests/Operations/DelegateOperationTests.cs
View file

@ -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

20
SafeExamBrowser.Core.UnitTests/Behaviour/OperationModel/I18nOperationTests.cs → SafeExamBrowser.Core.UnitTests/Operations/I18nOperationTests.cs
View file

@ -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<ILogger> loggerMock;
private Mock<IText> textMock;
private Mock<ILogger> logger;
private Mock<IText> text;
private Mock<ITextResource> textResource;
private I18nOperation sut;
[TestInitialize]
public void Initialize()
{
loggerMock = new Mock<ILogger>();
textMock = new Mock<IText>();
logger = new Mock<ILogger>();
text = new Mock<IText>();
textResource = new Mock<ITextResource>();
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<ITextResource>()), Times.Once);
text.Verify(t => t.Initialize(It.Is<ITextResource>(r => r == textResource.Object)), Times.Once);
Assert.AreEqual(OperationResult.Success, result);
}

34
SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj
View file

@ -78,24 +78,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\OperationModel\CommunicationOperationTests.cs" />
<Compile Include="Behaviour\OperationModel\DelayedInitializationOperationTests.cs" />
<Compile Include="Behaviour\OperationModel\I18nOperationTests.cs" />
<Compile Include="Behaviour\OperationModel\DelegateOperationTests.cs" />
<Compile Include="Behaviour\OperationModel\OperationSequenceTests.cs" />
<Compile Include="Communication\Hosts\BaseHostStub.cs" />
<Compile Include="Communication\Hosts\BaseHostTests.cs" />
<Compile Include="Communication\Proxies\BaseProxyImpl.cs" />
<Compile Include="Communication\Proxies\BaseProxyTests.cs" />
<Compile Include="Communication\Proxies\ClientProxyTests.cs" />
<Compile Include="Communication\Proxies\RuntimeProxyTests.cs" />
<Compile Include="Communication\Proxies\ServiceProxyTests.cs" />
<Compile Include="I18n\TextTests.cs" />
<Compile Include="I18n\XmlTextResourceTests.cs" />
<Compile Include="Logging\DefaultLogFormatterTests.cs" />
<Compile Include="Logging\LoggerTests.cs" />
<Compile Include="Logging\ModuleLoggerTests.cs" />
<Compile Include="Logging\NewLogContentType.cs" />
<Compile Include="Operations\CommunicationOperationTests.cs" />
<Compile Include="Operations\DelayedInitializationOperationTests.cs" />
<Compile Include="Operations\I18nOperationTests.cs" />
<Compile Include="Operations\DelegateOperationTests.cs" />
<Compile Include="OperationModel\OperationSequenceTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
@ -108,17 +95,6 @@
<Name>SafeExamBrowser.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="I18n\Text_Invalid.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="I18n\Text_Incompatible.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="I18n\Text_Valid.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />

4
SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs → SafeExamBrowser.Core/OperationModel/OperationSequence.cs
View file

@ -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
{
/// <summary>
/// Default implementation of the <see cref="IOperationSequence"/>.

4
SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs → SafeExamBrowser.Core/Operations/CommunicationOperation.cs
View file

@ -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
{
/// <summary>
/// An operation to handle the lifetime of an <see cref="ICommunicationHost"/>. The host is started during <see cref="Perform"/>,

4
SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs → SafeExamBrowser.Core/Operations/DelayedInitializationOperation.cs
View file

@ -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
{
/// <summary>
/// A wrapper operation to allow for a delayed (just-in-time) instantiation of an operation. Is useful when e.g. dependencies for a

4
SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs → SafeExamBrowser.Core/Operations/DelegateOperation.cs
View file

@ -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
{
/// <summary>
/// A generic operation to allow for the (inline) definition of an operation via delegates. Useful if implementing a complete

15
SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs → SafeExamBrowser.Core/Operations/I18nOperation.cs
View file

@ -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
{
/// <summary>
/// An operation to handle the initialization of an <see cref="IText"/> 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;

32
SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
View file

@ -54,35 +54,13 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\OperationModel\CommunicationOperation.cs" />
<Compile Include="Behaviour\OperationModel\DelayedInitializationOperation.cs" />
<Compile Include="Behaviour\OperationModel\I18nOperation.cs" />
<Compile Include="Behaviour\OperationModel\DelegateOperation.cs" />
<Compile Include="Behaviour\OperationModel\OperationSequence.cs" />
<Compile Include="Communication\Hosts\HostObjectFactory.cs" />
<Compile Include="Communication\Proxies\BaseProxy.cs" />
<Compile Include="Communication\Hosts\BaseHost.cs" />
<Compile Include="Communication\Proxies\ClientProxy.cs" />
<Compile Include="Communication\Proxies\ProxyObjectFactory.cs" />
<Compile Include="Communication\Proxies\RuntimeProxy.cs" />
<Compile Include="Communication\Proxies\ServiceProxy.cs" />
<Compile Include="Logging\DefaultLogFormatter.cs" />
<Compile Include="Logging\LogFileWriter.cs" />
<Compile Include="Logging\LogMessage.cs" />
<Compile Include="I18n\Text.cs" />
<Compile Include="I18n\XmlTextResource.cs" />
<Compile Include="Logging\Logger.cs" />
<Compile Include="Logging\LogText.cs" />
<Compile Include="Logging\ModuleLogger.cs" />
<Compile Include="Logging\ThreadInfo.cs" />
<Compile Include="Operations\CommunicationOperation.cs" />
<Compile Include="Operations\DelayedInitializationOperation.cs" />
<Compile Include="Operations\I18nOperation.cs" />
<Compile Include="Operations\DelegateOperation.cs" />
<Compile Include="OperationModel\OperationSequence.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="I18n\Text.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47DA5933-BEF8-4729-94E6-ABDE2DB12262}</Project>

20
SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs Normal file
View file

@ -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")]

122
SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj Normal file
View file

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.I18n.UnitTests</RootNamespace>
<AssemblyName>SafeExamBrowser.I18n.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.9.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.9.0\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TextTests.cs" />
<Compile Include="XmlTextResourceTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Text_Incompatible.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Text_Invalid.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Text_Valid.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47da5933-bef8-4729-94e6-abde2db12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.I18n\SafeExamBrowser.I18n.csproj">
<Project>{10c62628-8e6a-45aa-9d97-339b119ad21d}</Project>
<Name>SafeExamBrowser.I18n</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
</Project>

4
SafeExamBrowser.Core.UnitTests/I18n/TextTests.cs → SafeExamBrowser.I18n.UnitTests/TextTests.cs
View file

@ -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

0
SafeExamBrowser.Core.UnitTests/I18n/Text_Incompatible.xml → SafeExamBrowser.I18n.UnitTests/Text_Incompatible.xml
View file

0
SafeExamBrowser.Core.UnitTests/I18n/Text_Invalid.txt → SafeExamBrowser.I18n.UnitTests/Text_Invalid.txt
View file

0
SafeExamBrowser.Core.UnitTests/I18n/Text_Valid.xml → SafeExamBrowser.I18n.UnitTests/Text_Valid.xml
View file

13
SafeExamBrowser.Core.UnitTests/I18n/XmlTextResourceTests.cs → SafeExamBrowser.I18n.UnitTests/XmlTextResourceTests.cs
View file

@ -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();

9
SafeExamBrowser.I18n.UnitTests/packages.config Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.3.1" targetFramework="net452" />
<package id="Moq" version="4.9.0" targetFramework="net452" />
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net452" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net452" />
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
</packages>

36
SafeExamBrowser.I18n/Properties/AssemblyInfo.cs Normal file
View file

@ -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")]

75
SafeExamBrowser.I18n/SafeExamBrowser.I18n.csproj Normal file
View file

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{10C62628-8E6A-45AA-9D97-339B119AD21D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.I18n</RootNamespace>
<AssemblyName>SafeExamBrowser.I18n</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Text.cs" />
<Compile Include="XmlTextResource.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Text.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47da5933-bef8-4729-94e6-abde2db12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

2
SafeExamBrowser.Core/I18n/Text.cs → SafeExamBrowser.I18n/Text.cs
View file

@ -11,7 +11,7 @@ using System.Collections.Generic;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.I18n
namespace SafeExamBrowser.I18n
{
/// <summary>
/// Default implementation of the <see cref="IText"/> module.

0
SafeExamBrowser.Core/I18n/Text.xml → SafeExamBrowser.I18n/Text.xml
View file

2
SafeExamBrowser.Core/I18n/XmlTextResource.cs → SafeExamBrowser.I18n/XmlTextResource.cs
View file

@ -12,7 +12,7 @@ using System.IO;
using System.Xml.Linq;
using SafeExamBrowser.Contracts.I18n;
namespace SafeExamBrowser.Core.I18n
namespace SafeExamBrowser.I18n
{
/// <summary>
/// Default implementation of <see cref="ITextResource"/> to load text data from XML files.

3
SafeExamBrowser.Core.UnitTests/Logging/DefaultLogFormatterTests.cs → SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs
View file

@ -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

4
SafeExamBrowser.Core.UnitTests/Logging/LoggerTests.cs → SafeExamBrowser.Logging.UnitTests/LoggerTests.cs
View file

@ -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

4
SafeExamBrowser.Core.UnitTests/Logging/ModuleLoggerTests.cs → SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs
View file

@ -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

2
SafeExamBrowser.Core.UnitTests/Logging/NewLogContentType.cs → SafeExamBrowser.Logging.UnitTests/NewLogContentType.cs
View file

@ -9,7 +9,7 @@
using System;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.UnitTests.Logging
namespace SafeExamBrowser.Logging.UnitTests
{
class NewLogContentType : ILogContent
{

20
SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs Normal file
View file

@ -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")]

112
SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj Normal file
View file

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7F012305-1125-47CE-9C2A-146C891C0924}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.Logging.UnitTests</RootNamespace>
<AssemblyName>SafeExamBrowser.Logging.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.9.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.9.0\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DefaultLogFormatterTests.cs" />
<Compile Include="LoggerTests.cs" />
<Compile Include="ModuleLoggerTests.cs" />
<Compile Include="NewLogContentType.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47da5933-bef8-4729-94e6-abde2db12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Logging\SafeExamBrowser.Logging.csproj">
<Project>{e107026c-2011-4552-a7d8-3a0d37881df6}</Project>
<Name>SafeExamBrowser.Logging</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
</Project>

9
SafeExamBrowser.Logging.UnitTests/packages.config Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.3.1" targetFramework="net452" />
<package id="Moq" version="4.9.0" targetFramework="net452" />
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net452" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net452" />
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
</packages>

2
SafeExamBrowser.Core/Logging/DefaultLogFormatter.cs → SafeExamBrowser.Logging/DefaultLogFormatter.cs
View file

@ -9,7 +9,7 @@
using System;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.Logging
namespace SafeExamBrowser.Logging
{
/// <summary>
/// Default implementation of <see cref="ILogContentFormatter"/>.

2
SafeExamBrowser.Core/Logging/LogFileWriter.cs → SafeExamBrowser.Logging/LogFileWriter.cs
View file

@ -10,7 +10,7 @@ using System.IO;
using System.Text;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.Logging
namespace SafeExamBrowser.Logging
{
/// <summary>
/// <see cref="ILogObserver"/> which immediately saves new log content to disk.

2
SafeExamBrowser.Core/Logging/LogMessage.cs → SafeExamBrowser.Logging/LogMessage.cs
View file

@ -9,7 +9,7 @@
using System;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.Logging
namespace SafeExamBrowser.Logging
{
/// <summary>
/// Default implementation of <see cref="ILogMessage"/>.

2
SafeExamBrowser.Core/Logging/LogText.cs → SafeExamBrowser.Logging/LogText.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.Logging
namespace SafeExamBrowser.Logging
{
/// <summary>
/// Default implementation of <see cref="ILogText"/>.

2
SafeExamBrowser.Core/Logging/Logger.cs → SafeExamBrowser.Logging/Logger.cs
View file

@ -13,7 +13,7 @@ using System.Text;
using System.Threading;
using SafeExamBrowser.Contracts.Logging;
namespace SafeExamBrowser.Core.Logging
namespace SafeExamBrowser.Logging
{
/// <summary>
/// Default, thread-safe implementation of <see cref="ILogger"/>.

Some files were not shown because too many files have changed in this diff Show more