AgeInfo: finished code, added unit test.

Author: fabiankessler

src/org/nameapi/ontology/input/entities/person/age/AgeInfo.php

@@ -2,43 +2,46 @@
 
 namespace org\nameapi\ontology\input\entities\person\age;
 
+/**
+ * Use the AgeInfoFactory to create one.
+ */
 class AgeInfo {
 
     /**
      * @var int $birthDay
      */
-    public $birthDay = null;
+    private $birthDay = null;
 
     /**
      * @var int $birthMonth
      */
-    public $birthMonth = null;
+    private $birthMonth = null;
 
     /**
      * @var int $birthYear
      */
-    public $birthYear = null;
+    private $birthYear = null;
 
     /**
      * @var int[] $birthYearRange
      */
-    public $birthYearRange = null;
+    private $birthYearRange = null;
 
     /**
-     * @param int $birthDay
-     * @param int $birthMonth
      * @param int $birthYear
+     * @param int $birthMonth
+     * @param int $birthDay
      * @param int[] $birthYearRange
-     * @throws Exception on invalid input data
+     * @throws \Exception on invalid input data
      * @access public
      */
-    public function __construct($birthDay, $birthMonth, $birthYear, $birthYearRange) {
-        if ($birthDay!=null && ($birthYear<0 || $birthYear>2100)) throw new \Exception("Year is out of legal range: "+$birthYear+"!");
-        if ($birthMonth!=null && ($birthMonth<1 || $birthMonth>12))  throw new \Exception("Month must be 1-12 but was: "+$birthMonth+"!");
-        if ($birthDay!=null && ($birthDay<1 || $birthDay>31)) throw new \Exception("Day must be 1-31 but was: "+$birthDay+"!");
+    public function __construct($birthYear, $birthMonth, $birthDay, $birthYearRange) {
+        if ($birthDay!=null && ($birthYear<0 || $birthYear>2100)) throw new \Exception("Year is out of legal range: ".$birthYear."!");
+        if ($birthMonth!=null && ($birthMonth<1 || $birthMonth>12))  throw new \Exception("Month must be 1-12 but was: ".$birthMonth."!");
+        if ($birthDay!=null && ($birthDay<1 || $birthDay>31)) throw new \Exception("Day must be 1-31 but was: ".$birthDay."!");
         if ($birthYearRange!=null && ($birthYearRange[0]!=null && $birthYearRange[1]!=null)) {
             if ($birthYearRange[0] > $birthYearRange[1]) {
-                throw new \Exception("Year end may not be before year start but it was: start="+$birthYearRange[0]+" end="+$birthYearRange[1]+"!");
+                throw new \Exception("Year end may not be before year start but it was: start=".$birthYearRange[0]." end=".$birthYearRange[1]."!");
             }
         }
         $this->birthDay = $birthDay;
@@ -53,37 +56,19 @@ public function __construct($birthDay, $birthMonth, $birthYear, $birthYearRange)
     public function getBirthDay() {
         return $this->birthDay;
     }
-//    /**
-//     * @param int $birthDay
-//     */
-//    public function setBirthDay($birthDay) {
-//        $this->birthDay = $birthDay;
-//    }
 
     /**
      * @return int
      */
     public function getBirthMonth() {
         return $this->birthMonth;
     }
-//    /**
-//     * @param int $birthMonth
-//     */
-//    public function setBirthMonth($birthMonth) {
-//        $this->birthMonth = $birthMonth;
-//    }
 
     /**
      * @return int
      */
     public function getBirthYear() {
         return $this->birthYear;
     }
-//    /**
-//     * @param int $birthYear
-//     */
-//    public function setBirthYear($birthYear) {
-//        $this->birthYear = $birthYear;
-//    }
 
 }

src/org/nameapi/ontology/input/entities/person/age/AgeInfoFactory.php

@@ -4,6 +4,9 @@
 
 include_once('AgeInfo.php');
 
+/**
+ * Creates instances of {@link AgeInfo}.
+ */
 class AgeInfoFactory {
 
     /**

tests/unit/org/nameapi/ontology/input/entities/person/age/AgeInfoFactoryTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\nameapi\ontology\input\entities\person\age;
+
+require_once(__DIR__.'/../../../../../../../../../src/org/nameapi/ontology/input/entities/person/age/AgeInfoFactory.php');
+
+class AgeInfoFactoryTest extends \PHPUnit_Framework_TestCase {
+
+    public function testDate() {
+        $ageInfo = AgeInfoFactory::forDate(1917, 5, 29);
+        $this->assertEquals($ageInfo->getBirthDay(), 29);
+        $this->assertEquals($ageInfo->getBirthMonth(), 5);
+        $this->assertEquals($ageInfo->getBirthYear(), 1917);
+    }
+
+}