target devices

Sauceforge · Jan 2, 2025 · 57db47e · 57db47e
1 parent 6fcdcdd
commit 57db47e
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 31 deletions.
diff --git a/ExternalMerlin.NUnit.RealDevices/RequestedPlatformData.cs b/ExternalMerlin.NUnit.RealDevices/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 
@@ -16,7 +17,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 }
 /*

diff --git a/ExternalMerlin.NUnit/RequestedPlatformData.cs b/ExternalMerlin.NUnit/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
@@ -20,7 +21,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "124", SauceryConstants.SCREENRES_2560_1600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 }
 /*

diff --git a/ExternalMerlin.TUnit.RealDevices/RequestedPlatformData.cs b/ExternalMerlin.TUnit.RealDevices/RequestedPlatformData.cs
@@ -16,7 +16,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();

diff --git a/ExternalMerlin.TUnit/RequestedPlatformData.cs b/ExternalMerlin.TUnit/RequestedPlatformData.cs
@@ -21,7 +21,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "124", SauceryConstants.SCREENRES_2560_1600)
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();

diff --git a/ExternalMerlin.XUnit.RealDevices/RequestedPlatformData.cs b/ExternalMerlin.XUnit.RealDevices/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 
@@ -16,7 +17,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 
     public static IEnumerable<object[]> AllPlatforms => GetAllPlatforms();

diff --git a/ExternalMerlin.XUnit/RequestedPlatformData.cs b/ExternalMerlin.XUnit/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
@@ -20,7 +21,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "124", SauceryConstants.SCREENRES_2560_1600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static IEnumerable<object[]> AllPlatforms => GetAllPlatforms();

diff --git a/Merlin.NUnit.RealDevices/RequestedPlatformData.cs b/Merlin.NUnit.RealDevices/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 
@@ -16,7 +17,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 }
 /*

diff --git a/Merlin.NUnit/RequestedPlatformData.cs b/Merlin.NUnit/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
@@ -32,7 +33,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_EDGE, "99", SauceryConstants.SCREENRES_800_600)
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 }
 /*

diff --git a/Merlin.Playwright.NUnit/RequestedPlatformData.cs b/Merlin.Playwright.NUnit/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
@@ -31,7 +32,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_EDGE, "99", SauceryConstants.SCREENRES_800_600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 }
 /*

diff --git a/Merlin.TUnit.RealDevices/RequestedPlatformData.cs b/Merlin.TUnit.RealDevices/RequestedPlatformData.cs
@@ -16,7 +16,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();

diff --git a/Merlin.TUnit/RequestedPlatformData.cs b/Merlin.TUnit/RequestedPlatformData.cs
@@ -33,7 +33,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_EDGE, "99", SauceryConstants.SCREENRES_800_600)
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();

diff --git a/Merlin.XUnit.RealDevices/RequestedPlatformData.cs b/Merlin.XUnit.RealDevices/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 
@@ -16,7 +17,7 @@ static RequestedPlatformData()
             new IOSRealDevice("iPhone 14 Pro Max", "16"),
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.RealDevice);
     }
 
     public static IEnumerable<object[]> AllPlatforms => GetAllPlatforms();

diff --git a/Merlin.XUnit/RequestedPlatformData.cs b/Merlin.XUnit/RequestedPlatformData.cs
@@ -1,4 +1,5 @@
 using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
@@ -32,7 +33,7 @@ static RequestedPlatformData()
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_EDGE, "99", SauceryConstants.SCREENRES_800_600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static IEnumerable<object[]> AllPlatforms => GetAllPlatforms();

diff --git a/README.md b/README.md
@@ -159,7 +159,7 @@ public class RequestedPlatformData : SauceryTestData
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "76", SauceryConstants.SCREENRES_2560_1600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 }
 ```
@@ -277,7 +277,7 @@ public class RequestedPlatformData : SauceryTestData
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "76", SauceryConstants.SCREENRES_2560_1600)
         ];
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static IEnumerable<object[]> AllPlatforms => GetAllPlatforms();
@@ -407,7 +407,7 @@ public class RequestedPlatformData : SauceryTestData
             new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "124", SauceryConstants.SCREENRES_2560_1600)
         };
 
-        SetPlatforms(platforms);
+        SetPlatforms(platforms, PlatformFilter.Emulated);
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();

diff --git a/Saucery.Core/DataSources/SauceryTestData.cs b/Saucery.Core/DataSources/SauceryTestData.cs
@@ -11,22 +11,11 @@ public class SauceryTestData : IEnumerable
 
     public IEnumerator GetEnumerator() => BrowserVersions?.GetEnumerator()!;
 
-    protected static void SetPlatforms(List<SaucePlatform> platforms)
-    {
-        PlatformConfigurator platformConfigurator = new(PlatformFilter.All);
-        ExpandAndFilter(platforms, platformConfigurator);
-        //PlatformExpander expander = new(platformConfigurator, platforms);
-        //var expandedPlatforms = expander.Expand();
-        //BrowserVersions = platformConfigurator.FilterAll(expandedPlatforms);
-    }
+    protected static void SetPlatforms(List<SaucePlatform> platforms) => 
+        ExpandAndFilter(platforms, new(PlatformFilter.All));
 
-    protected static void SetPlatforms(List<SaucePlatform> platforms, PlatformFilter filter) {
-        PlatformConfigurator platformConfigurator = new(filter);
-        ExpandAndFilter(platforms, platformConfigurator);
-        //PlatformExpander expander = new(platformConfigurator, platforms);
-        //var expandedPlatforms = expander.Expand();
-        //BrowserVersions = platformConfigurator.FilterAll(expandedPlatforms);
-    }
+    protected static void SetPlatforms(List<SaucePlatform> platforms, PlatformFilter filter) => 
+        ExpandAndFilter(platforms, new(filter));
 
     private static void ExpandAndFilter(List<SaucePlatform> platforms, PlatformConfigurator platformConfigurator)
     {