Use the global counter

DeNA · Nov 8, 2023 · 3fc9fb4 · 3fc9fb4
1 parent 50dc5e4
commit 3fc9fb4
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Runtime/Agents/UGUIMonkeyAgent.cs b/Runtime/Agents/UGUIMonkeyAgent.cs
@@ -9,6 +9,7 @@
 using TestHelper.Monkey;
 using TestHelper.Monkey.Annotations.Enums;
 using TestHelper.Monkey.Random;
+using TestHelper.Monkey.ScreenshotFilenameStrategies;
 using TestHelper.Random;
 using UnityEngine;
 
@@ -66,15 +67,23 @@ public class UGUIMonkeyAgent : AbstractAgent
         /// </summary>
         public bool defaultScreenshotDirectory = true;
 
-        /// <inheritdoc cref="ScreenshotOptions.Directory" />
+        /// <summary>
+        /// Directory path for screenshot images. Create a new directory if directory not exists.
+        /// If the value is null or empty,
+        /// <c>Path.Combine(Application.persistentDataPath, "TestHelper.Monkey", "Screenshots")</c> will be used
+        /// </summary>
         public string screenshotDirectory;
 
         /// <summary>
         /// Whether using a default file name prefix or specifying manually
         /// </summary>
         public bool defaultScreenshotFilenamePrefix = true;
 
-        /// <inheritdoc cref="ScreenshotOptions.FilenamePrefix" />
+        /// <summary>
+        /// File name prefix for screenshot images. If the value is null or empty, a default value will be used.
+        /// The default value is the current test name if the agent is running on tests. Otherwise, be a caller method
+        /// name
+        /// </summary>
         public string screenshotFilenamePrefix;
 
         /// <inheritdoc cref="ScreenshotOptions.SuperSize" />
@@ -103,8 +112,11 @@ public override async UniTask Run(CancellationToken token)
                 Screenshots = screenshotEnabled
                     ? new ScreenshotOptions
                     {
-                        Directory = defaultScreenshotDirectory ? null : screenshotDirectory,
-                        FilenamePrefix = defaultScreenshotFilenamePrefix ? null : screenshotFilenamePrefix,
+                        FilePathStrategy = CounterBasedStrategy.Create(
+                            Counter.Global,
+                            defaultScreenshotDirectory ? null : screenshotDirectory,
+                            defaultScreenshotFilenamePrefix ? null : screenshotFilenamePrefix
+                        ),
                         SuperSize = screenshotSuperSize,
                         StereoCaptureMode = screenshotStereoCaptureMode
                     }
@@ -150,6 +162,7 @@ public struct RandomStringParametersEntry
             /// <inheritdoc cref="RandomStringParameters.CharactersKind" />
             public CharactersKind CharactersKind;
 
+
             /// <summary>
             /// Returns a <c cref="RandomStringParameters" />
             /// </summary>