Making Trx Logger Hierarchical for ordered test and data driven tests

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IDataAttachment.cs

@@ -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.

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestAggregation.cs

@@ -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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+{
+    internal interface ITestAggregation : ITestElement
+    {
+        Dictionary<Guid, TestLink> TestLinks { get; }
+    }
+}

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestElement.cs

@@ -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; }
+    }
+}

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResult.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+{
+    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; }
+    }
+}

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResultAggregation.cs

@@ -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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+{
+    internal interface ITestResultAggregation : ITestResult
+    {
+        List<ITestResult> InnerResults { get; }
+    }
+}

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStore.cs

@@ -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.

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStoreCustom.cs

@@ -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.

src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/XmlTestStoreParameters.cs

@@ -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()
         {

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

@@ -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 : TestAggregation, 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; }
+        }
+
+        /// <summary>
+        /// Gets the test type.
+        /// </summary>
+        public override TestType TestType
+        {
+            get { return Constants.OrderedTestType; }
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+// 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;
+    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+    /// <summary>
+    /// Test aggregation element.
+    /// </summary>
+    internal abstract class TestAggregation : TestElement, ITestAggregation
+    {
+        protected Dictionary<Guid, TestLink> testLinks = new Dictionary<Guid, TestLink>();
+
+        public TestAggregation(Guid id, string name, string adapter) : base(id, name, adapter) { }
+
+        /// <summary>
+        /// Test links.
+        /// </summary>
+        public Dictionary<Guid, TestLink> TestLinks
+        {
+            get { return testLinks; }
+        }
+
+        public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
+        {
+            base.Save(element, parameters);
+
+            XmlPersistence h = new XmlPersistence();
+            if (testLinks.Count > 0)
+                h.SaveIEnumerable(testLinks.Values, element, "TestLinks", ".", "TestLink", parameters);
+        }
+    }
+}

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

@@ -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 = "")]
@@ -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>