some refactorings

Author: vearutop

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 (recursion->propOne)');
+        $this->setExpectedException(get_class(new Exception()), 'Validation failed (Properties:recursion->Properties:propOne)');
         $schema->import(array(
             'propOne' => '1',
             'propTwo' => 2,

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 (level1->level2->level3)',
+        $this->setExpectedException(get_class(new Exception()), 'Validation failed (Properties:level1->Properties:level2->Properties:level3)',
             Exception::INVALID_VALUE);
         try {
             $object = $schema->import(array(
@@ -69,7 +69,7 @@ public function testInvalidImport()
             ));
         }
         catch (Exception $exception) {
-            $this->assertSame(array('level1', 'level2', 'level3'), $exception->getStructureTrace());
+            $this->assertSame(array('Properties:level1', 'Properties:level2', 'Properties:level3'), $exception->getStructureTrace());
             throw $exception;
         }
         //$this->assertSame('abc', $object->level1->level2->level3);