fixed definition, refactoring parent test

Author: vearutop

tests/src/Helper/LevelOneClass.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Helper;
+
+
+use Yaoi\Schema\ObjectFlavour\Properties;
+use Yaoi\Schema\Schema;
+use Yaoi\Schema\Structure\ClassStructure;
+
+class LevelOneClass extends ClassStructure
+{
+    /**
+     * @var LevelTwoClass
+     */
+    public $level1;
+
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $properties->level1 = LevelTwoClass::makeSchema();
+    }
+
+
+}

tests/src/Helper/LevelThreeClass.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Helper;
+
+
+use Yaoi\Schema\ObjectFlavour\Properties;
+use Yaoi\Schema\Schema;
+use Yaoi\Schema\Structure\ClassStructure;
+use Yaoi\Schema\Types\IntegerType;
+
+class LevelThreeClass extends ClassStructure
+{
+    /**
+     * @var int
+     */
+    public $level3;
+
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $properties->level3 = IntegerType::makeSchema();
+    }
+
+
+}

tests/src/Helper/LevelTwoClass.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Helper;
+
+
+use Yaoi\Schema\ObjectFlavour\Properties;
+use Yaoi\Schema\Schema;
+use Yaoi\Schema\Structure\ClassStructure;
+
+class LevelTwoClass extends ClassStructure
+{
+    /**
+     * @var LevelThreeClass
+     */
+    public $level2;
+
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $properties->level2 = LevelThreeClass::makeSchema();
+    }
+
+
+}

tests/src/Schema/ParentFixedTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Schema;
+
+
+use Yaoi\Schema\Tests\Helper\LevelOneClass;
+
+class ParentFixedTest extends ParentTest
+{
+    protected function deepSchema()
+    {
+        $schema = LevelOneClass::makeSchema();
+        return $schema;
+    }
+
+}

tests/src/Schema/ParentSymbolicTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Schema;
+
+
+use Yaoi\Schema\ObjectFlavour\Properties;
+use Yaoi\Schema\Types\IntegerType;
+use Yaoi\Schema\Types\ObjectType;
+
+class ParentSymbolicTest extends ParentTest
+{
+    protected function deepSchema()
+    {
+        $schema = ObjectType::makeSchema(
+            Properties::create()
+                ->setProperty(
+                    'level1',
+                    ObjectType::makeSchema(
+                        Properties::create()
+                            ->setProperty(
+                                'level2',
+                                ObjectType::makeSchema(
+                                    Properties::create()
+                                        ->setProperty(
+                                            'level3',
+                                            IntegerType::makeSchema()
+                                        )
+                                )
+                            )
+                    )
+                )
+        );
+        return $schema;
+    }
+
+}

tests/src/Schema/ParentTest.php

@@ -6,12 +6,10 @@
 use Yaoi\Schema\Exception;
 use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
-use Yaoi\Schema\Types\IntegerType;
-use Yaoi\Schema\Types\ObjectType;
 
 class ParentTest extends \PHPUnit_Framework_TestCase
 {
-    private function deepSchema()
+    protected function deepSchema()
     {
         $schemaValue = array(
             'type' => 'object',
@@ -36,29 +34,7 @@ private function deepSchema()
     }
 
 
-    private function deepSchemaSymbolic()
-    {
-        $schema = ObjectType::makeSchema(
-            Properties::create()
-                ->setProperty(
-                    'level1',
-                    ObjectType::makeSchema(
-                        Properties::create()
-                            ->setProperty(
-                                'level2',
-                                ObjectType::makeSchema(
-                                    Properties::create()
-                                        ->setProperty(
-                                            'level3',
-                                            IntegerType::makeSchema()
-                                        )
-                                )
-                            )
-                    )
-                )
-        );
-        return $schema;
-    }
+
 
     private function assertSchema(Schema $schema)
     {
@@ -78,13 +54,6 @@ private function assertSchema(Schema $schema)
     public function testParent()
     {
         $this->assertSchema($this->deepSchema());
-        $this->assertSchema($this->deepSchemaSymbolic());
-    }
-
-
-    public function testAttach()
-    {
-        
     }
 
 
@@ -109,27 +78,6 @@ public function testInvalidImport()
         //$this->assertSame('abc', $object->level1->level2->level3);
     }
 
-    public function testInvalidImportSymbolic()
-    {
-        $schema = $this->deepSchemaSymbolic();
-        $this->setExpectedException(get_class(new Exception()), 'Validation failed (level1->level2->level3)',
-            Exception::INVALID_VALUE);
-        try {
-            $object = $schema->import(array(
-                'level1' => array(
-                    'level2' => array(
-                        'level3' => 'abc' // integer required
-                    ),
-                ),
-            ));
-        } catch (Exception $exception) {
-            $this->assertSame(array('level1', 'level2', 'level3'), $exception->getStructureTrace());
-            throw $exception;
-        }
-        //$this->assertSame('abc', $object->level1->level2->level3);
-    }
-
-
     public function testImport()
     {
         $object = $this->deepSchema()->import(array(
@@ -141,17 +89,4 @@ public function testImport()
         ));
         $this->assertSame(123, $object->level1->level2->level3);
     }
-
-    public function testImportSymbolic()
-    {
-        $object = $this->deepSchemaSymbolic()->import(array(
-            'level1' => array(
-                'level2' => array(
-                    'level3' => 123 // integer required
-                ),
-            ),
-        ));
-        $this->assertSame(123, $object->level1->level2->level3);
-    }
-
 }