com.unity.test-framework.performance@2.5.1-preview

## [2.5.1] - 2021-01-05

Fix serialization for Performance Test Report window

## [2.5.0] - 2020-12-29

Add domain reload support
Switch from Newtonsoft.Json to Unity json module

## [2.4.1] - 2020-11-05

Metadata collection was made public

Author: Unity Technologies

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [2.5.1] - 2021-01-05
+
+Fix serialization for Performance Test Report window
+
+
+## [2.5.0] - 2020-12-29
+
+Add domain reload support
+Switch from Newtonsoft.Json to Unity json module
+
+
 ## [2.4.1] - 2020-11-05
 
 Metadata collection was made public

Documentation~/index.md

@@ -11,7 +11,7 @@ The Performance Testing Extension is intended to be used with, and complement, t
 
 To install the Performance Testing Extension package
 1. Open the `manifest.json` file for your Unity project (located in the YourProject/Packages directory) in a text editor
-2. Add `"com.unity.test-framework.performance": "2.4.0",` to the dependencies
+2. Add `"com.unity.test-framework.performance": "2.5.0",` to the dependencies
 3. Save the manifest.json file
 4. Verify the Performance Testing Extension is now installed opening the Unity Package Manager window
 

Editor/PerformanceTestRunSaver.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 using UnityEditor.TestTools.TestRunner.Api;
@@ -22,7 +21,10 @@ static TestRunnerInitializer()
     [Serializable]
     public class PerformanceTestRunSaver : ScriptableObject, ICallbacks
     {
-        void ICallbacks.RunStarted(ITestAdaptor testsToRun) { }
+        void ICallbacks.RunStarted(ITestAdaptor testsToRun)
+        {
+            PerformanceTest.Active = null;
+        }
 
         void ICallbacks.RunFinished(ITestResultAdaptor result)
         {
@@ -37,7 +39,7 @@ void ICallbacks.RunFinished(ITestResultAdaptor result)
                 var xmlParser = new TestResultXmlParser();
                 var run = xmlParser.GetPerformanceTestRunFromXml(xmlPath);
                 if (run == null) return;
-                File.WriteAllText(jsonPath, JsonConvert.SerializeObject(run, Formatting.Indented));
+                File.WriteAllText(jsonPath, JsonUtility.ToJson(run, true));
             }
             catch (Exception e)
             {

Editor/TestReportGraph/SampleGroupAdditionalData.cs

@@ -1,8 +1,11 @@
-struct SampleGroupAdditionalData
+namespace Unity.PerformanceTesting.Editor
 {
-    public float min;
-    public float lowerQuartile;
-    public float median;
-    public float upperQuartile;
-    public float max;
-}
+    struct SampleGroupAdditionalData
+    {
+        public float min;
+        public float lowerQuartile;
+        public float median;
+        public float upperQuartile;
+        public float max;
+    }
+}

Editor/TestReportGraph/SamplePoint.cs

@@ -1,18 +1,21 @@
 using System;
 
-struct SamplePoint : IComparable<SamplePoint>
+namespace Unity.PerformanceTesting.Editor
 {
-    public double sample;
-    public int index;
-
-    public SamplePoint(double _sample, int _index)
+    struct SamplePoint : IComparable<SamplePoint>
     {
-        sample = _sample;
-        index = _index;
-    }
+        public double sample;
+        public int index;
 
-    public int CompareTo(SamplePoint other)
-    {
-        return sample.CompareTo(other.sample);
+        public SamplePoint(double _sample, int _index)
+        {
+            sample = _sample;
+            index = _index;
+        }
+
+        public int CompareTo(SamplePoint other)
+        {
+            return sample.CompareTo(other.sample);
+        }
     }
 }

Editor/TestReportGraph/TestListTable.cs

@@ -1,35 +1,35 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.PerformanceTesting.Data;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using UnityEngine.Assertions;
+using Unity.PerformanceTesting.Data;
 
-namespace Unity.PerformanceTesting
+namespace Unity.PerformanceTesting.Editor
 {
     class TestListTableItem : TreeViewItem
     {
         public int index;
-        public TestResult test;
+        public PerformanceTestResult performanceTest;
         public double deviation;
         public double standardDeviation;
         public double median;
         public double min;
         public double max;
 
-        public TestListTableItem(int id, int depth, string displayName, TestResult test)
+        public TestListTableItem(int id, int depth, string displayName, PerformanceTestResult performanceTest)
             : base(id, depth,
                 displayName)
         {
-            this.test = test;
+            this.performanceTest = performanceTest;
 
             index = id;
             deviation = 0f;
-            if (test != null)
+            if (performanceTest != null)
             {
-                foreach (var sample in test.SampleGroups)
+                foreach (var sample in performanceTest.SampleGroups)
                 {
                     if (sample.Name == "Time")
                     {
@@ -231,7 +231,7 @@ void SortByMultipleColumns()
                         orderedQuery = orderedQuery.ThenBy(l => l.displayName, ascending);
                         break;
                     case SortOption.SampleCount:
-                        orderedQuery = orderedQuery.ThenBy(l => l.test.SampleGroups.Count, ascending);
+                        orderedQuery = orderedQuery.ThenBy(l => l.performanceTest.SampleGroups.Count, ascending);
                         break;
                     case SortOption.Deviation:
                         orderedQuery = orderedQuery.ThenBy(l => l.deviation, ascending);
@@ -265,7 +265,7 @@ IOrderedEnumerable<TestListTableItem> InitialOrder(IEnumerable<TestListTableItem
                 case SortOption.Name:
                     return myTypes.Order(l => l.displayName, ascending);
                 case SortOption.SampleCount:
-                    return myTypes.Order(l => l.test.SampleGroups.Count, ascending);
+                    return myTypes.Order(l => l.performanceTest.SampleGroups.Count, ascending);
                 case SortOption.Deviation:
                     return myTypes.Order(l => l.deviation, ascending);
                 case SortOption.StandardDeviation:
@@ -309,7 +309,7 @@ void CellGUI(Rect cellRect, TestListTableItem item, MyColumns column, ref RowGUI
                     EditorGUI.LabelField(cellRect, string.Format("{0}", item.displayName));
                     break;
                 case MyColumns.SampleCount:
-                    EditorGUI.LabelField(cellRect, string.Format("{0}", item.test.SampleGroups.Count));
+                    EditorGUI.LabelField(cellRect, string.Format("{0}", item.performanceTest.SampleGroups.Count));
                     break;
                 case MyColumns.Deviation:
                     EditorGUI.LabelField(cellRect, string.Format("{0:f2}", item.deviation));

Editor/TestReportGraph/TestReportWindow.cs

@@ -6,11 +6,10 @@
 using UnityEditor.IMGUI.Controls;
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using Unity.PerformanceTesting.Data;
 using Unity.PerformanceTesting.Runtime;
 
-namespace Unity.PerformanceTesting
+namespace Unity.PerformanceTesting.Editor
 {
     public class TestReportWindow : EditorWindow
     {
@@ -57,6 +56,8 @@ public class TestReportWindow : EditorWindow
         Vector2 m_sampleGroupScroll = new Vector2(0, 0);
         List<SampleGroupAdditionalData> m_sampleGroupAdditionalData = new List<SampleGroupAdditionalData>();
 
+        private const int m_chartLimit = 1000;
+
         private void CreateTestListTable()
         {
             if (m_testListTreeViewState == null)
@@ -97,7 +98,7 @@ public void SelectTest(string name)
             }
         }
 
-        public void SelectTest(TestResult result)
+        public void SelectTest(PerformanceTestResult result)
         {
             m_selectedTest = result.Name;
 
@@ -173,7 +174,7 @@ private void LoadData()
             if (!File.Exists(filePath)) return;
 
             string json = File.ReadAllText(filePath);
-            m_resultsData = JsonConvert.DeserializeObject<Run>(json);
+            m_resultsData = JsonUtility.FromJson<Run>(json);
             ResetFileCheck();
 
             List<SamplePoint> samplePoints = new List<SamplePoint>();
@@ -304,7 +305,6 @@ private void Refresh()
                 SelectTest(m_selectedTest);
             else
                 SelectTest(0);
-
             Repaint();
         }
 
@@ -446,7 +446,7 @@ private void Draw()
                         {
                             var data = m_sampleGroupAdditionalData[dataIndex];
                             dataIndex++;
-
+                            var samplesToDraw = sampleGroup.Samples;
                             float min = data.min;
                             float lowerQuartile = data.lowerQuartile;
                             float median = data.median;
@@ -461,7 +461,12 @@ private void Draw()
                                 GUILayout.ExpandHeight(false));
                             EditorGUILayout.LabelField(sampleGroup.Name, m_boldStyle);
                             EditorGUILayout.LabelField("Sample Unit: " + sampleGroup.Unit.ToString());
-
+                            if (samplesToDraw.Count > m_chartLimit)
+                            {
+                                string message = string.Format("Sample Group has more than {0} Samples. The first {0} Samples will be displayed. However, calculations are done according to the all samples received from the test run.", m_chartLimit);
+                                EditorGUILayout.HelpBox(message, MessageType.Warning, true);
+                                samplesToDraw = samplesToDraw.Take(m_chartLimit).ToList();
+                            }
                             EditorGUILayout.BeginHorizontal(GUILayout.Height(100), GUILayout.ExpandHeight(false));
 
                             EditorGUILayout.BeginVertical(GUILayout.Width(100), GUILayout.ExpandHeight(true));
@@ -480,7 +485,7 @@ private void Draw()
                             GUILayout.FlexibleSpace();
                             Draw2Column("Min", min);
                             EditorGUILayout.EndVertical();
-                            DrawBarGraph(position.width - 200, 100, sampleGroup.Samples, graphMin, max, median);
+                            DrawBarGraph(position.width - 200, 100, samplesToDraw, graphMin, max, median);
                             DrawBoxAndWhiskerPlot(50, 100, min, lowerQuartile, median, upperQuartile, max, min, max,
                                 (float)sampleGroup.StandardDeviation, m_colorWhite, m_colorBoxAndWhiskerBackground);
                             EditorGUILayout.EndHorizontal();

Editor/TestResultXmlParser.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using Newtonsoft.Json;
 using Unity.PerformanceTesting.Data;
 using UnityEngine;
 
@@ -112,11 +111,11 @@ private Run DeserializeMetadata(IEnumerable<XElement> output)
             return null;
         }
 
-        private TestResult TryDeserializePerformanceTestResultJsonObject(string json)
+        private PerformanceTestResult TryDeserializePerformanceTestResultJsonObject(string json)
         {
             try
             {
-                return JsonConvert.DeserializeObject<TestResult>(json);
+                return JsonUtility.FromJson<PerformanceTestResult>(json);
             }
             catch (Exception e)
             {
@@ -131,7 +130,7 @@ private Run TryDeserializePerformanceTestRunJsonObject(string json)
         {
             try
             {
-                return JsonConvert.DeserializeObject<Run>(json);
+                return JsonUtility.FromJson<Run>(json);
             }
             catch (Exception e)
             {

Editor/TestRunBuilder.cs

@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
 using Unity.PerformanceTesting.Data;
 using Unity.PerformanceTesting.Editor;
 using Unity.PerformanceTesting.Runtime;
@@ -155,7 +154,7 @@ private void CreatePerformanceTestRunJson(Run run)
 
         private string CreatePerformancePlayerPreferences(Run run)
         {
-            var json = JsonConvert.SerializeObject(run, Formatting.Indented);
+            var json = JsonUtility.ToJson(run, true);
             PlayerPrefs.SetString(Utils.PlayerPrefKeyRunJSON, json);
             return json;
         }

Editor/Unity.PerformanceTesting.Editor.asmdef

@@ -12,8 +12,7 @@
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "nunit.framework.dll",
-        "Newtonsoft.Json.dll"
+        "nunit.framework.dll"
     ],
     "autoReferenced": false,
     "defineConstraints": [],