Skip to content

Commit 47eb51b

Browse files
committed
Revert "Write props of tests into trx (#14905)"
This reverts commit fa4e09f.
1 parent 8a7b327 commit 47eb51b

File tree

7 files changed

+13
-263
lines changed

7 files changed

+13
-263
lines changed

src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ private FeatureFlag() { }
7272
// Disable not sharing .NET Framework testhosts. Which will return behavior to sharing testhosts when they are running .NET Framework dlls, and are not disabling appdomains or running in parallel.
7373
public const string VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST = nameof(VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST);
7474

75-
// Disable outputting Traits into TRX file in the Properties node.
76-
public const string VSTEST_DISABLE_TRX_WRITE_PROPERTIES = nameof(VSTEST_DISABLE_TRX_WRITE_PROPERTIES);
7775

7876
[Obsolete("Only use this in tests.")]
7977
internal static void Reset()

src/Microsoft.TestPlatform.CoreUtilities/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Runtime.CompilerServices;
55

66
[assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestHostRuntimeProvider, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
7-
[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
87
[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
98
[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
109
[assembly: InternalsVisibleTo("Microsoft.TestPlatform.CoreUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]

src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
<ItemGroup>
3232
<Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
33+
<Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
3334
</ItemGroup>
3435

3536
<ItemGroup>
@@ -43,6 +44,11 @@
4344
</ItemGroup>
4445

4546
<ItemGroup>
47+
<Compile Update="NullableHelpers.cs">
48+
<DesignTime>True</DesignTime>
49+
<AutoGen>True</AutoGen>
50+
<DependentUpon>NullableHelpers.tt</DependentUpon>
51+
</Compile>
4652
<Compile Update="Resources\TrxResource.Designer.cs">
4753
<DesignTime>True</DesignTime>
4854
<AutoGen>True</AutoGen>
@@ -70,6 +76,13 @@
7076
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
7177
</ItemGroup>
7278

79+
<ItemGroup>
80+
<None Update="NullableHelpers.tt">
81+
<Generator>TextTemplatingFileGenerator</Generator>
82+
<LastGenOutput>NullableHelpers.cs</LastGenOutput>
83+
</None>
84+
</ItemGroup>
85+
7386
<ItemGroup>
7487
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
7588
</ItemGroup>

src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/Property.cs

Lines changed: 0 additions & 98 deletions
This file was deleted.

src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/PropertyCollection.cs

Lines changed: 0 additions & 135 deletions
This file was deleted.

src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElement.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ internal abstract class TestElement : ITestElement, IXmlTestStore
3232
protected TestExecId _executionId;
3333
protected TestExecId _parentExecutionId;
3434
protected TestCategoryItemCollection _testCategories;
35-
protected PropertyCollection _properties;
3635
protected WorkItemCollection _workItems;
3736
protected TestListCategoryId _catId;
3837

@@ -47,7 +46,6 @@ public TestElement(Guid id, string name, string adapter)
4746
_executionId = TestExecId.Empty;
4847
_parentExecutionId = TestExecId.Empty;
4948
_testCategories = new TestCategoryItemCollection();
50-
_properties = new PropertyCollection();
5149
_workItems = new WorkItemCollection();
5250
_isRunnable = true;
5351
_catId = TestListCategoryId.Uncategorized;
@@ -187,21 +185,6 @@ public WorkItemCollection WorkItems
187185
}
188186
}
189187

190-
191-
/// <summary>
192-
/// Gets or sets the test traits.
193-
/// </summary>
194-
public PropertyCollection Traits
195-
{
196-
get { return _properties; }
197-
198-
set
199-
{
200-
EqtAssert.ParameterNotNull(value, "value");
201-
_properties = value;
202-
}
203-
}
204-
205188
/// <summary>
206189
/// Gets the adapter name.
207190
/// </summary>
@@ -262,7 +245,6 @@ public virtual void Save(System.Xml.XmlElement element, XmlTestStoreParameters?
262245
h.SaveSimpleField(element, "@priority", _priority, DefaultPriority);
263246
h.SaveSimpleField(element, "Owners/Owner/@name", _owner, string.Empty);
264247
h.SaveObject(_testCategories, element, "TestCategory", parameters);
265-
h.SaveObject(_properties, element, "Properties", parameters);
266248

267249
if (_executionId != null)
268250
h.SaveGuid(element, "Execution/@id", _executionId.Id);

src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
1515
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
1616
using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
17-
using Microsoft.VisualStudio.TestPlatform.Utilities;
1817

1918
using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
2019
using TrxObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
@@ -77,14 +76,6 @@ public static ITestElement ToTestElement(
7776
testElement.WorkItems.Add(workItem);
7877
}
7978

80-
if (!FeatureFlag.Instance.IsSet(nameof(FeatureFlag.VSTEST_DISABLE_TRX_WRITE_PROPERTIES)))
81-
{
82-
foreach (var trait in rockSteadyTestCase.Traits.Where(t => t.Name is not "Owner" and not "Priority"))
83-
{
84-
testElement.Traits.Add(new Property(trait.Name, trait.Value));
85-
}
86-
}
87-
8879
return testElement;
8980
}
9081

0 commit comments

Comments
 (0)