RavenDB_15497Test::waitForIndexesAfterSaveChangesCanExitWhenThrowOnTimeoutIsFalse

Author: alxsabo

src/Exceptions/RavenTimeoutException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace RavenDB\Exceptions;
+
+class RavenTimeoutException extends RavenException
+{
+    private bool $failImmediately = false;
+
+    public function isFailImmediately(): bool
+    {
+        return $this->failImmediately;
+    }
+
+    public function setFailImmediately(bool $failImmediately): void
+    {
+        $this->failImmediately = $failImmediately;
+    }
+
+}

tests/Test/Client/TrackEntityTest.php

@@ -23,7 +23,6 @@ public function testDeletingEntityThatIsNotTrackedShouldThrow(): void
 
                     throw new Exception('It should throw exception before reaching this code');
                 } catch (Throwable $exception) {
-                    print_r($exception->getMessage());
                     $this->assertInstanceOf(IllegalStateException::class, $exception);
                     $this->assertStringEndsWith("is not associated with the session, cannot delete unknown entity instance", $exception->getMessage());
                 }

tests/Test/Issues/RavenDB_15497Test/RavenDB_15497Test.php

@@ -3,10 +3,8 @@
 namespace tests\RavenDB\Test\Issues\RavenDB_15497Test;
 
 use Exception;
-use RavenDB\Documents\Indexes\IndexStats;
-use RavenDB\Documents\Operations\Indexes\DisableIndexOperation;
-use RavenDB\Documents\Operations\Indexes\GetIndexStatisticsOperation;
-use RavenDB\Exceptions\TimeoutException;
+use RavenDB\Documents\Operations\Indexes\StopIndexOperation;
+use RavenDB\Exceptions\RavenTimeoutException;
 use RavenDB\Type\Duration;
 use tests\RavenDB\Infrastructure\Entity\User;
 use tests\RavenDB\RemoteTestBase;
@@ -20,18 +18,12 @@ public function testWaitForIndexesAfterSaveChangesCanExitWhenThrowOnTimeoutIsFal
         try {
             $index = new Index();
             $index->execute($store);
-            $store->maintenance()->send(new DisableIndexOperation($index->getIndexName()));
-
-            /** @var IndexStats $indexStats */
-            $indexStats = $store->maintenance()->send(new GetIndexStatisticsOperation($index->getIndexName()));
-
-            $this->assertTrue($indexStats->getState()->isDisabled());
-            $this->assertTrue($indexStats->getStatus()->isDisabled());
 
             $session = $store->openSession();
             try {
                 $user = new User();
                 $user->setName("user1");
+                $user->setCount(3);
 
                 $session->store($user);
 
@@ -44,6 +36,10 @@ public function testWaitForIndexesAfterSaveChangesCanExitWhenThrowOnTimeoutIsFal
                 $session->close();
             }
 
+            $this->waitForIndexing($store);
+
+            $store->maintenance()->send(new StopIndexOperation($index->getIndexName()));
+
             $session = $store->openSession();
             try {
                 $user = new User();
@@ -60,9 +56,9 @@ public function testWaitForIndexesAfterSaveChangesCanExitWhenThrowOnTimeoutIsFal
                     $session->saveChanges();
                     throw new Exception('It should throw exception before reaching this code');
                 } catch (Throwable $exception) {
-                    $this->assertInstanceOf(TimeoutException::class, $exception);
-                    $this->assertStringContainsString("System.TimeoutException", $exception->getMessage());
-                    $this->assertStringContainsString("could not verify that 1 indexes has caught up with the changes as of etag", $exception->getMessage());
+                    $this->assertInstanceOf(RavenTimeoutException::class, $exception);
+                    $this->assertStringContainsString("RavenTimeoutException", $exception->getMessage());
+                    $this->assertStringContainsString("could not verify that", $exception->getMessage());
                 }
             } finally {
                 $session->close();