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

Unity Technologies · Unity Technologies · commit d6bafbd405f2 · 2019-04-03T12:31:33.000Z
## [0.1.31] - 2018-7-04

### mark metadata tests with performance category

## [0.1.30] - 2018-6-27

### fix Method measurement

## [0.1.29] - 2018-6-12

### Moving back to json in xml due to multiple instabilities
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.1.31] - 2018-7-04
+
+### mark metadata tests with performance category
+
+## [0.1.30] - 2018-6-27
+
+### fix Method measurement
+
 ## [0.1.29] - 2018-6-12
 
 ### Moving back to json in xml due to multiple instabilities
diff --git a/Editor/EditmodeMetadataCollector.cs b/Editor/EditmodeMetadataCollector.cs
@@ -8,6 +8,7 @@
 using UnityEngine.TestTools;
 using UnityEngine.XR;
 
+[Category("Performance")]
 public class EditmodeMetadataCollector : IPrebuildSetup
 {
     private PerformanceTestRun m_TestRun;
diff --git a/README.md b/README.md
@@ -11,12 +11,11 @@ YourProject/Packages/manifest.json
 ``` json
 {
 	"dependencies": {
-		"com.unity.test-framework.performance": "0.1.29-preview"
+		"com.unity.test-framework.performance": "0.1.31-preview"
 	  },
 	  "testables": [
 			"com.unity.test-framework.performance"
-	  ],
-	  "registry": "https://staging-packages.unity.com"
+	  ]
 }
 ```
 
diff --git a/Runtime/Measurements/MethodMeasurement.cs b/Runtime/Measurements/MethodMeasurement.cs
@@ -83,7 +83,7 @@ private void RunForIterations(int iterations)
                 {
                     m_Action.Invoke();
                 }
-                executionTime = (Time.realtimeSinceStartup - executionTime) * 1000f;
+                executionTime = (Time.realtimeSinceStartup - executionTime) * 1000f / iterations;
                 Measure.Custom(m_Definition, Utils.ConvertSample(SampleUnit.Millisecond, m_Definition.SampleUnit, executionTime));
             }
 
diff --git a/Runtime/PerformanceTest.cs b/Runtime/PerformanceTest.cs
@@ -6,6 +6,7 @@
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal;
 using Unity.PerformanceTesting.Exceptions;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.TestRunner.NUnitExtensions;
 
@@ -50,13 +51,14 @@ internal static void StartTest(ITest currentTest)
         internal static void EndTest(Test test)
         {
             if (test.IsSuite) return;
+            if(test.FullName != Active.TestName) return;
             DisposeMeasurements();
             Active.CalculateStatisticalValues();
             Active.EndTime = Utils.DateToInt(DateTime.Now);
             if (OnTestEnded != null) OnTestEnded();
             Active.LogOutput();
             
-            TestContext.Out.Write("##performancetestresult:" + JsonUtility.ToJson(Active));
+            TestContext.Out.WriteLine("##performancetestresult:" + JsonUtility.ToJson(Active));
             Active = null;
         }
 
@@ -66,6 +68,7 @@ private static void DisposeMeasurements()
             {
                 Disposables[i].Dispose();
             }
+            Disposables.Clear();
         }
 
         public static SampleGroup GetSampleGroup(SampleGroupDefinition definition)
diff --git a/Runtime/PlaymodeMetadataCollector.cs b/Runtime/PlaymodeMetadataCollector.cs
@@ -14,6 +14,7 @@
 
 #endif
 
