diff --git a/SafeExamBrowser.Client.UnitTests/Operations/InitializationOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/InitializationOperationTests.cs deleted file mode 100644 index 2d827ce4..00000000 --- a/SafeExamBrowser.Client.UnitTests/Operations/InitializationOperationTests.cs +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2019 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.Net; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; -using SafeExamBrowser.Client.Operations; -using SafeExamBrowser.Contracts.Core.OperationModel; -using SafeExamBrowser.Contracts.Logging; - -namespace SafeExamBrowser.Client.UnitTests.Operations -{ - [TestClass] - public class InitializationOperationTests - { - private Mock logger; - private InitializationOperation sut; - - [TestInitialize] - public void Initialize() - { - logger = new Mock(); - sut = new InitializationOperation(logger.Object); - } - - [TestMethod] - public void MustPerformSuccessfully() - { - var result = sut.Perform(); - - Assert.AreEqual(OperationResult.Success, result); - Assert.IsTrue(ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls)); - Assert.IsTrue(ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls11)); - Assert.IsTrue(ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls12)); - Assert.IsTrue(ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Ssl3)); - } - - [TestMethod] - public void MustRevertSuccessfully() - { - var result = sut.Revert(); - - Assert.AreEqual(OperationResult.Success, result); - } - } -} diff --git a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj index 2243a841..a1f663eb 100644 --- a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj +++ b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj @@ -86,7 +86,6 @@ - diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index 5bc839b1..a5b11842 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -104,7 +104,6 @@ namespace SafeExamBrowser.Client var operations = new Queue(); - operations.Enqueue(new InitializationOperation(logger)); operations.Enqueue(new I18nOperation(logger, text, textResource)); operations.Enqueue(new RuntimeConnectionOperation(logger, runtimeProxy, startupToken)); operations.Enqueue(new ConfigurationOperation(configuration, logger, runtimeProxy)); diff --git a/SafeExamBrowser.Client/Operations/InitializationOperation.cs b/SafeExamBrowser.Client/Operations/InitializationOperation.cs deleted file mode 100644 index 8bf97478..00000000 --- a/SafeExamBrowser.Client/Operations/InitializationOperation.cs +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2019 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.Net; -using SafeExamBrowser.Contracts.Core.OperationModel; -using SafeExamBrowser.Contracts.Core.OperationModel.Events; -using SafeExamBrowser.Contracts.I18n; -using SafeExamBrowser.Contracts.Logging; - -namespace SafeExamBrowser.Client.Operations -{ - internal class InitializationOperation : IOperation - { - private ILogger logger; - - public event ActionRequiredEventHandler ActionRequired { add { } remove { } } - public event StatusChangedEventHandler StatusChanged; - - public InitializationOperation(ILogger logger) - { - this.logger = logger; - } - - public OperationResult Perform() - { - logger.Info("Initializing client application..."); - StatusChanged?.Invoke(TextKey.OperationStatus_InitializeClient); - - ConfigureSecurityProtocols(); - - return OperationResult.Success; - } - - public OperationResult Revert() - { - return OperationResult.Success; - } - - private void ConfigureSecurityProtocols() - { - // Enables the security protocols specified below for all web requests which are made during application runtime. - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Ssl3; - } - } -} diff --git a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj index cf49f61d..23c1b104 100644 --- a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj +++ b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj @@ -74,7 +74,6 @@ - diff --git a/SafeExamBrowser.Contracts/I18n/TextKey.cs b/SafeExamBrowser.Contracts/I18n/TextKey.cs index ffc89148..d4f9854a 100644 --- a/SafeExamBrowser.Contracts/I18n/TextKey.cs +++ b/SafeExamBrowser.Contracts/I18n/TextKey.cs @@ -57,7 +57,6 @@ namespace SafeExamBrowser.Contracts.I18n OperationStatus_EmptyClipboard, OperationStatus_FinalizeServiceSession, OperationStatus_InitializeBrowser, - OperationStatus_InitializeClient, OperationStatus_InitializeConfiguration, OperationStatus_InitializeKioskMode, OperationStatus_InitializeProcessMonitoring, diff --git a/SafeExamBrowser.I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml index fa05cab9..de292475 100644 --- a/SafeExamBrowser.I18n/Text.xml +++ b/SafeExamBrowser.I18n/Text.xml @@ -129,9 +129,6 @@ Initializing browser - - Initializing client application - Initializing application configuration