Qual: Add dol_format_address PHPUnit tests

htdocs/core/lib/functions.lib.php

@@ -696,7 +696,7 @@ function dol_format_address($object)
 		$ret .= ($ret ? "\n" : '' ).$object->town;
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
-			$ret.=", ".$object->departement;
+			$ret.=", ".$object->state;
 		}
 		if ($object->zip) $ret .= ', '.$object->zip;
 	}
@@ -705,7 +705,7 @@ function dol_format_address($object)
 		$ret .= ($ret ? "\n" : '' ).$object->town;
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
-			$ret.=", ".$object->departement;
+			$ret.=", ".$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
 	}

htdocs/societe/class/societe.class.php

@@ -2537,8 +2537,12 @@ class Societe extends CommonObject
         $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
         $this->nom = $this->name;   // For backward compatibility
         $this->specimen=1;
+        $this->address='21 jump street';
         $this->zip='99999';
         $this->town='MyTown';
+        $this->state_id=1;
+        $this->state_code='AA';
+        $this->state='MyState';
         $this->country_id=1;
         $this->country_code='FR';
 

test/phpunit/FunctionsTest.php

@@ -388,6 +388,35 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
     }
 
 
+    /**
+     * testDolFormatAddress
+     *
+     * @return	void
+     */
+    public function testDolFormatAddress()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$object=new Societe($db);
+		$object->initAsSpecimen();
+
+		$object->country_code='FR';
+    	$address=dol_format_address($object);
+    	$this->assertEquals("21 jump street\n99999 MyTown",$address);
+
+		$object->country_code='GB';
+    	$address=dol_format_address($object);
+    	$this->assertEquals("21 jump street\nMyTown, MyState\n99999",$address);
+
+		$object->country_code='US';
+    	$address=dol_format_address($object);
+    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
+    }
+
     /**
      * testImgPicto
      *