Added a test for optional variables

Author: harm-less

tests/PE/Nodes/Specials/AccessorMethodActionTypeNodeNode.php

@@ -16,23 +16,23 @@ function __construct() {
 		$this->addVariable(new EncoderNodeVariable('node', array(
 			'setterAction' => array(
 				'type' => EncoderNodeVariable::ACTION_TYPE_NODE,
-				'method' => 'addThingToNode',
+				'method' => 'addNodeToSpecial',
 				'variables' => array(ActionVariable::SETTER_NAME)
 			),
 			'getterAction' => array(
 				'type' => EncoderNodeVariable::ACTION_TYPE_NODE,
-				'method' => 'getThingFromNode',
-				'variables' => array(ActionVariable::SETTER_NAME)
+				'method' => 'getNodeFromSpecial',
+				'variables' => array(ActionVariable::GETTER_NAME)
 			)
 		)));
 	}
 
-	public function addThingToNode($data, $setterName) {
+	public function addNodeToSpecial($data, $setterName) {
 		$data['special'] = $data[$setterName];
 		return $data;
 	}
 
-	public function getThingFromNode($data, $getterName) {
+	public function getNodeFromSpecial($data, $getterName) {
 		$data['special'] = $data[$getterName] . ' getter';
 		return $data;
 	}

tests/PE/Nodes/Specials/OptionalVariablesNode.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PE\Nodes\Specials;
+
+use PE\Nodes\EncoderNode;
+use PE\Nodes\EncoderNodeVariable;
+
+class OptionalVariablesNode extends EncoderNode {
+
+	function __construct() {
+		parent::__construct('optional-variables', 'optional-variables', '\\PE\\Samples\\Specials');
+
+		$this->addVariable(new EncoderNodeVariable('name'));
+		$this->addVariable(new EncoderNodeVariable('other-variable'));
+	}
+}

tests/PE/Nodes/Specials/RequiredConstructorVariablesNode.php

@@ -2,9 +2,7 @@
 
 namespace PE\Nodes\Specials;
 
-use PE\Enums\ActionVariable;
 use PE\Nodes\EncoderNode;
-use PE\Nodes\EncoderNodeChild;
 use PE\Nodes\EncoderNodeVariable;
 
 class RequiredConstructorVariablesNode extends EncoderNode {

tests/PE/Samples/Specials/OptionalVariables.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace PE\Samples\Specials;
+
+class OptionalVariables {
+
+	private $name;
+	private $otherVariable;
+
+	function __construct() {
+	}
+
+	function setName($value) {
+		$this->name = $value;
+	}
+	function getName() {
+		return $this->name;
+	}
+
+	function setOtherVariable($value) {
+		$this->otherVariable = $value;
+	}
+	function getOtherVariable() {
+		return $this->otherVariable;
+	}
+}

tests/PE/Tests/EncoderTest.php

@@ -8,6 +8,7 @@
 use PE\Samples\Farm\Buildings\House;
 use PE\Samples\Loader\ClassLoader;
 use PE\Samples\Specials\AddAfterDecodeParent;
+use PE\Samples\Specials\OptionalVariables;
 use PE\Samples\Specials\RequiredConstructorVariables;
 use PE\Samples\Specials\AccessorMethodActionTypeNode;
 use PE\Samples\Specials\SingleChild;
@@ -223,6 +224,20 @@ public function testDecodeObjectWithRequiredConstructorVariables() {
 		$this->assertTrue($obj->getOptional());
 	}
 
+	public function testDecodeObjectWithOptionalVariables() {
+		$this->addOptionalVariablesNode();
+		$decoded = $this->encoder()->decode(array(
+			'optional-variables' => array(
+				'name' => 'Hello world',
+				'other-variable' => 'other hello world'
+			)
+		));
+		/** @var OptionalVariables $obj */
+		$obj = $decoded['optional-variables'];
+		$this->assertEquals('Hello world', $obj->getName());
+		$this->assertEquals('other hello world', $obj->getOtherVariable());
+	}
+
 	public function testDecodeWithSetAfterChildrenFalse() {
 		$this->addAddAfterDecodeNodes();
 

tests/PE/Tests/Samples.php

@@ -28,6 +28,7 @@
 use PE\Nodes\Specials\HasDefaultTypeNode;
 use PE\Nodes\Specials\HasDefaultTypeTypeNode;
 use PE\Nodes\Specials\NonArrayGetterMethodOnPurposeNode;
+use PE\Nodes\Specials\OptionalVariablesNode;
 use PE\Nodes\Specials\RequiredConstructorVariablesNode;
 use PE\Nodes\Specials\SingleChildNode;
 use PE\Samples\Erroneous\EncoderNodeLoader;
@@ -49,6 +50,7 @@
 use PE\Samples\Specials\HasDefaultTypeType;
 use PE\Samples\Specials\NonArrayGetterMethodOnPurpose;
 use PE\Samples\Specials\AccessorMethodActionTypeNode;
+use PE\Samples\Specials\OptionalVariables;
 use PE\Samples\Specials\SingleChild;
 
 class Samples extends AbstractPETest
@@ -203,6 +205,13 @@ public function addNonArrayGetterMethodNode() {
 		return EncoderNode::addNode(new NonArrayGetterMethodNode());
 	}
 
+	public function getOptionalVariables() {
+		return new OptionalVariables();
+	}
+	public function addOptionalVariablesNode() {
+		return EncoderNode::addNode(new OptionalVariablesNode());
+	}
+
 
 	public function getHasDefaultType() {
 		return new HasDefaultType();