Skip to content

Commit

Permalink
Improve testplatform message (#691)
Browse files Browse the repository at this point in the history 
* Fix for issue:
1) #341
2) #532

* Update message text and fix tests

* Fix test
  • Loading branch information
@Faizan2304
Faizan2304 authored Apr 7, 2017
1 parent d1bf020 commit 5f5e5ce
Show file tree
Hide file tree
Showing 53 changed files with 599 additions and 359 deletions.
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
10 changes: 10 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<target state="new">Diagnostic data adapter ('{0}') message: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="UnexpectedMessage">
<source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
<target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="VersionCheckFailed">
<source>Protocol version check failed. Make sure test runner and host are compatible.</source>
<target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
3 changes: 2 additions & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,11 @@ internal static Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabil

if (allDiscoverers == null || !allDiscoverers.Any())
{
var sourcesString = string.Join(" ", sources);
// No discoverer available, log a warning
logger.SendMessage(
TestMessageLevel.Warning,
String.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoDiscovererRegistered));
String.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources, sourcesString));

return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRun
TestMessageLevel.Warning,
string.Format(
CultureInfo.CurrentUICulture,
CrossPlatEngineResources.TestRunFailed_NoTestsAreAvailableInTheSources,
CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources,
sourcesString));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\Resources.resx">
<None Update="Resources\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</None>
</ItemGroup>
<PropertyGroup Label="Configuration">
<RootNamespace>Microsoft.VisualStudio.TestPlatform.CrossPlatEngine</RootNamespace>
Expand Down
25 changes: 4 additions & 21 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs
View file

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

10 changes: 2 additions & 8 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,13 @@
<data name="LaunchDebugProcessNotAllowedForANonDebugRun" xml:space="preserve">
<value>This operation is not allowed in the context of a non-debug run.</value>
</data>
<data name="NoDiscovererRegistered" xml:space="preserve">
<value>No test discoverer is registered to perform discovery of test cases. Register a test discoverer and try again.</value>
</data>
<data name="NoDotnetExeFound" xml:space="preserve">
<value>Could not find {0}. Make sure that the dotnet is installed on the machine.</value>
</data>
<data name="NoMatchingExecutor" xml:space="preserve">
<value>Could not find test executor with URI '{0}'. Make sure that the test executor is installed and supports .net runtime version {1}.</value>
<comment>{0} - Executor uri String {1}- Version - .net Version Eg:-2.0.50727.00</comment>
</data>
<data name="NoTestHostFileExist" xml:space="preserve">
<value>Could not find testhost.dll for source '{0}'. Make sure test project has a nuget reference of package "microsoft.testplatform.testhost".</value>
</data>
<data name="NoValidSourceFoundForDiscovery" xml:space="preserve">
<value>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </value>
</data>
Expand All @@ -174,8 +168,8 @@
<data name="TestHostExitedWithError" xml:space="preserve">
<value>Testhost process exited with error: {0}</value>
</data>
<data name="TestRunFailed_NoTestsAreAvailableInTheSources" xml:space="preserve">
<value>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</value>
<data name="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" xml:space="preserve">
<value>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</value>
</data>
<data name="UnsupportedPropertiesInTestCaseFilter" xml:space="preserve">
<value>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}) and try again.</value>
Expand Down
Loading

0 comments on commit 5f5e5ce

Please sign in to comment.