Fixed tests

Author: eldadfux

src/Chunk.php

@@ -25,7 +25,7 @@ public function __construct(
 
     /**
      * Get the raw chunk data
-     * 
+     *
      * @return string
      */
     public function getData(): string
@@ -35,7 +35,7 @@ public function getData(): string
 
     /**
      * Get the size of the chunk in bytes
-     * 
+     *
      * @return int
      */
     public function getSize(): int
@@ -45,7 +45,7 @@ public function getSize(): int
 
     /**
      * Get the timestamp when the chunk was received
-     * 
+     *
      * @return float
      */
     public function getTimestamp(): float
@@ -55,11 +55,11 @@ public function getTimestamp(): float
 
     /**
      * Get the sequential index of this chunk
-     * 
+     *
      * @return int
      */
     public function getIndex(): int
     {
         return $this->index;
     }
-} 
+}

tests/ClientTest.php

@@ -432,26 +432,25 @@ public function testChunkHandling(): void
         $response = $client->fetch(
             url: 'localhost:8000/chunked',
             method: Client::METHOD_GET,
-            chunks: function(Chunk $chunk) use (&$chunks, &$lastChunk) {
+            chunks: function (Chunk $chunk) use (&$chunks, &$lastChunk) {
                 $chunks[] = $chunk;
                 $lastChunk = $chunk;
             }
         );
 
         $this->assertGreaterThan(0, count($chunks));
         $this->assertEquals(200, $response->getStatusCode());
-        
+
         // Test chunk metadata
         foreach ($chunks as $index => $chunk) {
             $this->assertEquals($index, $chunk->getIndex());
             $this->assertGreaterThan(0, $chunk->getSize());
             $this->assertGreaterThan(0, $chunk->getTimestamp());
-            $this->assertEquals($response->getStatusCode(), $chunk->getStatusCode());
-            $this->assertEquals($response->getHeaders(), $chunk->getHeaders());
+            $this->assertNotEmpty($chunk->getData());
         }
 
-        // Test last chunk
-        $this->assertTrue($lastChunk->isLast());
+        // Verify last chunk exists
+        $this->assertNotNull($lastChunk);
     }
 
     /**
@@ -462,27 +461,30 @@ public function testChunkHandlingWithJson(): void
     {
         $client = new Client();
         $client->addHeader('content-type', 'application/json');
-        
+
         $chunks = [];
         $response = $client->fetch(
             url: 'localhost:8000/chunked-json',
             method: Client::METHOD_POST,
             body: ['test' => 'data'],
-            chunks: function(Chunk $chunk) use (&$chunks) {
+            chunks: function (Chunk $chunk) use (&$chunks) {
                 $chunks[] = $chunk;
             }
         );
 
         $this->assertGreaterThan(0, count($chunks));
-        
+
         // Test JSON handling
         foreach ($chunks as $chunk) {
-            $this->assertTrue($chunk->isJson());
-            $this->assertEquals('application/json', $chunk->getContentType());
+            $data = $chunk->getData();
+            $this->assertNotEmpty($data);
 
-            if ($data = $chunk->tryDecodeJson()) {
-                $this->assertIsArray($data);
-            }
+            // Verify each chunk is valid JSON
+            $decoded = json_decode($data, true);
+            $this->assertNotNull($decoded);
+            $this->assertIsArray($decoded);
+            $this->assertArrayHasKey('chunk', $decoded);
+            $this->assertArrayHasKey('data', $decoded);
         }
     }
 
@@ -498,13 +500,17 @@ public function testChunkHandlingWithError(): void
         $response = $client->fetch(
             url: 'localhost:8000/error',
             method: Client::METHOD_GET,
-            chunks: function(Chunk $chunk) use (&$errorChunk) {
-                $errorChunk = $chunk;
+            chunks: function (Chunk $chunk) use (&$errorChunk) {
+                if ($errorChunk === null) {
+                    $errorChunk = $chunk;
+                }
             }
         );
 
         $this->assertNotNull($errorChunk);
-        $this->assertEquals(404, $errorChunk->getStatusCode());
+        if ($errorChunk !== null) {
+            $this->assertNotEmpty($errorChunk->getData());
+        }
         $this->assertEquals(404, $response->getStatusCode());
     }
 }

tests/router.php

@@ -88,39 +88,39 @@ function setState(array $newState): void
     // Set headers for chunked response
     header('Content-Type: text/plain');
     header('Transfer-Encoding: chunked');
-    
+
     // Send chunks with delay
     $chunks = [
         "This is the first chunk\n",
         "This is the second chunk\n",
         "This is the final chunk\n"
     ];
-    
+
     foreach ($chunks as $chunk) {
         echo $chunk;
         flush();
         usleep(100000); // 100ms delay between chunks
     }
-    
+
     exit;
 } elseif ($curPageName == 'chunked-json') {
     // Set headers for chunked JSON response
     header('Content-Type: application/json');
     header('Transfer-Encoding: chunked');
-    
+
     // Send JSON chunks
     $chunks = [
         json_encode(['chunk' => 1, 'data' => 'First chunk']),
         json_encode(['chunk' => 2, 'data' => 'Second chunk']),
         json_encode(['chunk' => 3, 'data' => 'Final chunk'])
     ];
-    
+
     foreach ($chunks as $chunk) {
         echo $chunk . "\n"; // Add newline for JSON lines format
         flush();
         usleep(100000); // 100ms delay between chunks
     }
-    
+
     exit;
 } elseif ($curPageName == 'error') {
     http_response_code(404);