Improvements to window test doubles

src/Facades/Window.php

@@ -22,7 +22,7 @@ class Window extends Facade
 {
     public static function fake()
     {
-        return tap(new WindowManagerFake, function ($fake) {
+        return tap(static::getFacadeApplication()->make(WindowManagerFake::class), function ($fake) {
             static::swap($fake);
         });
     }

src/Fakes/WindowManagerFake.php

@@ -2,10 +2,13 @@
 
 namespace Native\Laravel\Fakes;
 
+use Closure;
 use Illuminate\Support\Arr;
+use Native\Laravel\Client\Client;
 use Native\Laravel\Contracts\WindowManager as WindowManagerContract;
 use Native\Laravel\Windows\Window;
 use PHPUnit\Framework\Assert as PHPUnit;
+use Webmozart\Assert\Assert;
 
 class WindowManagerFake implements WindowManagerContract
 {
@@ -17,6 +20,10 @@ class WindowManagerFake implements WindowManagerContract
 
     public array $forcedWindowReturnValues = [];
 
+    public function __construct(
+        protected Client $client
+    ) {}
+
     /**
      * @param  array<int, Window>  $windows
      */
@@ -30,6 +37,21 @@ public function alwaysReturnWindows(array $windows): self
     public function open(string $id = 'main')
     {
         $this->opened[] = $id;
+
+        $this->ensureForceReturnWindowsProvided();
+
+        $matchingWindows = array_filter(
+            $this->forcedWindowReturnValues,
+            fn (Window $window) => $window->getId() === $id
+        );
+
+        if (empty($matchingWindows)) {
+            return $this->forcedWindowReturnValues[array_rand($this->forcedWindowReturnValues)]->setClient($this->client);
+        }
+
+        Assert::count($matchingWindows, 1);
+
+        return Arr::first($matchingWindows)->setClient($this->client);
     }
 
     public function close($id = null)
@@ -65,29 +87,92 @@ public function get(string $id): Window
 
         $matchingWindows = array_filter($this->forcedWindowReturnValues, fn (Window $window) => $window->getId() === $id);
 
-        PHPUnit::assertNotEmpty($matchingWindows);
-        PHPUnit::assertCount(1, $matchingWindows);
+        Assert::notEmpty($matchingWindows);
+        Assert::count($matchingWindows, 1);
 
         return Arr::first($matchingWindows);
     }
 
-    public function assertOpened(string $id): void
+    /**
+     * @param  string|Closure(string): bool  $id
+     */
+    public function assertOpened(string|Closure $id): void
+    {
+        if (is_callable($id) === false) {
+            PHPUnit::assertContains($id, $this->opened);
+
+            return;
+        }
+
+        $hit = empty(
+            array_filter(
+                $this->opened,
+                fn (string $openedId) => $id($openedId) === true
+            )
+        ) === false;
+
+        PHPUnit::assertTrue($hit);
+    }
+
+    /**
+     * @param  string|Closure(string): bool  $id
+     */
+    public function assertClosed(string|Closure $id): void
+    {
+        if (is_callable($id) === false) {
+            PHPUnit::assertContains($id, $this->closed);
+
+            return;
+        }
+
+        $hit = empty(
+            array_filter(
+                $this->closed,
+                fn (mixed $closedId) => $id($closedId) === true
+            )
+        ) === false;
+
+        PHPUnit::assertTrue($hit);
+    }
+
+    /**
+     * @param  string|Closure(string): bool  $id
+     */
+    public function assertHidden(string|Closure $id): void
+    {
+        if (is_callable($id) === false) {
+            PHPUnit::assertContains($id, $this->hidden);
+
+            return;
+        }
+
+        $hit = empty(
+            array_filter(
+                $this->hidden,
+                fn (mixed $hiddenId) => $id($hiddenId) === true
+            )
+        ) === false;
+
+        PHPUnit::assertTrue($hit);
+    }
+
+    public function assertOpenedCount(int $expected): void
     {
-        PHPUnit::assertContains($id, $this->opened);
+        PHPUnit::assertCount($expected, $this->opened);
     }
 
-    public function assertClosed(?string $id): void
+    public function assertClosedCount(int $expected): void
     {
-        PHPUnit::assertContains($id, $this->closed);
+        PHPUnit::assertCount($expected, $this->closed);
     }
 
-    public function assertHidden(?string $id): void
+    public function assertHiddenCount(int $expected): void
     {
-        PHPUnit::assertContains($id, $this->hidden);
+        PHPUnit::assertCount($expected, $this->hidden);
     }
 
     private function ensureForceReturnWindowsProvided(): void
     {
-        PHPUnit::assertNotEmpty($this->forcedWindowReturnValues);
+        Assert::notEmpty($this->forcedWindowReturnValues, 'No windows were provided to return');
     }
 }