improve tests

Wout Gevaert · Wout Gevaert · commit f77c7dc3abaf · 2022-08-10T18:28:21.000+02:00
diff --git a/tests/Unit/Expressions/Operators/AdditionTest.php b/tests/Unit/Expressions/Operators/AdditionTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Addition;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Number;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Addition
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Addition
  */
 class AdditionTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/AndOperatorTest.php b/tests/Unit/Expressions/Operators/AndOperatorTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\AndOperator;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\AndOperator
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\AndOperator
  */
 class AndOperatorTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/ContainsTest.php b/tests/Unit/Expressions/Operators/ContainsTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Contains;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Contains
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Contains
  */
 class ContainsTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/DivisionTest.php b/tests/Unit/Expressions/Operators/DivisionTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Division;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Division
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Division
  */
 class DivisionTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/EndsWithTest.php b/tests/Unit/Expressions/Operators/EndsWithTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\EndsWith;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\EndsWith
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\EndsWith
  */
 class EndsWithTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/EqualityTest.php b/tests/Unit/Expressions/Operators/EqualityTest.php
@@ -19,24 +19,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Equality;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\PropertyType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Equality
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Equality
  */
 class EqualityTest extends TestCase
 {
     use TestHelper;
 
     public function testToQuery(): void
     {
-        $equality = new Equality($this->getQueryConvertibleMock(PropertyType::class, "10"), $this->getQueryConvertibleMock(PropertyType::class, "15"));
+        $equality = new Equality(new Property(new Variable('v'), "10"), new Property(new Variable('v'), "15"));
 
         $this->assertSame("(10 = 15)", $equality->toQuery());
 
@@ -47,7 +48,7 @@ public function testToQuery(): void
 
     public function testToQueryNoParentheses(): void
     {
-        $equality = new Equality($this->getQueryConvertibleMock(PropertyType::class, "10"), $this->getQueryConvertibleMock(PropertyType::class, "15"), false);
+        $equality = new Equality(new Property(new Variable('v'), "10"), new Property(new Variable('v'), "15"), false);
 
         $this->assertSame("10 = 15", $equality->toQuery());
 
diff --git a/tests/Unit/Expressions/Operators/ExponentiationTest.php b/tests/Unit/Expressions/Operators/ExponentiationTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Exponentiation;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Exponentiation
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Exponentiation
  */
 class ExponentiationTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/GreaterThanOrEqualTest.php b/tests/Unit/Expressions/Operators/GreaterThanOrEqualTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\GreaterThanOrEqual;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\GreaterThanOrEqual
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\GreaterThanOrEqual
  */
 class GreaterThanOrEqualTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/GreaterThanTest.php b/tests/Unit/Expressions/Operators/GreaterThanTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\GreaterThan;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\GreaterThan
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\GreaterThan
  */
 class GreaterThanTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/InTest.php b/tests/Unit/Expressions/Operators/InTest.php
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\In;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\List_;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
@@ -31,15 +32,15 @@
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\PropertyType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\In
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\In
  */
 class InTest extends TestCase
 {
     use TestHelper;
 
     public function testToQuery(): void
     {
-        $inequality = new In($this->getQueryConvertibleMock(PropertyType::class, "a"), $this->getQueryConvertibleMock(ListType::class, "b"));
+        $inequality = new In(new Property(new Variable('v'), "a"), $this->getQueryConvertibleMock(ListType::class, "b"));
 
         $this->assertSame("(a IN b)", $inequality->toQuery());
 
@@ -50,7 +51,7 @@ public function testToQuery(): void
 
     public function testToQueryNoParentheses(): void
     {
-        $inequality = new In($this->getQueryConvertibleMock(PropertyType::class, "a"), $this->getQueryConvertibleMock(ListType::class, "b"), false);
+        $inequality = new In(new Property(new Variable('v'), "a"), $this->getQueryConvertibleMock(ListType::class, "b"), false);
 
         $this->assertSame("a IN b", $inequality->toQuery());
 
@@ -61,7 +62,7 @@ public function testToQueryNoParentheses(): void
 
     public function testInExpressionList(): void
     {
-        $inequality = new In($this->getQueryConvertibleMock(PropertyType::class, "a"), new List_([new String_('a'), new String_('b')]));
+        $inequality = new In(new Property(new Variable('v'), "a"), new List_([new String_('a'), new String_('b')]));
 
         $this->assertSame("(a IN ['a', 'b'])", $inequality->toQuery());
 
diff --git a/tests/Unit/Expressions/Operators/InequalityTest.php b/tests/Unit/Expressions/Operators/InequalityTest.php
@@ -19,24 +19,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Inequality;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\PropertyType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Inequality
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Inequality
  */
 class InequalityTest extends TestCase
 {
     use TestHelper;
 
     public function testToQuery(): void
     {
-        $inequality = new Inequality($this->getQueryConvertibleMock(PropertyType::class, "a"), $this->getQueryConvertibleMock(PropertyType::class, "b"));
+        $inequality = new Inequality(new Property(new Variable('v'), "a"), new Property(new Variable('v'), "b"));
 
         $this->assertSame("(a <> b)", $inequality->toQuery());
 
@@ -47,7 +48,7 @@ public function testToQuery(): void
 
     public function testToQueryNoParentheses(): void
     {
-        $inequality = new Inequality($this->getQueryConvertibleMock(PropertyType::class, "a"), $this->getQueryConvertibleMock(PropertyType::class, "b"), false);
+        $inequality = new Inequality(new Property(new Variable('v'), "a"), new Property(new Variable('v'), "b"), false);
 
         $this->assertSame("a <> b", $inequality->toQuery());
 
diff --git a/tests/Unit/Expressions/Operators/IsNotNullTest.php b/tests/Unit/Expressions/Operators/IsNotNullTest.php
@@ -19,14 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\IsNotNull;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Not
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Not
  */
 class IsNotNullTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/IsNullTest.php b/tests/Unit/Expressions/Operators/IsNullTest.php
@@ -19,14 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\IsNull;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Not
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Not
  */
 class IsNullTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/LessThanOrEqualTest.php b/tests/Unit/Expressions/Operators/LessThanOrEqualTest.php
@@ -19,17 +19,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\GreaterThanOrEqual;
 use WikibaseSolutions\CypherDSL\Expressions\LessThanOrEqual;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\LessThanOrEqual
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\LessThanOrEqual
  */
 class LessThanOrEqualTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/LessThanTest.php b/tests/Unit/Expressions/Operators/LessThanTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\LessThan;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\LessThan
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\LessThan
  */
 class LessThanTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/ModuloTest.php b/tests/Unit/Expressions/Operators/ModuloTest.php
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
 use TypeError;
+use WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\TestHelper;
 use WikibaseSolutions\CypherDSL\Expressions\Modulo;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
 /**
- * @covers \WikibaseSolutions\CypherDSL\Expressions\Modulo
+ * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\Modulo
  */
 class ModuloTest extends TestCase
 {
diff --git a/tests/Unit/Expressions/Operators/MultiplicationTest.php b/tests/Unit/Expressions/Operators/MultiplicationTest.php
diff --git a/tests/Unit/Expressions/Operators/NotTest.php b/tests/Unit/Expressions/Operators/NotTest.php
diff --git a/tests/Unit/Expressions/Operators/OrOperatorTest.php b/tests/Unit/Expressions/Operators/OrOperatorTest.php
diff --git a/tests/Unit/Expressions/Operators/RegexTest.php b/tests/Unit/Expressions/Operators/RegexTest.php
diff --git a/tests/Unit/Expressions/Operators/StartsWithTest.php b/tests/Unit/Expressions/Operators/StartsWithTest.php
diff --git a/tests/Unit/Expressions/Operators/SubtractionTest.php b/tests/Unit/Expressions/Operators/SubtractionTest.php
diff --git a/tests/Unit/Expressions/Operators/UnaryMinusTest.php b/tests/Unit/Expressions/Operators/UnaryMinusTest.php
diff --git a/tests/Unit/Expressions/Operators/XorOperatorTest.php b/tests/Unit/Expressions/Operators/XorOperatorTest.php
