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

Making Trx Logger Hierarchical for ordered test and data driven tests #1330

Merged
merged 31 commits into from
Feb 14, 2018
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2b6ce73
making classes internal
abhishkk Dec 8, 2017
c6dfed1
Model classes to be consumed by trx logger
abhishkk Dec 8, 2017
c0628c9
initial changes for trx hierarchical
abhishkk Dec 8, 2017
f7a513e
refactoring
abhishkk Dec 8, 2017
9fe2b79
fix for hierarchical level more than 1
abhishkk Dec 8, 2017
04dcb99
Merge branch 'master' into trxLogger
abhishekkumawat23 Dec 8, 2017
def71ab
Merge branch 'master' of https://github.com/Microsoft/vstest into trx…
abhishkk Dec 8, 2017
f7efc36
removing unnecessary inner resutls count
abhishkk Dec 8, 2017
0e93fbd
Merge branch 'master' of https://github.com/Microsoft/vstest into trx…
abhishkk Dec 13, 2017
982160a
refactoring
abhishkk Dec 13, 2017
7f98cfd
Interfaces refactoring
abhishkk Dec 13, 2017
2daf495
refactoring
abhishkk Dec 13, 2017
b7168ee
refactoring
abhishkk Dec 13, 2017
a128e79
Refactoring
abhishkk Dec 14, 2017
8851e47
refactoring
abhishkk Dec 14, 2017
a565b9e
refactoring
abhishkk Dec 14, 2017
59d4035
remove debugger
abhishkk Dec 20, 2017
d7d1159
Merge branch 'master' into trxlogger
abhishekkumawat23 Jan 2, 2018
7c38847
Review comments
abhishkk Jan 3, 2018
23a65f5
Merge branch 'trxlogger' of https://github.com/abhishekkumawat23/vste…
abhishkk Jan 3, 2018
14e3f04
Merge branch 'master' into trxlogger
abhishekkumawat23 Jan 3, 2018
e738cca
Unit tests
abhishkk Jan 3, 2018
373c938
concurrent hash map
abhishkk Jan 3, 2018
71b2df9
Merge branch 'trxLogger' of https://github.com/abhishekkumawat23/vste…
abhishkk Jan 4, 2018
6ae9bd5
Fixes
abhishkk Jan 8, 2018
329f9b6
Merge branch 'master' of https://github.com/Microsoft/vstest into trx…
abhishkk Jan 8, 2018
f2c456b
Merge branch 'master' into trxlogger
abhishekkumawat23 Jan 8, 2018
4f1dc86
Merge branch 'master' into trxlogger
abhishekkumawat23 Jan 22, 2018
d627e29
Merge branch 'master' into trxlogger
abhishkk Feb 1, 2018
7f41647
Merge branch 'master' into trxlogger
abhishkk Feb 13, 2018
f3da229
PR comments
abhishkk Feb 14, 2018
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 @@ -6,7 +6,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
/// <summary>
/// Interface used to define a data attachment.
/// </summary>
public interface IDataAttachment
internal interface IDataAttachment
{
/// <summary>
/// Gets the description for the attachment.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
{
using System;
using System.Collections.Generic;

internal interface ITestAggregation : ITestElement
{
Dictionary<Guid, TestLink> TestLinks { get; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
{
internal interface ITestElement
{
TestId Id { get; }
string Name { get; set; }
string Owner { get; set; }
string Storage { get; set; }
string Adapter { get; }
int Priority { get; set; }
bool IsRunnable { get; }
TestExecId ExecutionId { get; set; }
TestExecId ParentExecutionId { get; set; }
TestListCategoryId CategoryId { get; set; }
TestCategoryItemCollection TestCategories { get; }
TestType TestType { get; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
{

using System;

internal interface ITestResult
{
TestResultId Id { get; }
string ResultType { get; set; }
string StdOut { get; set; }
string StdErr { get; set; }
string DebugTrace { get; set; }
string TestResultsDirectory { get; }
string RelativeTestResultsDirectory { get; }
string ErrorMessage { get; set; }
string ErrorStackTrace { get; set; }
string ComputerName { get; }
string[] TextMessages { get; set; }
int DataRowInfo { get; set; }
DateTime StartTime { get; set; }
DateTime EndTime { get; set; }
TimeSpan Duration { get; set; }
TestOutcome Outcome { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
{
using System.Collections.Generic;

internal interface ITestResultAggregation : ITestResult
{
List<ITestResult> InnerResults { get; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
/// Implementing this interface indicates a custom persistence logic is provided.
/// The attribute based persistence is ignored in such a case.
/// </summary>
public interface IXmlTestStore
internal interface IXmlTestStore
{
/// <summary>
/// Saves the class under the XmlElement.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML
/// <summary>
/// Implementing this interface allows you to customize XmlStore persistence.
/// </summary>
public interface IXmlTestStoreCustom
internal interface IXmlTestStoreCustom
{
/// <summary>
/// Gets the name of the tag to use to persist this object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
/// saved when 'MyClass.SaveDetails' parameter is set to 'true'.
/// </example>
[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
public sealed class XmlTestStoreParameters : Dictionary<string, object>
internal sealed class XmlTestStoreParameters : Dictionary<string, object>
{
private XmlTestStoreParameters()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
{
using System;
using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
using Microsoft.TestPlatform.Extensions.TrxLogger.XML;

/// <summary>
/// Ordered test element.
/// </summary>
internal class OrderedTestElement : TestElementAggregation, IXmlTestStoreCustom
{
public OrderedTestElement(Guid id, string name, string adapter) : base(id, name, adapter) { }

string IXmlTestStoreCustom.ElementName
{
get { return Constants.OrderedTestElementName; }
}

string IXmlTestStoreCustom.NamespaceUri
{
get { return null; }
Copy link
Contributor

Choose a reason for hiding this comment

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

null [](start = 25, length = 4)

why null

}

/// <summary>
/// Gets the test type.
/// </summary>
public override TestType TestType
{
get { return Constants.OrderedTestType; }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
/// <summary>
/// Stores a string which categorizes the Test
/// </summary>
public sealed class TestCategoryItem : IXmlTestStore
internal sealed class TestCategoryItem : IXmlTestStore
{
#region Fields
[StoreXmlSimpleField(Location = "@TestCategory", DefaultValue = "")]
Expand Down Expand Up @@ -123,7 +123,7 @@ public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameter
/// <summary>
/// A collection of strings which categorize the test.
/// </summary>
public sealed class TestCategoryItemCollection : EqtBaseCollection<TestCategoryItem>
internal sealed class TestCategoryItemCollection : EqtBaseCollection<TestCategoryItem>
{
#region Constructors
/// <summary>
Expand Down
Loading