+[Category("Performance")]
 public class PlaymodeMetadataCollector : IPrebuildSetup
 {
     private PerformanceTestRun m_TestRun;
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.test-framework.performance",
 	"displayName":"Performance testing API",
-	"version": "0.1.29-preview",
+	"version": "0.1.31-preview",
 	"unity": "2018.1",
 	"description": "Performance testing API.",
 	"keywords": ["performance", "test"],

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using UnityEngine.TestTools;`
`9`	`9`	`using UnityEngine.XR;`
`10`	`10`
	`11`	`+[Category("Performance")]`
`11`	`12`	`public class EditmodeMetadataCollector : IPrebuildSetup`
`12`	`13`	`{`
`13`	`14`	`private PerformanceTestRun m_TestRun;`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,11 @@ YourProject/Packages/manifest.json`
`11`	`11`	``` json
`12`	`12`	`{`
`13`	`13`	`"dependencies": {`
`14`		`- "com.unity.test-framework.performance": "0.1.29-preview"`
	`14`	`+ "com.unity.test-framework.performance": "0.1.31-preview"`
`15`	`15`	`},`
`16`	`16`	`"testables": [`
`17`	`17`	`"com.unity.test-framework.performance"`
`18`		`- ],`
`19`		`- "registry": "https://staging-packages.unity.com"`
	`18`	`+ ]`
`20`	`19`	`}`
`21`	`20`	```
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private void RunForIterations(int iterations)`
`83`	`83`	`{`
`84`	`84`	`m_Action.Invoke();`
`85`	`85`	`}`
`86`		`- executionTime = (Time.realtimeSinceStartup - executionTime) * 1000f;`
	`86`	`+ executionTime = (Time.realtimeSinceStartup - executionTime) * 1000f / iterations;`
`87`	`87`	`Measure.Custom(m_Definition, Utils.ConvertSample(SampleUnit.Millisecond, m_Definition.SampleUnit, executionTime));`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using NUnit.Framework.Interfaces;`
`7`	`7`	`using NUnit.Framework.Internal;`
`8`	`8`	`using Unity.PerformanceTesting.Exceptions;`
	`9`	`+using UnityEditor;`
`9`	`10`	`using UnityEngine;`
`10`	`11`	`using UnityEngine.TestRunner.NUnitExtensions;`
`11`	`12`
`@@ -50,13 +51,14 @@ internal static void StartTest(ITest currentTest)`
`50`	`51`	`internal static void EndTest(Test test)`
`51`	`52`	`{`
`52`	`53`	`if (test.IsSuite) return;`
	`54`	`+ if(test.FullName != Active.TestName) return;`
`53`	`55`	`DisposeMeasurements();`
`54`	`56`	`Active.CalculateStatisticalValues();`
`55`	`57`	`Active.EndTime = Utils.DateToInt(DateTime.Now);`
`56`	`58`	`if (OnTestEnded != null) OnTestEnded();`
`57`	`59`	`Active.LogOutput();`
`58`	`60`
`59`		`- TestContext.Out.Write("##performancetestresult:" + JsonUtility.ToJson(Active));`
	`61`	`+ TestContext.Out.WriteLine("##performancetestresult:" + JsonUtility.ToJson(Active));`
`60`	`62`	`Active = null;`
`61`	`63`	`}`
`62`	`64`
`@@ -66,6 +68,7 @@ private static void DisposeMeasurements()`
`66`	`68`	`{`
`67`	`69`	`Disposables[i].Dispose();`
`68`	`70`	`}`
	`71`	`+ Disposables.Clear();`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`public static SampleGroup GetSampleGroup(SampleGroupDefinition definition)`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`#endif`
`16`	`16`
	`17`	`+[Category("Performance")]`
`17`	`18`	`public class PlaymodeMetadataCollector : IPrebuildSetup`
`18`	`19`	`{`
`19`	`20`	`private PerformanceTestRun m_TestRun;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.unity.test-framework.performance",`
`3`	`3`	`"displayName":"Performance testing API",`
`4`		`- "version": "0.1.29-preview",`
	`4`	`+ "version": "0.1.31-preview",`
`5`	`5`	`"unity": "2018.1",`
`6`	`6`	`"description": "Performance testing API.",`
`7`	`7`	`"keywords": ["performance", "test"],`