test improvement for VectorStruct and MultiVectorStruct

Author: hkulekci

src/Exception/InvalidArgumentException.php

@@ -10,7 +10,7 @@
 
 use Qdrant\Response;
 
-class InvalidArgumentException extends \Exception
+class InvalidArgumentException extends \InvalidArgumentException
 {
     protected Response $response;
 

src/Models/MultiVectorStruct.php

@@ -2,7 +2,7 @@
 
 namespace Qdrant\Models;
 
-use InvalidArgumentException;
+use Qdrant\Exception\InvalidArgumentException;
 
 class MultiVectorStruct implements VectorStructInterface
 {
@@ -51,7 +51,7 @@ public function toArray(): array
         return $this->vectors;
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->vectors);
     }

src/Models/PointStruct.php

@@ -15,7 +15,6 @@ class PointStruct
 {
     use ProtectedPropertyAccessor;
 
-    // TODO: we need a solution for point with uuid
     protected int|string $id;
     protected ?array $payload = null;
     protected VectorStructInterface $vector;
@@ -63,26 +62,17 @@ public function toArray(): array
         return $point;
     }
 
-    /**
-     * @return int
-     */
     public function getId(): int|string
     {
         return $this->id;
     }
 
-    /**
-     * @return array|null
-     */
     public function getPayload(): ?array
     {
         return $this->payload;
     }
 
-    /**
-     * @return VectorStruct
-     */
-    public function getVector(): VectorStruct
+    public function getVector(): VectorStructInterface
     {
         return $this->vector;
     }

src/Models/VectorStruct.php

@@ -21,7 +21,7 @@ public function __construct(array $vector, string $name = null)
         $this->name = $name;
     }
 
-    public function isNamed(): bool
+    private function isNamed(): bool
     {
         return $this->name !== null;
     }

tests/Unit/Models/MultiVectorStructTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * @since     Aug 2023
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Tests\Unit\Models;
+
+use PHPUnit\Framework\TestCase;
+use Qdrant\Exception\InvalidArgumentException;
+use Qdrant\Models\MultiVectorStruct;
+use Qdrant\Models\VectorStruct;
+
+class MultiVectorStructTest extends TestCase
+{
+    public function testMultiVectorStruct(): void
+    {
+        $vector = new MultiVectorStruct([[1, 2, 3], [1, 2, 4]]);
+
+        $this->assertEquals(
+            [[1, 2, 3], [1, 2, 4]],
+            $vector->toArray()
+        );
+    }
+
+    public function testNamedMultiVectorStruct(): void
+    {
+        $vector = new MultiVectorStruct([
+            'foo' => [1, 2, 3],
+            'bar' => [1, 2, 4],
+        ]);
+
+        $this->assertEquals(
+            [
+                'foo' => [1, 2, 3],
+                'bar' => [1, 2, 4],
+            ],
+            $vector->toArray()
+        );
+
+        $this->assertEquals(
+            [
+                'name' => 'foo',
+                'vector' => [1, 2, 3]
+            ],
+            $vector->toSearchArray('foo')
+        );
+
+        $this->assertEquals(
+            [
+                'name' => 'bar',
+                'vector' => [1, 2, 4]
+            ],
+            $vector->toSearchArray('bar')
+        );
+    }
+
+    public function testNamedMultiVectorStructWithMissingName(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Vector with name uber not found");
+
+        $vector = new MultiVectorStruct([
+            'foo' => [1, 2, 3],
+            'bar' => [1, 2, 4],
+        ]);
+
+        $vector->toSearchArray('uber');
+    }
+
+    public function testMultiVectorStructCount(): void
+    {
+        $vector = new MultiVectorStruct([
+            'foo' => [1, 2, 3],
+            'bar' => [1, 2, 4],
+        ]);
+
+        $this->assertEquals(2, $vector->count());
+    }
+}

tests/Unit/Models/VectorStructTest.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * @since     Aug 2023
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Tests\Unit\Models;
+
+use PHPUnit\Framework\TestCase;
+use Qdrant\Models\VectorStruct;
+
+class VectorStructTest extends TestCase
+{
+    public function testVectorStruct(): void
+    {
+        $vector = new VectorStruct([1, 2, 3]);
+
+        $this->assertEquals(
+            [1, 2, 3],
+            $vector->toArray()
+        );
+
+
+        $this->assertEquals(
+            [1, 2, 3],
+            $vector->toSearchArray()
+        );
+    }
+
+    public function testNamedVectorStruct(): void
+    {
+        $vector = new VectorStruct([1, 2, 3], 'foo');
+
+        $this->assertEquals(
+            [
+                'foo' => [1, 2, 3]
+            ],
+            $vector->toArray()
+        );
+
+        $this->assertEquals(
+            [
+                'name' => 'foo',
+                'vector' => [1, 2, 3]
+            ],
+            $vector->toSearchArray()
+        );
+    }
+}