Skip to content

Make the adapter localizable #23

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.

Sign up for GitHub

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

Merged
LukaszMendakiewicz merged 7 commits into from
Aug 24, 2017
Merged

Make the adapter localizable #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5b511c
Moving strings to resource .resx file
rashidsarwar Jun 26, 2017
5f9cd8c
addressing feedback
rashidsarwar Aug 18, 2017
445dd0e
Assorted fit-and-finish
Aug 23, 2017
f0d43ee
Undo unfinished work for BatchFile resource
Aug 23, 2017
4728980
Fix some resources comments
Aug 23, 2017
44506f2
Remove unused resources
Aug 23, 2017
edef637
Additional fixes
Aug 24, 2017
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
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Common.Dynamic.GTA/Strings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace GoogleTestAdapter.Common
public class Strings : IStrings
{
public string ExtensionName => "Google Test Adapter";
public string TroubleShootingLink => "Check out Google Test Adapter's trouble shooting section at https://github.com/csoltenborn/GoogleTestAdapter#trouble_shooting";
public string TroubleShootingLink => "{0}Check out Google Test Adapter's trouble shooting section at https://github.com/csoltenborn/GoogleTestAdapter#trouble_shooting";
public string TestDiscoveryStarting => "Google Test Adapter: Test discovery starting...";
public string TestExecutionStarting => "Google Test Adapter: Test execution starting...";
}
Expand Down
12 changes: 12 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Strings.cs" />
</ItemGroup>
<ItemGroup>
Expand All @@ -61,6 +66,13 @@
<Name>Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(NuGetPackages)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(NuGetPackages)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
<PropertyGroup>
Expand Down
99 changes: 99 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs
View file
Open in desktop

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

133 changes: 133 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ExtensionName" xml:space="preserve">
<value>Test Adapter for Google Test</value>
</data>
<data name="TestDiscoveryStarting" xml:space="preserve">
<value>Test Adapter for Google Test: Test discovery starting...</value>
</data>
<data name="TestExecutionStarting" xml:space="preserve">
<value>Test Adapter for Google Test: Test execution starting...</value>
</data>
<data name="TroubleShootingLink" xml:space="preserve">
<value>{0}Check out Test Adapter for Google Test's trouble shooting section at https://go.microsoft.com/fwlink/?linkid=848168</value>
<comment>{0} is empty or a name of a thread followed by space (e.g. "[T0] ")</comment>
</data>
</root>
8 changes: 4 additions & 4 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Strings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ namespace GoogleTestAdapter.Common
{
public class Strings : IStrings
{
public string ExtensionName => "Test Adapter for Google Test";
public string TroubleShootingLink => "Check out Test Adapter for Google Test's trouble shooting section at https://go.microsoft.com/fwlink/?linkid=848168";
public string TestDiscoveryStarting => "Test Adapter for Google Test: Test discovery starting...";
public string TestExecutionStarting => "Test Adapter for Google Test: Test execution starting...";
public string ExtensionName => Resources.ExtensionName;
public string TroubleShootingLink => Resources.TroubleShootingLink;
public string TestDiscoveryStarting => Resources.TestDiscoveryStarting;
public string TestExecutionStarting => Resources.TestExecutionStarting;
}
}
6 changes: 4 additions & 2 deletions GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
// This file has been modified by Microsoft on 8/2017.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand Down Expand Up @@ -163,7 +165,7 @@ public void GetTestsFromExecutable_WithoutPathExtension_ProducesWarning()
IList<TestCase> testCases = discoverer.GetTestsFromExecutable(targetExe);
Copy link
Copy Markdown

@LukaszMendakiewicz LukaszMendakiewicz Aug 17, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs Microsoft-modified header at the top of the file. #Closed

Copy link
Copy Markdown
Author

@rashidsarwar rashidsarwar Aug 18, 2017 •
edited by LukaszMendakiewicz
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved #Closed


testCases.Count.Should().Be(0);
MockLogger.Verify(l => l.LogError(It.Is<string>(s => s.StartsWith("Could not list test cases of executable"))));
MockLogger.Verify(l => l.LogError(It.Is<string>(s => s.StartsWith("Could not list test cases for executable"))));
}
finally
{
Expand Down
10 changes: 10 additions & 0 deletions GoogleTestAdapter/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<Compile Include="Helpers\ProcessLauncher.cs" />
<Compile Include="Helpers\TestProcessLauncher.cs" />
<Compile Include="Helpers\RegexTraitParser.cs" />
<Compile Include="Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Model\TestCaseMetaDataProperty.cs" />
<Compile Include="Model\TestProperty.cs" />
<Compile Include="Runners\TestResultCollector.cs" />
Expand Down Expand Up @@ -108,6 +113,11 @@
<SubType>Designer</SubType>
<LogicalName>GtaTestDurations.xsd</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="Key.snk" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading