tests fixed

Author: vearutop

src/Structure/ClassStructure.php

@@ -18,7 +18,7 @@ public static function makeSchema()
         $schema = new Schema();
         $properties = new Properties();
         static::setUpProperties($properties, $schema);
-        $schema->setConstraint(new Type(ObjectType::TYPE));
+        $schema->setConstraint(new Type(ObjectType::TYPE, $schema));
         $schema->setConstraint($properties);
         return $schema;
     }

src/Types/StringType.php

@@ -9,12 +9,14 @@ class StringType extends AbstractType
 
     public function import($data)
     {
-        // TODO: Implement import() method.
+        $this->validate($data);
+        return $data;
     }
 
     public function export($data)
     {
-        // TODO: Implement export() method.
+        $this->validate($data);
+        return $data;
     }
 
     protected function validate($data)

tests/src/ClassStructure/ClassStructureTest.php

@@ -32,7 +32,7 @@ public function testSample()
     public function testSampleInvalid()
     {
         $schema = SampleStructure::makeSchema();
-        $this->setExpectedException(get_class(new Exception()), 'Validation failed (Properties:recursion->Properties:propOne)');
+        $this->setExpectedException(get_class(new Exception()), 'String required (Properties:recursion->Properties:propOne)');
         $schema->import(array(
             'propOne' => '1',
             'propTwo' => 2,

tests/src/Helper/SampleStructure.php

@@ -20,8 +20,8 @@ class SampleStructure extends ClassStructure
      */
     public static function setUpProperties($properties, Schema $schema)
     {
-        $properties->propOne = StringType::create();
-        $properties->propTwo = IntegerType::create();
+        $properties->propOne = StringType::makeSchema();
+        $properties->propTwo = IntegerType::makeSchema();
         $properties->recursion = $schema;
     }
 }

tests/src/Schema/ParentTest.php

@@ -57,7 +57,7 @@ public function testParent()
     public function testInvalidImport()
     {
         $schema = $this->deepSchema();
-        $this->setExpectedException(get_class(new Exception()), 'Validation failed (Properties:level1->Properties:level2->Properties:level3)',
+        $this->setExpectedException(get_class(new Exception()), 'Integer required (Properties:level1->Properties:level2->Properties:level3)',
             Exception::INVALID_VALUE);
         try {
             $object = $schema->import(array(

tests/src/StringTest.php

@@ -8,15 +8,6 @@
 
 class StringTest extends \PHPUnit_Framework_TestCase
 {
-    public function testString()
-    {
-        $schema = StringType::makeSchema();
-
-        $this->assertFalse($schema->isValid(123));
-        $this->assertTrue($schema->isValid('aaa'));
-    }
-
-
     public function testStringSchema()
     {
         $schema = StringType::makeSchema();
@@ -26,7 +17,7 @@ public function testStringSchema()
     public function testStringSchemaException()
     {
         $schema = StringType::makeSchema();
-        $this->setExpectedException(get_class(new Exception), 'Validation failed');
+        $this->setExpectedException(get_class(new Exception), 'String required');
         $schema->import(123);
     }