SEBWIN-674: Added unit test assembly for third-party application logic.
This commit is contained in:
Damian Büchel
parent
3b8c63ab56
commit
23dd94d23c
9 changed files with 306 additions and 14 deletions
|
|
@ -0,0 +1,87 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 ETH Zürich, Educational Development and Technology (LET)
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
|
using Moq;
|
||||||
|
using SafeExamBrowser.Applications.Contracts;
|
||||||
|
using SafeExamBrowser.Logging.Contracts;
|
||||||
|
using SafeExamBrowser.Monitoring.Contracts.Applications;
|
||||||
|
using SafeExamBrowser.Settings.Applications;
|
||||||
|
using SafeExamBrowser.WindowsApi.Contracts;
|
||||||
|
|
||||||
|
namespace SafeExamBrowser.Applications.UnitTests
|
||||||
|
{
|
||||||
|
[TestClass]
|
||||||
|
public class ApplicationFactoryTests
|
||||||
|
{
|
||||||
|
private Mock<IApplicationMonitor> applicationMonitor;
|
||||||
|
private Mock<IModuleLogger> logger;
|
||||||
|
private Mock<INativeMethods> nativeMethods;
|
||||||
|
private Mock<IProcessFactory> processFactory;
|
||||||
|
|
||||||
|
private ApplicationFactory sut;
|
||||||
|
|
||||||
|
[TestInitialize]
|
||||||
|
public void Initialize()
|
||||||
|
{
|
||||||
|
applicationMonitor = new Mock<IApplicationMonitor>();
|
||||||
|
logger = new Mock<IModuleLogger>();
|
||||||
|
nativeMethods = new Mock<INativeMethods>();
|
||||||
|
processFactory = new Mock<IProcessFactory>();
|
||||||
|
|
||||||
|
sut = new ApplicationFactory(applicationMonitor.Object, logger.Object, nativeMethods.Object, processFactory.Object);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void MustCorrectlyCreateApplication()
|
||||||
|
{
|
||||||
|
var settings = new WhitelistApplication
|
||||||
|
{
|
||||||
|
DisplayName = "Windows Command Prompt",
|
||||||
|
ExecutableName = "cmd.exe",
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = sut.TryCreate(settings, out var application);
|
||||||
|
|
||||||
|
Assert.AreEqual(FactoryResult.Success, result);
|
||||||
|
Assert.IsNotNull(application);
|
||||||
|
Assert.IsInstanceOfType<ExternalApplication>(application);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void MustIndicateIfApplicationNotFound()
|
||||||
|
{
|
||||||
|
var settings = new WhitelistApplication
|
||||||
|
{
|
||||||
|
ExecutableName = "some_random_application_which_does_not_exist_on_a_normal_system.exe"
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = sut.TryCreate(settings, out var application);
|
||||||
|
|
||||||
|
Assert.AreEqual(FactoryResult.NotFound, result);
|
||||||
|
Assert.IsNull(application);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void MustFailGracefullyAndIndicateThatErrorOccurred()
|
||||||
|
{
|
||||||
|
var settings = new WhitelistApplication
|
||||||
|
{
|
||||||
|
DisplayName = "Windows Command Prompt",
|
||||||
|
ExecutableName = "cmd.exe",
|
||||||
|
};
|
||||||
|
|
||||||
|
logger.Setup(l => l.CloneFor(It.IsAny<string>())).Throws<Exception>();
|
||||||
|
|
||||||
|
var result = sut.TryCreate(settings, out var application);
|
||||||
|
|
||||||
|
Assert.AreEqual(FactoryResult.Error, result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
[assembly: AssemblyTitle("SafeExamBrowser.Applications.UnitTests")]
|
||||||
|
[assembly: AssemblyDescription("Safe Exam Browser")]
|
||||||
|
[assembly: AssemblyCompany("ETH Zürich")]
|
||||||
|
[assembly: AssemblyProduct("SafeExamBrowser.Applications.UnitTests")]
|
||||||
|
[assembly: AssemblyCopyright("Copyright © 2023 ETH Zürich, Educational Development and Technology (LET)")]
|
||||||
|
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
[assembly: Guid("fc6d80ec-8611-4287-87e2-17c028a10858")]
|
||||||
|
|
||||||
|
[assembly: AssemblyVersion("1.0.0.0")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||||
|
[assembly: AssemblyInformationalVersion("1.0.0.0")]
|
||||||
|
|
@ -0,0 +1,131 @@
|
||||||
|
<?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.3.0.2\build\net462\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.3.0.2\build\net462\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>{FC6D80EC-8611-4287-87E2-17C028A10858}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>SafeExamBrowser.Applications.UnitTests</RootNamespace>
|
||||||
|
<AssemblyName>SafeExamBrowser.Applications.UnitTests</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v4.7.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|x64'">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<OutputPath>bin\x64\Debug\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||||
|
<OutputPath>bin\x64\Release\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
</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>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||||
|
<OutputPath>bin\x86\Release\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.5.1.1\lib\net462\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.3.0.2\lib\net462\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.3.0.2\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Moq, Version=4.18.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Moq.4.18.4\lib\net462\Moq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Configuration" />
|
||||||
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="ApplicationFactoryTests.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="app.config" />
|
||||||
|
<None Include="packages.config" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Applications.Contracts\SafeExamBrowser.Applications.Contracts.csproj">
|
||||||
|
<Project>{ac77745d-3b41-43e2-8e84-d40e5a4ee77f}</Project>
|
||||||
|
<Name>SafeExamBrowser.Applications.Contracts</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Applications\SafeExamBrowser.Applications.csproj">
|
||||||
|
<Project>{a113e68f-1209-4689-981a-15c554b2df4e}</Project>
|
||||||
|
<Name>SafeExamBrowser.Applications</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Core.Contracts\SafeExamBrowser.Core.Contracts.csproj">
|
||||||
|
<Project>{fe0e1224-b447-4b14-81e7-ed7d84822aa0}</Project>
|
||||||
|
<Name>SafeExamBrowser.Core.Contracts</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Logging.Contracts\SafeExamBrowser.Logging.Contracts.csproj">
|
||||||
|
<Project>{64ea30fb-11d4-436a-9c2b-88566285363e}</Project>
|
||||||
|
<Name>SafeExamBrowser.Logging.Contracts</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Monitoring.Contracts\SafeExamBrowser.Monitoring.Contracts.csproj">
|
||||||
|
<Project>{6d563a30-366d-4c35-815b-2c9e6872278b}</Project>
|
||||||
|
<Name>SafeExamBrowser.Monitoring.Contracts</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.Settings\SafeExamBrowser.Settings.csproj">
|
||||||
|
<Project>{30b2d907-5861-4f39-abad-c4abf1b3470e}</Project>
|
||||||
|
<Name>SafeExamBrowser.Settings</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SafeExamBrowser.WindowsApi.Contracts\SafeExamBrowser.WindowsApi.Contracts.csproj">
|
||||||
|
<Project>{7016f080-9aa5-41b2-a225-385ad877c171}</Project>
|
||||||
|
<Name>SafeExamBrowser.WindowsApi.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.3.0.2\build\net462\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.3.0.2\build\net462\MSTest.TestAdapter.props'))" />
|
||||||
|
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.3.0.2\build\net462\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.3.0.2\build\net462\MSTest.TestAdapter.targets'))" />
|
||||||
|
</Target>
|
||||||
|
<Import Project="..\packages\MSTest.TestAdapter.3.0.2\build\net462\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.3.0.2\build\net462\MSTest.TestAdapter.targets')" />
|
||||||
|
</Project>
|
||||||
11
SafeExamBrowser.Applications.UnitTests/app.config
Normal file
11
SafeExamBrowser.Applications.UnitTests/app.config
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<runtime>
|
||||||
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
</assemblyBinding>
|
||||||
|
</runtime>
|
||||||
|
</configuration>
|
||||||
9
SafeExamBrowser.Applications.UnitTests/packages.config
Normal file
9
SafeExamBrowser.Applications.UnitTests/packages.config
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="5.1.1" targetFramework="net472" />
|
||||||
|
<package id="Moq" version="4.18.4" targetFramework="net472" />
|
||||||
|
<package id="MSTest.TestAdapter" version="3.0.2" targetFramework="net472" />
|
||||||
|
<package id="MSTest.TestFramework" version="3.0.2" targetFramework="net472" />
|
||||||
|
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
|
||||||
|
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
|
||||||
|
</packages>
|
||||||
|
|
@ -20,10 +20,10 @@ namespace SafeExamBrowser.Applications
|
||||||
{
|
{
|
||||||
public class ApplicationFactory : IApplicationFactory
|
public class ApplicationFactory : IApplicationFactory
|
||||||
{
|
{
|
||||||
private IApplicationMonitor applicationMonitor;
|
private readonly IApplicationMonitor applicationMonitor;
|
||||||
private IModuleLogger logger;
|
private readonly IModuleLogger logger;
|
||||||
private INativeMethods nativeMethods;
|
private readonly INativeMethods nativeMethods;
|
||||||
private IProcessFactory processFactory;
|
private readonly IProcessFactory processFactory;
|
||||||
|
|
||||||
public ApplicationFactory(
|
public ApplicationFactory(
|
||||||
IApplicationMonitor applicationMonitor,
|
IApplicationMonitor applicationMonitor,
|
||||||
|
|
@ -39,9 +39,9 @@ namespace SafeExamBrowser.Applications
|
||||||
|
|
||||||
public FactoryResult TryCreate(WhitelistApplication settings, out IApplication application)
|
public FactoryResult TryCreate(WhitelistApplication settings, out IApplication application)
|
||||||
{
|
{
|
||||||
var name = $"'{settings.DisplayName}' ({ settings.ExecutableName})";
|
var name = $"'{settings.DisplayName}' ({settings.ExecutableName})";
|
||||||
|
|
||||||
application = default(IApplication);
|
application = default;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
@ -82,14 +82,14 @@ namespace SafeExamBrowser.Applications
|
||||||
var paths = new List<string[]>();
|
var paths = new List<string[]>();
|
||||||
var registryPath = QueryPathFromRegistry(settings);
|
var registryPath = QueryPathFromRegistry(settings);
|
||||||
|
|
||||||
mainExecutable = default(string);
|
mainExecutable = default;
|
||||||
|
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), settings.ExecutableName });
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), settings.ExecutableName });
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.System), settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.System), settings.ExecutableName });
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), settings.ExecutableName });
|
||||||
|
|
||||||
if (settings.ExecutablePath != default(string))
|
if (settings.ExecutablePath != default)
|
||||||
{
|
{
|
||||||
paths.Add(new[] { settings.ExecutablePath, settings.ExecutableName });
|
paths.Add(new[] { settings.ExecutablePath, settings.ExecutableName });
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), settings.ExecutablePath, settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), settings.ExecutablePath, settings.ExecutableName });
|
||||||
|
|
@ -98,11 +98,11 @@ namespace SafeExamBrowser.Applications
|
||||||
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), settings.ExecutablePath, settings.ExecutableName });
|
paths.Add(new[] { Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), settings.ExecutablePath, settings.ExecutableName });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (registryPath != default(string))
|
if (registryPath != default)
|
||||||
{
|
{
|
||||||
paths.Add(new[] { registryPath, settings.ExecutableName });
|
paths.Add(new[] { registryPath, settings.ExecutableName });
|
||||||
|
|
||||||
if (settings.ExecutablePath != default(string))
|
if (settings.ExecutablePath != default)
|
||||||
{
|
{
|
||||||
paths.Add(new[] { registryPath, settings.ExecutablePath, settings.ExecutableName });
|
paths.Add(new[] { registryPath, settings.ExecutablePath, settings.ExecutableName });
|
||||||
}
|
}
|
||||||
|
|
@ -146,7 +146,7 @@ namespace SafeExamBrowser.Applications
|
||||||
logger.Error($"Failed to query path in registry for '{settings.ExecutableName}'!", e);
|
logger.Error($"Failed to query path in registry for '{settings.ExecutableName}'!", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return default(string);
|
return default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
// General Information about an assembly is controlled through the following
|
||||||
|
|
@ -14,6 +15,7 @@ using System.Runtime.InteropServices;
|
||||||
// to COM components. If you need to access a type in this assembly from
|
// to COM components. If you need to access a type in this assembly from
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
[assembly: InternalsVisibleTo("SafeExamBrowser.Applications.UnitTests")]
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
[assembly: Guid("a113e68f-1209-4689-981a-15c554b2df4e")]
|
[assembly: Guid("a113e68f-1209-4689-981a-15c554b2df4e")]
|
||||||
|
|
|
||||||
|
|
@ -80,13 +80,41 @@ namespace SafeExamBrowser.Browser.UnitTests.Handlers
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void MustNotAppendCustomHeadersForCrossDomain()
|
public void MustAppendCustomHeadersForCrossDomainResourceRequestAndMainFrame()
|
||||||
{
|
{
|
||||||
var browser = new Mock<IWebBrowser>();
|
var browser = new Mock<IWebBrowser>();
|
||||||
var headers = new NameValueCollection();
|
var headers = new NameValueCollection();
|
||||||
var request = new Mock<IRequest>();
|
var request = new Mock<IRequest>();
|
||||||
|
|
||||||
browser.SetupGet(b => b.Address).Returns("http://www.otherhost.org");
|
browser.SetupGet(b => b.Address).Returns("http://www.otherhost.org");
|
||||||
|
keyGenerator.Setup(g => g.CalculateBrowserExamKeyHash(It.IsAny<string>(), It.IsAny<byte[]>(), It.IsAny<string>())).Returns(new Random().Next().ToString());
|
||||||
|
keyGenerator.Setup(g => g.CalculateConfigurationKeyHash(It.IsAny<string>(), It.IsAny<string>())).Returns(new Random().Next().ToString());
|
||||||
|
request.SetupGet(r => r.ResourceType).Returns(ResourceType.MainFrame);
|
||||||
|
request.SetupGet(r => r.Headers).Returns(new NameValueCollection());
|
||||||
|
request.SetupGet(r => r.Url).Returns("http://www.host.org");
|
||||||
|
request.SetupSet(r => r.Headers = It.IsAny<NameValueCollection>()).Callback<NameValueCollection>((h) => headers = h);
|
||||||
|
settings.SendConfigurationKey = true;
|
||||||
|
settings.SendBrowserExamKey = true;
|
||||||
|
|
||||||
|
var result = sut.OnBeforeResourceLoad(browser.Object, Mock.Of<IBrowser>(), Mock.Of<IFrame>(), request.Object, Mock.Of<IRequestCallback>());
|
||||||
|
|
||||||
|
request.VerifyGet(r => r.Headers, Times.AtLeastOnce);
|
||||||
|
request.VerifySet(r => r.Headers = It.IsAny<NameValueCollection>(), Times.AtLeastOnce);
|
||||||
|
|
||||||
|
Assert.AreEqual(CefReturnValue.Continue, result);
|
||||||
|
Assert.IsNotNull(headers["X-SafeExamBrowser-ConfigKeyHash"]);
|
||||||
|
Assert.IsNotNull(headers["X-SafeExamBrowser-RequestHash"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void MustNotAppendCustomHeadersForCrossDomainResourceRequestAndSubResource()
|
||||||
|
{
|
||||||
|
var browser = new Mock<IWebBrowser>();
|
||||||
|
var headers = new NameValueCollection();
|
||||||
|
var request = new Mock<IRequest>();
|
||||||
|
|
||||||
|
browser.SetupGet(b => b.Address).Returns("http://www.otherhost.org");
|
||||||
|
request.SetupGet(r => r.ResourceType).Returns(ResourceType.SubResource);
|
||||||
request.SetupGet(r => r.Headers).Returns(new NameValueCollection());
|
request.SetupGet(r => r.Headers).Returns(new NameValueCollection());
|
||||||
request.SetupGet(r => r.Url).Returns("http://www.host.org");
|
request.SetupGet(r => r.Url).Returns("http://www.host.org");
|
||||||
request.SetupSet(r => r.Headers = It.IsAny<NameValueCollection>()).Callback<NameValueCollection>((h) => headers = h);
|
request.SetupSet(r => r.Headers = It.IsAny<NameValueCollection>()).Callback<NameValueCollection>((h) => headers = h);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 15
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 15.0.27130.2027
|
VisualStudioVersion = 17.5.33414.496
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime", "SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj", "{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime", "SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj", "{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}"
|
||||||
EndProject
|
EndProject
|
||||||
|
|
@ -110,6 +110,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Proctoring"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Proctoring.Contracts", "SafeExamBrowser.Proctoring.Contracts\SafeExamBrowser.Proctoring.Contracts.csproj", "{8E52BD1C-0540-4F16-B181-6665D43F7A7B}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Proctoring.Contracts", "SafeExamBrowser.Proctoring.Contracts\SafeExamBrowser.Proctoring.Contracts.csproj", "{8E52BD1C-0540-4F16-B181-6665D43F7A7B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Applications.UnitTests", "SafeExamBrowser.Applications.UnitTests\SafeExamBrowser.Applications.UnitTests.csproj", "{FC6D80EC-8611-4287-87E2-17C028A10858}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
|
@ -477,6 +479,12 @@ Global
|
||||||
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x64.Build.0 = Release|x64
|
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x64.Build.0 = Release|x64
|
||||||
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x86.ActiveCfg = Release|x86
|
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x86.ActiveCfg = Release|x86
|
||||||
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x86.Build.0 = Release|x86
|
{8E52BD1C-0540-4F16-B181-6665D43F7A7B}.Release|x86.Build.0 = Release|x86
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Debug|x86.Build.0 = Debug|x64
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{FC6D80EC-8611-4287-87E2-17C028A10858}.Release|x86.ActiveCfg = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue