Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed review comments for PR #3728 #3882

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
var processName = _processHelper.GetCurrentProcessFileName();
if (processName is not null)
{
if (!_environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows) &&
!processName.EndsWith(DotnetHostHelper.MONOEXENAME, StringComparison.OrdinalIgnoreCase))
if (!_environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)
&& !processName.EndsWith(DotnetHostHelper.MONOEXENAME, StringComparison.OrdinalIgnoreCase))
{
launcherPath = _dotnetHostHelper.GetMonoPath();
argumentsString = testhostProcessPath.AddDoubleQuote() + " " + argumentsString;
Expand Down
10 changes: 5 additions & 5 deletions src/vstest.console/InProcessVsTestConsoleWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal InProcessVsTestConsoleWrapper(
{
// Close the sender as it failed to host server.
_requestSender.Close();
throw new TransationLayerException("Error hosting communication channel.");
throw new TransationLayerException(Resources.Resources.ErrorHostingCommunicationChannel);
}

// Fill the parameters.
Expand Down Expand Up @@ -119,9 +119,9 @@ internal InProcessVsTestConsoleWrapper(
if (TestRequestManager is null)
{
TPDebug.Assert(
(DesignModeClient?)DesignModeClient.Instance != null,
DesignModeClient.Instance != null,
"DesignModeClient.Instance is null");
TestRequestManager = ((DesignModeClient)DesignModeClient.Instance).TestRequestManager;
TestRequestManager = DesignModeClient.Instance.TestRequestManager;
}

_testPlatformEventSource.TranslationLayerInitializeStop();
Expand Down Expand Up @@ -476,7 +476,7 @@ public void RunTests(

var testRunPayload = new TestRunRequestPayload
{
Sources = sourceList.ToList(),
Sources = sourceList,
RunSettings = runSettings,
TestPlatformOptions = options,
TestSessionInfo = testSessionInfo
Expand Down Expand Up @@ -637,7 +637,7 @@ testSessionInfo is null
{
Sources = sourceList,
RunSettings = runSettings,
DebuggingEnabled = (customLauncher?.IsDebug == true),
DebuggingEnabled = customLauncher?.IsDebug == true,
TestPlatformOptions = options,
TestSessionInfo = testSessionInfo
};
Expand Down
9 changes: 9 additions & 0 deletions src/vstest.console/Resources/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/vstest.console/Resources/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -819,4 +819,7 @@
<data name="StopTestSessionTimedOut" xml:space="preserve">
<value>Waiting for stop test session timed out after {0} seconds.</value>
</data>
</root>
<data name="ErrorHostingCommunicationChannel" xml:space="preserve">
<value>Error hosting communication channel.</value>
</data>
</root>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@ Comportements actuellement pris en charge :
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@ Altere o prefixo de nível de diagnóstico do agente de console, como mostrado a
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@ Günlükler için izleme düzeyini aşağıda gösterildiği gibi değiştirin
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,11 @@ Format : TestRunParameters.Parameter(name="&lt;name&gt;", value="&lt;value&gt;")
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,11 @@
<target state="new">Waiting for stop test session timed out after {0} seconds.</target>
<note></note>
</trans-unit>
<trans-unit id="ErrorHostingCommunicationChannel">
<source>Error hosting communication channel.</source>
<target state="new">Error hosting communication channel.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>