Moved examples classes from tests to subdic 'Examples/'

drbonzo · Jun 4, 2014 · 05eabd3 · 05eabd3
1 parent 4e34f0f
commit 05eabd3
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 58 deletions.
diff --git a/tests/NorthslopePL/Metassione/Tests/EmptyKlass.php b/tests/NorthslopePL/Metassione/Tests/EmptyKlass.php
diff --git a/...slopePL/Metassione/Tests/ArrayedKlass.php → ...etassione/Tests/Examples/ArrayedKlass.php b/...slopePL/Metassione/Tests/ArrayedKlass.php → ...etassione/Tests/Examples/ArrayedKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class ArrayedKlass
 {
@@ -9,42 +9,42 @@ class ArrayedKlass
 	private $numbers;
 
 	/**
-	 * @var array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @var array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	private $objects;
 
 	/**
 	 * Inverted order of 'array' and classname
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\OnePropertyKlass[]|array
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]|array
 	 */
 	private $objects2;
 
 	/**
 	 * Without [] at the end
 	 *
-	 * @var array|\NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @var array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	private $objects3;
 
 	/**
 	 * Without 'array|'
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	private $invalidSpecificationForObjects;
 
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[] $objects
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $objects
 	 */
 	public function setObjects($objects)
 	{
 		$this->objects = $objects;
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getObjects()
 	{
@@ -68,47 +68,47 @@ public function getNumbers()
 	}
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[] $objects2
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $objects2
 	 */
 	public function setObjects2($objects2)
 	{
 		$this->objects2 = $objects2;
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getObjects2()
 	{
 		return $this->objects2;
 	}
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass $objects3
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $objects3
 	 */
 	public function setObjects3($objects3)
 	{
 		$this->objects3 = $objects3;
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	public function getObjects3()
 	{
 		return $this->objects3;
 	}
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\OnePropertyKlass[] $invalidSpecificationForObjects
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $invalidSpecificationForObjects
 	 */
 	public function setInvalidSpecificationForObjects($invalidSpecificationForObjects)
 	{
 		$this->invalidSpecificationForObjects = $invalidSpecificationForObjects;
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getInvalidSpecificationForObjects()
 	{

diff --git a/tests/NorthslopePL/Metassione/Tests/Examples/EmptyKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/EmptyKlass.php
@@ -0,0 +1,6 @@
+<?php
+namespace NorthslopePL\Metassione\Tests\Examples;
+
+class EmptyKlass
+{
+}
diff --git a/tests/NorthslopePL/Metassione/Tests/Examples/OneObjectPropertyKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/OneObjectPropertyKlass.php
@@ -0,0 +1,27 @@
+<?php
+namespace NorthslopePL\Metassione\Tests\Examples;
+
+class OneObjectPropertyKlass
+{
+	/**
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
+	 */
+	private $value;
+
+	/**
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $value
+	 */
+	public function setValue(OnePropertyKlass $value)
+	{
+		$this->value = $value;
+	}
+
+	/**
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+}
diff --git a/...ePL/Metassione/Tests/OnePropertyKlass.php → ...sione/Tests/Examples/OnePropertyKlass.php b/...ePL/Metassione/Tests/OnePropertyKlass.php → ...sione/Tests/Examples/OnePropertyKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class OnePropertyKlass
 {

diff --git a/...etassione/Tests/PropertyNotFoundKlass.php → .../Tests/Examples/PropertyNotFoundKlass.php b/...etassione/Tests/PropertyNotFoundKlass.php → .../Tests/Examples/PropertyNotFoundKlass.php
@@ -1,12 +1,12 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class PropertyNotFoundKlass
 {
 	/**
 	 * Class Foo just does not exist. This is expected behaviour for that test.
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\Foo
+	 * @var \NorthslopePL\Metassione\Tests\Examples\Foo
 	 */
 	private $foo;
 
@@ -19,31 +19,31 @@ class PropertyNotFoundKlass
 	private $one;
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\Foo $foo
+	 * @param \NorthslopePL\Metassione\Tests\Examples\Foo $foo
 	 */
 	public function setFoo($foo)
 	{
 		$this->foo = $foo;
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\Foo
+	 * @return \NorthslopePL\Metassione\Tests\Examples\Foo
 	 */
 	public function getFoo()
 	{
 		return $this->foo;
 	}
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\OnePropertyKlass $one
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $one
 	 */
 	public function setOne($one)
 	{
 		$this->one = $one;
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	public function getOne()
 	{

diff --git a/...hslopePL/Metassione/Tests/SimpleKlass.php → ...Metassione/Tests/Examples/SimpleKlass.php b/...hslopePL/Metassione/Tests/SimpleKlass.php → ...Metassione/Tests/Examples/SimpleKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class SimpleKlass
 {

diff --git a/tests/NorthslopePL/Metassione/Tests/OneObjectPropertyKlass.php b/tests/NorthslopePL/Metassione/Tests/OneObjectPropertyKlass.php
diff --git a/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php b/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php
@@ -2,6 +2,10 @@
 namespace NorthslopePL\Metassione\Tests;
 
 use NorthslopePL\Metassione\POPOConverter;
+use NorthslopePL\Metassione\Tests\Examples\ArrayedKlass;
+use NorthslopePL\Metassione\Tests\Examples\EmptyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\SimpleKlass;
 
 class POPOConverterTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php b/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php
@@ -3,6 +3,12 @@
 
 use NorthslopePL\Metassione\POPOObjectFiller;
 use NorthslopePL\Metassione\Tests\Blog\Blog;
+use NorthslopePL\Metassione\Tests\Examples\ArrayedKlass;
+use NorthslopePL\Metassione\Tests\Examples\EmptyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OneObjectPropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass;
+use NorthslopePL\Metassione\Tests\Examples\SimpleKlass;
 
 class POPOObjectFillerTest extends \PHPUnit_Framework_TestCase
 {
@@ -91,7 +97,7 @@ public function testFillingSimpleObjectWithRawDataThatIsNotAnObject()
 		$simpleObject = new SimpleKlass();
 		$rawData = 'foobar';
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but string was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\SimpleKlass.');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but string was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\Examples\SimpleKlass.');
 
 		$this->objectFiller->fillObjectWithRawData($simpleObject, $rawData);
 	}
@@ -102,7 +108,7 @@ public function testFillingObjectWhenItsPropertysClassDoesNotExist()
 		$rawData = new \stdClass();
 		$rawData->foo = 'bar';
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "NorthslopePL\Metassione\Tests\Foo" does not exist for property NorthslopePL\Metassione\Tests\PropertyNotFoundKlass::$foo');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "NorthslopePL\Metassione\Tests\Examples\Foo" does not exist for property NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass::$foo');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $rawData);
 	}
 
@@ -167,7 +173,7 @@ public function testFillingObjectWithIncorrectlyDocumentedArrayProperty()
 		}
 		$rawData->invalidSpecificationForObjects = array($object1, $object2);
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but array was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\OnePropertyKlass. Maybe you have forgotten about adding "array|" for property that holds this class NorthslopePL\Metassione\Tests\OnePropertyKlass');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but array was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass. Maybe you have forgotten about adding "array|" for property that holds this class NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $rawData);
 	}
 
@@ -188,7 +194,7 @@ public function testUsingUnqalifiedClassname()
 		$sourceData = new \stdClass();
 		$sourceData->one = (object)array('value' => 42);
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "OnePropertyKlass" does not exist for property NorthslopePL\Metassione\Tests\PropertyNotFoundKlass::$one. Maybe you have forgotten to use fully qualified class name (with namespace, example: \Foo\Bar\OnePropertyKlass)?');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "OnePropertyKlass" does not exist for property NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass::$one. Maybe you have forgotten to use fully qualified class name (with namespace, example: \Foo\Bar\OnePropertyKlass)?');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $sourceData);
 	}
 }