[ZF-3936] Zend_Measure:

 - added localized output of values


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15906 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Measure/Abstract.php

@@ -86,6 +86,38 @@ abstract class Zend_Measure_Abstract
             $type = null;
         }
 
+        $this->setLocale($locale);
+        if ($type === null) {
+            $type = $this->_units['STANDARD'];
+        }
+
+        if (isset($this->_units[$type]) === false) {
+            require_once 'Zend/Measure/Exception.php';
+            throw new Zend_Measure_Exception("Type ($type) is unknown");
+        }
+
+        $this->setValue($value, $type, $this->_locale);
+    }
+
+    /**
+     * Returns the actual set locale
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        return $this->_locale;
+    }
+
+    /**
+     * Sets a new locale for the value representation
+     *
+     * @param string|Zend_Locale $locale (Optional) New locale to set
+     * @param boolean            $check  False, check but don't set; True, set the new locale
+     * @return Zend_Measure_Abstract
+     */
+    public function setLocale($locale = null, $check = false)
+    {
         if (empty($locale)) {
             require_once 'Zend/Registry.php';
             if (Zend_Registry::isRegistered('Zend_Locale') === true) {
@@ -106,33 +138,33 @@ abstract class Zend_Measure_Abstract
             $locale = new Zend_Locale($locale);
         }
 
-        $this->_locale = (string) $locale;
-
-        if ($type === null) {
-            $type = $this->_units['STANDARD'];
+        if (!$check) {
+            $this->_locale = (string) $locale;
         }
-
-        if (isset($this->_units[$type]) === false) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception("Type ($type) is unknown");
-        }
-
-        $this->setValue($value, $type, $this->_locale);
+        return $this;
     }
 
     /**
      * Returns the internal value
      *
-     * @param integer $round (Optional) Rounds the value to an given precision,
-     *                                  Default is 2, -1 returns without rounding
+     * @param integer            $round  (Optional) Rounds the value to an given precision,
+     *                                              Default is -1 which returns without rounding
+     * @param string|Zend_Locale $locale (Optional) Locale for number representation
      */
-    public function getValue($round = 2)
+    public function getValue($round = -1, $locale = null)
     {
         if ($round < 0) {
-            return $this->_value;
+            $return = $this->_value;
+        } else {
+            $return = Zend_Locale_Math::round($this->_value, $round);
         }
 
-        return Zend_Locale_Math::round($this->_value, $round);
+        if ($locale !== null) {
+            $this->setLocale($locale, true);
+            return Zend_Locale_Format::toNumber($return, array('locale' => $locale));
+        }
+
+        return $return;
     }
 
     /**
@@ -154,16 +186,7 @@ abstract class Zend_Measure_Abstract
             $locale = $this->_locale;
         }
 
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, false, false)) {
-                require_once 'Zend/Measure/Exception.php';
-                throw new Zend_Measure_Exception("Language (" . (string) $locale . ") is unknown");
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        $locale = (string) $locale;
+        $this->setLocale($locale, true);
         if ($type === null) {
             $type = $this->_units['STANDARD'];
         }
@@ -182,6 +205,7 @@ abstract class Zend_Measure_Abstract
 
         $this->_value = $value;
         $this->setType($type);
+        return $this;
     }
 
     /**
@@ -212,7 +236,12 @@ abstract class Zend_Measure_Abstract
         } else {
 
             // Convert to standard value
-            $value = $this->getValue(-1);
+            $value = $this->_value;
+            $prec  = 0;
+            if (strpos($this->_value, '.') !== false) {
+                $prec = strlen(substr($this->_value, strpos($this->_value, '.') + 1));
+            }
+
             if (is_array($this->_units[$this->getType()][0])) {
                 foreach ($this->_units[$this->getType()][0] as $key => $found) {
                     switch ($key) {
@@ -235,7 +264,7 @@ abstract class Zend_Measure_Abstract
             } else {
                 $value = call_user_func(Zend_Locale_Math::$mul, $value, $this->_units[$this->getType()][0], 25);
             }
-            
+
             // Convert to expected value
             if (is_array($this->_units[$type][0])) {
                 foreach (array_reverse($this->_units[$type][0]) as $key => $found) {
@@ -260,9 +289,10 @@ abstract class Zend_Measure_Abstract
                 $value = @call_user_func(Zend_Locale_Math::$div, $value, $this->_units[$type][0], 25);
             }
 
-            $this->_value = $value;
+            $this->_value = Zend_Locale_Math::round($value, $prec);
             $this->_type = $type;
         }
+        return $this;
     }
 
     /**
@@ -283,12 +313,17 @@ abstract class Zend_Measure_Abstract
     /**
      * Returns a string representation
      *
-     * @param  integer  $round  OPTIONAL rounds the value to an given exception
+     * @param  integer            $round  (Optional) Runds the value to an given exception
+     * @param  string|Zend_Locale $locale (Optional) Locale to set for the number
      * @return string
      */
-    public function toString($round = -1)
+    public function toString($round = -1, $locale = null)
     {
-        return $this->getValue($round) . ' ' . $this->_units[$this->getType()][1];
+        if ($locale === null) {
+            $locale = $this->_locale;
+        }
+
+        return $this->getValue($round, $locale) . ' ' . $this->_units[$this->getType()][1];
     }
 
     /**
@@ -314,14 +349,15 @@ abstract class Zend_Measure_Abstract
     /**
      * Alias function for setType returning the converted unit
      *
-     * @param $type   type
-     * @param $round  integer  OPTIONAL rounds the value to a given precision
+     * @param  string             $type   Constant Type
+     * @param  integer            $round  (Optional) Rounds the value to a given precision
+     * @param  string|Zend_Locale $locale (Optional) Locale to set for the number
      * @return string
      */
-    public function convertTo($type, $round = 2)
+    public function convertTo($type, $round = 2, $locale = null)
     {
         $this->setType($type);
-        return $this->toString($round);
+        return $this->toString($round, $locale);
     }
 
     /**

library/Zend/Measure/Number.php

@@ -76,7 +76,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
 
     /**
      * Definition of all roman signs
-     * 
+     *
      * @var array $_roman
      */
     private static $_roman = array(
@@ -109,7 +109,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
 
     /**
      * Convertion table for roman signs
-     * 
+     *
      * @var array $_romanconvert
      */
     private static $_romanconvert = array(
@@ -336,7 +336,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
                 $target = call_user_func(Zend_Locale_Math::$mod, $value, $base);
 
                 $newvalue = strtoupper(dechex($target)) . $newvalue;
-                
+
                 $value = call_user_func(Zend_Locale_Math::$sub, $value, $target, 0);
                 $value = call_user_func(Zend_Locale_Math::$div, $value, $base, 0);
 
@@ -346,7 +346,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
                     throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits");
                 }
             }
-            
+
             if ($newvalue === '') {
                 $newvalue = '0';
             }
@@ -412,9 +412,9 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
      * @param  integer $round (Optional) Precision to add, will always be 0
      * @return string
      */
-    public function convertTo($type, $round = 0)
+    public function convertTo($type, $round = 0, $locale = null)
     {
         $this->setType($type);
-        return $this->toString($round);
+        return $this->toString($round, $locale);
     }
 }

tests/Zend/Measure/AccelerationTest.php

@@ -87,7 +87,7 @@ class Zend_Measure_AccelerationTest extends PHPUnit_Framework_TestCase
         $value = new Zend_Measure_Acceleration('-100.100,200',Zend_Measure_Acceleration::STANDARD,$locale);
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Acceleration Object not returned');
         // value with string
-        $value = new Zend_Measure_Acceleration('string -100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $value = new Zend_Measure_Acceleration('-100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Acceleration Object not returned');
     }
 
@@ -98,12 +98,12 @@ class Zend_Measure_AccelerationTest extends PHPUnit_Framework_TestCase
      */
     public function testAccelerationEquals()
     {
-        $value = new Zend_Measure_Acceleration('string -100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
-        $newvalue = new Zend_Measure_Acceleration('otherstring -100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $value = new Zend_Measure_Acceleration('-100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $newvalue = new Zend_Measure_Acceleration('-100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Acceleration Object should be equal');
 
-        $value = new Zend_Measure_Acceleration('string -100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
-        $newvalue = new Zend_Measure_Acceleration('otherstring -100,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $value = new Zend_Measure_Acceleration('-100.100,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $newvalue = new Zend_Measure_Acceleration('-100,200',Zend_Measure_Acceleration::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Acceleration Object should be not equal');
     }
 
@@ -129,13 +129,13 @@ class Zend_Measure_AccelerationTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200.200, $value->getValue(), 'Zend_Measure_Acceleration value expected to be a decimal value');
         $value->setValue('-200.200,200',Zend_Measure_Acceleration::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Acceleration Object not returned');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Acceleration::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Acceleration::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Acceleration Object not returned');
         $value->setValue('200', Zend_Measure_Acceleration::STANDARD);
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Acceleration value expected to be a positive integer');
 
         try {
-            $value->setValue('otherstring -200.200,200','Acceleration::UNKNOWN','de');
+            $value->setValue('-200.200,200','Acceleration::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/AngleTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_AngleTest extends PHPUnit_Framework_TestCase
      */
     public function testAngleValueString()
     {
-        $value = new Zend_Measure_Angle('string -100.100,200',Zend_Measure_Angle::STANDARD,'de');
+        $value = new Zend_Measure_Angle('-100.100,200',Zend_Measure_Angle::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Angle Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_AngleTest extends PHPUnit_Framework_TestCase
      */
     public function testAngleEquality()
     {
-        $value = new Zend_Measure_Angle('string -100.100,200',Zend_Measure_Angle::STANDARD,'de');
-        $newvalue = new Zend_Measure_Angle('otherstring -100.100,200',Zend_Measure_Angle::STANDARD,'de');
+        $value = new Zend_Measure_Angle('-100.100,200',Zend_Measure_Angle::STANDARD,'de');
+        $newvalue = new Zend_Measure_Angle('-100.100,200',Zend_Measure_Angle::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Angle Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_AngleTest extends PHPUnit_Framework_TestCase
      */
     public function testAngleNoEquality()
     {
-        $value = new Zend_Measure_Angle('string -100.100,200',Zend_Measure_Angle::STANDARD,'de');
-        $newvalue = new Zend_Measure_Angle('otherstring -100,200',Zend_Measure_Angle::STANDARD,'de');
+        $value = new Zend_Measure_Angle('-100.100,200',Zend_Measure_Angle::STANDARD,'de');
+        $newvalue = new Zend_Measure_Angle('-100,200',Zend_Measure_Angle::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Angle Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_AngleTest extends PHPUnit_Framework_TestCase
      */
     public function testAngleSetString()
     {
-        $value = new Zend_Measure_Angle('string -100.100,200',Zend_Measure_Angle::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Angle::STANDARD,'de');
+        $value = new Zend_Measure_Angle('-100.100,200',Zend_Measure_Angle::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Angle::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Angle Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_AngleTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Angle('100',Zend_Measure_Angle::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Angle::UNKNOWN','de');
+            $value->setValue('-200.200,200','Angle::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/AreaTest.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Zend Framework
  *
@@ -21,7 +20,6 @@
  * @version    $Id$
  */
 
-
 /**
  * Zend_Measure_Area
  */
@@ -32,7 +30,6 @@ require_once 'Zend/Measure/Area.php';
  */
 require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @package    Zend_Measure
  * @subpackage UnitTests
@@ -49,7 +46,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($value instanceof Zend_Measure_Area,'Zend_Measure_Area Object not returned');
     }
 
-
     /**
      * test for exception unknown type
      * expected exception
@@ -64,7 +60,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown value
      * expected exception
@@ -79,7 +74,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected root value
@@ -94,7 +88,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for standard locale
      * expected integer
@@ -105,7 +98,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(100, $value->getValue(),'Zend_Measure_Area value expected');
     }
 
-
     /**
      * test for positive value
      * expected integer
@@ -116,7 +108,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(100, $value->getValue(), 'Zend_Measure_Area value expected to be a positive integer');
     }
 
-
     /**
      * test for negative value
      * expected integer
@@ -127,7 +118,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-100, $value->getValue(), 'Zend_Measure_Area value expected to be a negative integer');
     }
 
-
     /**
      * test for decimal value
      * expected float
@@ -138,7 +128,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-100.200, $value->getValue(), 'Zend_Measure_Area value expected to be a decimal value');
     }
 
-
     /**
      * test for decimal seperated value
      * expected float
@@ -149,42 +138,38 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Area Object not returned');
     }
 
-
     /**
      * test for string with integrated value
      * expected float
      */
     public function testAreaValueString()
     {
-        $value = new Zend_Measure_Area('string -100.100,200',Zend_Measure_Area::STANDARD,'de');
+        $value = new Zend_Measure_Area('-100.100,200',Zend_Measure_Area::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Area Object not returned');
     }
 
-
     /**
      * test for equality
      * expected true
      */
     public function testAreaEquality()
     {
-        $value = new Zend_Measure_Area('string -100.100,200',Zend_Measure_Area::STANDARD,'de');
-        $newvalue = new Zend_Measure_Area('otherstring -100.100,200',Zend_Measure_Area::STANDARD,'de');
+        $value = new Zend_Measure_Area('-100.100,200',Zend_Measure_Area::STANDARD,'de');
+        $newvalue = new Zend_Measure_Area('-100.100,200',Zend_Measure_Area::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Area Object should be equal');
     }
 
-
     /**
      * test for no equality
      * expected false
      */
     public function testAreaNoEquality()
     {
-        $value = new Zend_Measure_Area('string -100.100,200',Zend_Measure_Area::STANDARD,'de');
-        $newvalue = new Zend_Measure_Area('otherstring -100,200',Zend_Measure_Area::STANDARD,'de');
+        $value = new Zend_Measure_Area('-100.100,200',Zend_Measure_Area::STANDARD,'de');
+        $newvalue = new Zend_Measure_Area('-100,200',Zend_Measure_Area::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Area Object should be not equal');
     }
 
-
     /**
      * test for set positive value
      * expected integer
@@ -196,7 +181,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Area value expected to be a positive integer');
     }
 
-
     /**
      * test for set negative value
      * expected integer
@@ -208,7 +192,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200, $value->getValue(), 'Zend_Measure_Area value expected to be a negative integer');
     }
 
-
     /**
      * test for set decimal value
      * expected float
@@ -220,7 +203,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200.200, $value->getValue(), 'Zend_Measure_Area value expected to be a decimal value');
     }
 
-
     /**
      * test for set decimal seperated value
      * expected float
@@ -232,19 +214,17 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Area Object not returned');
     }
 
-
     /**
      * test for set string with integrated value
      * expected float
      */
     public function testAreaSetString()
     {
-        $value = new Zend_Measure_Area('string -100.100,200',Zend_Measure_Area::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Area::STANDARD,'de');
+        $value = new Zend_Measure_Area('-100.100,200',Zend_Measure_Area::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Area::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Area Object not returned');
     }
 
-
     /**
      * test for exception unknown type
      * expected exception
@@ -253,14 +233,13 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Area('100',Zend_Measure_Area::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Area::UNKNOWN','de');
+            $value->setValue('-200.200,200','Area::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success
         }
     }
 
-
     /**
      * test for exception unknown value
      * expected exception
@@ -276,7 +255,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected exception
@@ -292,7 +270,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected exception
@@ -304,7 +281,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Area value expected to be a positive integer');
     }
 
-
     /**
      * test setting type
      * expected new type
@@ -316,7 +292,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Area::MORGEN, $value->getType(), 'Zend_Measure_Area type expected');
     }
 
-
     /**
      * test setting computed type
      * expected new type
@@ -328,7 +303,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Area::SQUARE_INCH, $value->getType(), 'Zend_Measure_Area type expected');
     }
 
-
     /**
      * test setting computed type
      * expected new type
@@ -340,7 +314,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Area::SQUARE_MILE, $value->getType(), 'Zend_Measure_Area type expected');
     }
 
-
     /**
      * test setting unknown type
      * expected new type
@@ -356,7 +329,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test toString
      * expected string
@@ -367,7 +339,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('-100 m²', $value->toString(), 'Value -100 m² expected');
     }
 
-
     /**
      * test __toString
      * expected string
@@ -378,7 +349,6 @@ class Zend_Measure_AreaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('-100 m²', $value->__toString(), 'Value -100 m² expected');
     }
 
-
     /**
      * test getConversionList
      * expected array

tests/Zend/Measure/BinaryTest.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Zend Framework
  *
@@ -21,7 +20,6 @@
  * @version    $Id$
  */
 
-
 /**
  * Zend_Measure_Binary
  */
@@ -32,7 +30,6 @@ require_once 'Zend/Measure/Binary.php';
  */
 require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @package    Zend_Measure
  * @subpackage UnitTests
@@ -49,7 +46,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($value instanceof Zend_Measure_Binary,'Zend_Measure_Binary Object not returned');
     }
 
-
     /**
      * test for exception unknown type
      * expected exception
@@ -64,7 +60,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown value
      * expected exception
@@ -79,7 +74,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected root value
@@ -94,7 +88,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception no locale
      * expected root value
@@ -105,7 +98,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_object($value),'Object expected because of standard locale');
     }
 
-
     /**
      * test for positive value
      * expected integer
@@ -113,10 +105,9 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
     public function testBinaryValuePositive()
     {
         $value = new Zend_Measure_Binary('100',Zend_Measure_Binary::STANDARD,'de');
-        $this->assertEquals(100, $value->getValue(), 'Zend_Measure_Binary value expected to be a positive integer');
+        $this->assertEquals('100', $value->getValue(), 'Zend_Measure_Binary value expected to be a positive integer');
     }
 
-
     /**
      * test for negative value
      * expected integer
@@ -124,10 +115,9 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
     public function testBinaryValueNegative()
     {
         $value = new Zend_Measure_Binary('-100',Zend_Measure_Binary::STANDARD,'de');
-        $this->assertEquals(-100, $value->getValue(), 'Zend_Measure_Binary value expected to be a negative integer');
+        $this->assertEquals('-100', $value->getValue(), 'Zend_Measure_Binary value expected to be a negative integer');
     }
 
-
     /**
      * test for decimal value
      * expected float
@@ -138,7 +128,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-100.200, $value->getValue(), 'Zend_Measure_Binary value expected to be a decimal value');
     }
 
-
     /**
      * test for decimal seperated value
      * expected float
@@ -149,42 +138,28 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Binary Object not returned');
     }
 
-
-    /**
-     * test for string with integrated value
-     * expected float
-     */
-    public function testBinaryValueString()
-    {
-        $value = new Zend_Measure_Binary('string -100.100,200',Zend_Measure_Binary::STANDARD,'de');
-        $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Binary Object not returned');
-    }
-
-
     /**
      * test for equality
      * expected true
      */
     public function testBinaryEquality()
     {
-        $value = new Zend_Measure_Binary('string -100.100,200',Zend_Measure_Binary::STANDARD,'de');
-        $newvalue = new Zend_Measure_Binary('otherstring -100.100,200',Zend_Measure_Binary::STANDARD,'de');
+        $value = new Zend_Measure_Binary('-100.100,200',Zend_Measure_Binary::STANDARD,'de');
+        $newvalue = new Zend_Measure_Binary('-100100,200',Zend_Measure_Binary::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Binary Object should be equal');
     }
 
-
     /**
      * test for no equality
      * expected false
      */
     public function testBinaryNoEquality()
     {
-        $value = new Zend_Measure_Binary('string -100.100,200',Zend_Measure_Binary::STANDARD,'de');
-        $newvalue = new Zend_Measure_Binary('otherstring -100,200',Zend_Measure_Binary::STANDARD,'de');
+        $value = new Zend_Measure_Binary('-100.100,200',Zend_Measure_Binary::STANDARD,'de');
+        $newvalue = new Zend_Measure_Binary('-100,200',Zend_Measure_Binary::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Binary Object should be not equal');
     }
 
-
     /**
      * test for set positive value
      * expected integer
@@ -196,7 +171,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Binary value expected to be a positive integer');
     }
 
-
     /**
      * test for set negative value
      * expected integer
@@ -208,7 +182,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200, $value->getValue(), 'Zend_Measure_Binary value expected to be a negative integer');
     }
 
-
     /**
      * test for set decimal value
      * expected float
@@ -220,7 +193,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200.200, $value->getValue(), 'Zend_Measure_Binary value expected to be a decimal value');
     }
 
-
     /**
      * test for set decimal seperated value
      * expected float
@@ -232,19 +204,17 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Binary Object not returned');
     }
 
-
     /**
      * test for set string with integrated value
      * expected float
      */
     public function testBinarySetString()
     {
-        $value = new Zend_Measure_Binary('string -100.100,200',Zend_Measure_Binary::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Binary::STANDARD,'de');
+        $value = new Zend_Measure_Binary('-100.100,200', Zend_Measure_Binary::STANDARD, 'de');
+        $value->setValue('-200.200,200', Zend_Measure_Binary::STANDARD, 'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Binary Object not returned');
     }
 
-
     /**
      * test for exception unknown type
      * expected exception
@@ -253,14 +223,13 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Binary('100',Zend_Measure_Binary::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Binary::UNKNOWN','de');
+            $value->setValue('-200.200,200','Binary::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success
         }
     }
 
-
     /**
      * test for exception unknown value
      * expected exception
@@ -276,7 +245,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected exception
@@ -292,7 +260,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test for exception unknown locale
      * expected exception
@@ -304,7 +271,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Binary value expected to be a positive integer');
     }
 
-
     /**
      * test setting type
      * expected new type
@@ -316,7 +282,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Binary::GIGABYTE, $value->getType(), 'Zend_Measure_Binary type expected');
     }
 
-
     /**
      * test setting computed type
      * expected new type
@@ -328,7 +293,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Binary::TERABYTE, $value->getType(), 'Zend_Measure_Binary type expected');
     }
 
-
     /**
      * test setting computed type
      * expected new type
@@ -340,7 +304,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Measure_Binary::KILOBYTE, $value->getType(), 'Zend_Measure_Binary type expected');
     }
 
-
     /**
      * test setting unknown type
      * expected new type
@@ -356,7 +319,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         }
     }
 
-
     /**
      * test toString
      * expected string
@@ -367,7 +329,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('-100 B', $value->toString(), 'Value -100 B expected');
     }
 
-
     /**
      * test __toString
      * expected string
@@ -378,7 +339,6 @@ class Zend_Measure_BinaryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('-100 B', $value->__toString(), 'Value -100 B expected');
     }
 
-
     /**
      * test getConversionList
      * expected array

tests/Zend/Measure/CapacitanceTest.php

@@ -155,7 +155,7 @@ class Zend_Measure_CapacitanceTest extends PHPUnit_Framework_TestCase
      */
     public function testCapacitanceValueString()
     {
-        $value = new Zend_Measure_Capacitance('string -100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $value = new Zend_Measure_Capacitance('-100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Capacitance Object not returned');
     }
 
@@ -166,8 +166,8 @@ class Zend_Measure_CapacitanceTest extends PHPUnit_Framework_TestCase
      */
     public function testCapacitanceEquality()
     {
-        $value = new Zend_Measure_Capacitance('string -100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
-        $newvalue = new Zend_Measure_Capacitance('otherstring -100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $value = new Zend_Measure_Capacitance('-100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $newvalue = new Zend_Measure_Capacitance('-100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Capacitance Object should be equal');
     }
 
@@ -178,8 +178,8 @@ class Zend_Measure_CapacitanceTest extends PHPUnit_Framework_TestCase
      */
     public function testCapacitanceNoEquality()
     {
-        $value = new Zend_Measure_Capacitance('string -100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
-        $newvalue = new Zend_Measure_Capacitance('otherstring -100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $value = new Zend_Measure_Capacitance('-100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $newvalue = new Zend_Measure_Capacitance('-100,200',Zend_Measure_Capacitance::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Capacitance Object should be not equal');
     }
 
@@ -238,8 +238,8 @@ class Zend_Measure_CapacitanceTest extends PHPUnit_Framework_TestCase
      */
     public function testCapacitanceSetString()
     {
-        $value = new Zend_Measure_Capacitance('string -100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $value = new Zend_Measure_Capacitance('-100.100,200',Zend_Measure_Capacitance::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Capacitance::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Capacitance Object not returned');
     }
 
@@ -252,7 +252,7 @@ class Zend_Measure_CapacitanceTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Capacitance('100',Zend_Measure_Capacitance::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Capacitance::UNKNOWN','de');
+            $value->setValue('-200.200,200','Capacitance::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Cooking/VolumeTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Cooking_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_VolumeValueString()
     {
-        $value = new Zend_Measure_Cooking_Volume('string -100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Volume('-100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Cooking_Volume Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Cooking_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_VolumeEquality()
     {
-        $value = new Zend_Measure_Cooking_Volume('string -100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Cooking_Volume('otherstring -100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Volume('-100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Cooking_Volume('-100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Cooking_Volume Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Cooking_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_VolumeNoEquality()
     {
-        $value = new Zend_Measure_Cooking_Volume('string -100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Cooking_Volume('otherstring -100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Volume('-100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Cooking_Volume('-100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Cooking_Volume Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Cooking_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_VolumeSetString()
     {
-        $value = new Zend_Measure_Cooking_Volume('string -100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Volume('-100.100,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Cooking_Volume::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Cooking_Volume Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Cooking_VolumeTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Cooking_Volume('100',Zend_Measure_Cooking_Volume::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Cooking_Volume::UNKNOWN','de');
+            $value->setValue('-200.200,200','Cooking_Volume::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Cooking/WeightTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Cooking_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_WeightValueString()
     {
-        $value = new Zend_Measure_Cooking_Weight('string -100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Weight('-100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Cooking_Weight Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Cooking_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_WeightEquality()
     {
-        $value = new Zend_Measure_Cooking_Weight('string -100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
-        $newvalue = new Zend_Measure_Cooking_Weight('otherstring -100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Weight('-100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $newvalue = new Zend_Measure_Cooking_Weight('-100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Cooking_Weight Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Cooking_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_WeightNoEquality()
     {
-        $value = new Zend_Measure_Cooking_Weight('string -100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
-        $newvalue = new Zend_Measure_Cooking_Weight('otherstring -100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Weight('-100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $newvalue = new Zend_Measure_Cooking_Weight('-100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Cooking_Weight Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Cooking_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testCooking_WeightSetString()
     {
-        $value = new Zend_Measure_Cooking_Weight('string -100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Cooking_Weight('-100.100,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Cooking_Weight::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Cooking_Weight Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Cooking_WeightTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Cooking_Weight('100',Zend_Measure_Cooking_Weight::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Cooking_Weight::UNKNOWN','de');
+            $value->setValue('-200.200,200','Cooking_Weight::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/CurrentTest.php

@@ -155,7 +155,7 @@ class Zend_Measure_CurrentTest extends PHPUnit_Framework_TestCase
      */
     public function testCurrentValueString()
     {
-        $value = new Zend_Measure_Current('string -100.100,200',Zend_Measure_Current::STANDARD,'de');
+        $value = new Zend_Measure_Current('-100.100,200',Zend_Measure_Current::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Current Object not returned');
     }
 
@@ -166,8 +166,8 @@ class Zend_Measure_CurrentTest extends PHPUnit_Framework_TestCase
      */
     public function testCurrentEquality()
     {
-        $value = new Zend_Measure_Current('string -100.100,200',Zend_Measure_Current::STANDARD,'de');
-        $newvalue = new Zend_Measure_Current('otherstring -100.100,200',Zend_Measure_Current::STANDARD,'de');
+        $value = new Zend_Measure_Current('-100.100,200',Zend_Measure_Current::STANDARD,'de');
+        $newvalue = new Zend_Measure_Current('-100.100,200',Zend_Measure_Current::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Current Object should be equal');
     }
 
@@ -178,8 +178,8 @@ class Zend_Measure_CurrentTest extends PHPUnit_Framework_TestCase
      */
     public function testCurrentNoEquality()
     {
-        $value = new Zend_Measure_Current('string -100.100,200',Zend_Measure_Current::STANDARD,'de');
-        $newvalue = new Zend_Measure_Current('otherstring -100,200',Zend_Measure_Current::STANDARD,'de');
+        $value = new Zend_Measure_Current('-100.100,200',Zend_Measure_Current::STANDARD,'de');
+        $newvalue = new Zend_Measure_Current('-100,200',Zend_Measure_Current::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Current Object should be not equal');
     }
 
@@ -238,8 +238,8 @@ class Zend_Measure_CurrentTest extends PHPUnit_Framework_TestCase
      */
     public function testCurrentSetString()
     {
-        $value = new Zend_Measure_Current('string -100.100,200',Zend_Measure_Current::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Current::STANDARD,'de');
+        $value = new Zend_Measure_Current('-100.100,200',Zend_Measure_Current::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Current::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Current Object not returned');
     }
 
@@ -252,7 +252,7 @@ class Zend_Measure_CurrentTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Current('100',Zend_Measure_Current::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Current::UNKNOWN','de');
+            $value->setValue('-200.200,200','Current::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/DensityTest.php

@@ -155,7 +155,7 @@ class Zend_Measure_DensityTest extends PHPUnit_Framework_TestCase
      */
     public function testDensityValueString()
     {
-        $value = new Zend_Measure_Density('string -100.100,200',Zend_Measure_Density::STANDARD,'de');
+        $value = new Zend_Measure_Density('-100.100,200',Zend_Measure_Density::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Density Object not returned');
     }
 
@@ -166,8 +166,8 @@ class Zend_Measure_DensityTest extends PHPUnit_Framework_TestCase
      */
     public function testDensityEquality()
     {
-        $value = new Zend_Measure_Density('string -100.100,200',Zend_Measure_Density::STANDARD,'de');
-        $newvalue = new Zend_Measure_Density('otherstring -100.100,200',Zend_Measure_Density::STANDARD,'de');
+        $value = new Zend_Measure_Density('-100.100,200',Zend_Measure_Density::STANDARD,'de');
+        $newvalue = new Zend_Measure_Density('-100.100,200',Zend_Measure_Density::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Density Object should be equal');
     }
 
@@ -178,8 +178,8 @@ class Zend_Measure_DensityTest extends PHPUnit_Framework_TestCase
      */
     public function testDensityNoEquality()
     {
-        $value = new Zend_Measure_Density('string -100.100,200',Zend_Measure_Density::STANDARD,'de');
-        $newvalue = new Zend_Measure_Density('otherstring -100,200',Zend_Measure_Density::STANDARD,'de');
+        $value = new Zend_Measure_Density('-100.100,200',Zend_Measure_Density::STANDARD,'de');
+        $newvalue = new Zend_Measure_Density('-100,200',Zend_Measure_Density::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Density Object should be not equal');
     }
 
@@ -238,8 +238,8 @@ class Zend_Measure_DensityTest extends PHPUnit_Framework_TestCase
      */
     public function testDensitySetString()
     {
-        $value = new Zend_Measure_Density('string -100.100,200',Zend_Measure_Density::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Density::STANDARD,'de');
+        $value = new Zend_Measure_Density('-100.100,200',Zend_Measure_Density::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Density::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Density Object not returned');
     }
 
@@ -252,7 +252,7 @@ class Zend_Measure_DensityTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Density('100',Zend_Measure_Density::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Density::UNKNOWN','de');
+            $value->setValue('-200.200,200','Density::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/EnergyTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_EnergyTest extends PHPUnit_Framework_TestCase
      */
     public function testEnergyValueString()
     {
-        $value = new Zend_Measure_Energy('string -100.100,200',Zend_Measure_Energy::STANDARD,'de');
+        $value = new Zend_Measure_Energy('-100.100,200',Zend_Measure_Energy::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Energy Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_EnergyTest extends PHPUnit_Framework_TestCase
      */
     public function testEnergyEquality()
     {
-        $value = new Zend_Measure_Energy('string -100.100,200',Zend_Measure_Energy::STANDARD,'de');
-        $newvalue = new Zend_Measure_Energy('otherstring -100.100,200',Zend_Measure_Energy::STANDARD,'de');
+        $value = new Zend_Measure_Energy('-100.100,200',Zend_Measure_Energy::STANDARD,'de');
+        $newvalue = new Zend_Measure_Energy('-100.100,200',Zend_Measure_Energy::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Energy Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_EnergyTest extends PHPUnit_Framework_TestCase
      */
     public function testEnergyNoEquality()
     {
-        $value = new Zend_Measure_Energy('string -100.100,200',Zend_Measure_Energy::STANDARD,'de');
-        $newvalue = new Zend_Measure_Energy('otherstring -100,200',Zend_Measure_Energy::STANDARD,'de');
+        $value = new Zend_Measure_Energy('-100.100,200',Zend_Measure_Energy::STANDARD,'de');
+        $newvalue = new Zend_Measure_Energy('-100,200',Zend_Measure_Energy::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Energy Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_EnergyTest extends PHPUnit_Framework_TestCase
      */
     public function testEnergySetString()
     {
-        $value = new Zend_Measure_Energy('string -100.100,200',Zend_Measure_Energy::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Energy::STANDARD,'de');
+        $value = new Zend_Measure_Energy('-100.100,200',Zend_Measure_Energy::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Energy::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Energy Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_EnergyTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Energy('100',Zend_Measure_Energy::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Energy::UNKNOWN','de');
+            $value->setValue('-200.200,200','Energy::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Flow/MassTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Flow_MassTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MassValueString()
     {
-        $value = new Zend_Measure_Flow_Mass('string -100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mass('-100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Flow_Mass Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Flow_MassTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MassEquality()
     {
-        $value = new Zend_Measure_Flow_Mass('string -100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Mass('otherstring -100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mass('-100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Mass('-100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Flow_Mass Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Flow_MassTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MassNoEquality()
     {
-        $value = new Zend_Measure_Flow_Mass('string -100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Mass('otherstring -100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mass('-100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Mass('-100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Flow_Mass Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Flow_MassTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MassSetString()
     {
-        $value = new Zend_Measure_Flow_Mass('string -100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mass('-100.100,200',Zend_Measure_Flow_Mass::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Flow_Mass::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Flow_Mass Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Flow_MassTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Flow_Mass('100',Zend_Measure_Flow_Mass::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Flow_Mass::UNKNOWN','de');
+            $value->setValue('-200.200,200','Flow_Mass::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Flow/MoleTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Flow_MoleTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MoleValueString()
     {
-        $value = new Zend_Measure_Flow_Mole('string -100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mole('-100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Flow_Mole Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Flow_MoleTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MoleEquality()
     {
-        $value = new Zend_Measure_Flow_Mole('string -100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Mole('otherstring -100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mole('-100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Mole('-100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Flow_Mole Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Flow_MoleTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MoleNoEquality()
     {
-        $value = new Zend_Measure_Flow_Mole('string -100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Mole('otherstring -100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mole('-100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Mole('-100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Flow_Mole Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Flow_MoleTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_MoleSetString()
     {
-        $value = new Zend_Measure_Flow_Mole('string -100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Mole('-100.100,200',Zend_Measure_Flow_Mole::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Flow_Mole::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Flow_Mole Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Flow_MoleTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Flow_Mole('100',Zend_Measure_Flow_Mole::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Flow_Mole::UNKNOWN','de');
+            $value->setValue('-200.200,200','Flow_Mole::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Flow/VolumeTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Flow_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_VolumeValueString()
     {
-        $value = new Zend_Measure_Flow_Volume('string -100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Volume('-100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Flow_Volume Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Flow_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_VolumeEquality()
     {
-        $value = new Zend_Measure_Flow_Volume('string -100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Volume('otherstring -100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Volume('-100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Volume('-100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Flow_Volume Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Flow_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_VolumeNoEquality()
     {
-        $value = new Zend_Measure_Flow_Volume('string -100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Flow_Volume('otherstring -100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Volume('-100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Flow_Volume('-100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Flow_Volume Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Flow_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testFlow_VolumeSetString()
     {
-        $value = new Zend_Measure_Flow_Volume('string -100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Flow_Volume('-100.100,200',Zend_Measure_Flow_Volume::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Flow_Volume::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Flow_Volume Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Flow_VolumeTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Flow_Volume('100',Zend_Measure_Flow_Volume::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Flow_Volume::UNKNOWN','de');
+            $value->setValue('-200.200,200','Flow_Volume::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/ForceTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_ForceTest extends PHPUnit_Framework_TestCase
      */
     public function testForceValueString()
     {
-        $value = new Zend_Measure_Force('string -100.100,200',Zend_Measure_Force::STANDARD,'de');
+        $value = new Zend_Measure_Force('-100.100,200',Zend_Measure_Force::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Force Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_ForceTest extends PHPUnit_Framework_TestCase
      */
     public function testForceEquality()
     {
-        $value = new Zend_Measure_Force('string -100.100,200',Zend_Measure_Force::STANDARD,'de');
-        $newvalue = new Zend_Measure_Force('otherstring -100.100,200',Zend_Measure_Force::STANDARD,'de');
+        $value = new Zend_Measure_Force('-100.100,200',Zend_Measure_Force::STANDARD,'de');
+        $newvalue = new Zend_Measure_Force('-100.100,200',Zend_Measure_Force::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Force Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_ForceTest extends PHPUnit_Framework_TestCase
      */
     public function testForceNoEquality()
     {
-        $value = new Zend_Measure_Force('string -100.100,200',Zend_Measure_Force::STANDARD,'de');
-        $newvalue = new Zend_Measure_Force('otherstring -100,200',Zend_Measure_Force::STANDARD,'de');
+        $value = new Zend_Measure_Force('-100.100,200',Zend_Measure_Force::STANDARD,'de');
+        $newvalue = new Zend_Measure_Force('-100,200',Zend_Measure_Force::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Force Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_ForceTest extends PHPUnit_Framework_TestCase
      */
     public function testForceSetString()
     {
-        $value = new Zend_Measure_Force('string -100.100,200',Zend_Measure_Force::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Force::STANDARD,'de');
+        $value = new Zend_Measure_Force('-100.100,200',Zend_Measure_Force::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Force::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Force Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_ForceTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Force('100',Zend_Measure_Force::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Force::UNKNOWN','de');
+            $value->setValue('-200.200,200','Force::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/FrequencyTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_FrequencyTest extends PHPUnit_Framework_TestCase
      */
     public function testFrequencyValueString()
     {
-        $value = new Zend_Measure_Frequency('string -100.100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $value = new Zend_Measure_Frequency('-100.100,200',Zend_Measure_Frequency::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Frequency Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_FrequencyTest extends PHPUnit_Framework_TestCase
      */
     public function testFrequencyEquality()
     {
-        $value = new Zend_Measure_Frequency('string -100.100,200',Zend_Measure_Frequency::STANDARD,'de');
-        $newvalue = new Zend_Measure_Frequency('otherstring -100.100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $value = new Zend_Measure_Frequency('-100.100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $newvalue = new Zend_Measure_Frequency('-100.100,200',Zend_Measure_Frequency::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Frequency Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_FrequencyTest extends PHPUnit_Framework_TestCase
      */
     public function testFrequencyNoEquality()
     {
-        $value = new Zend_Measure_Frequency('string -100.100,200',Zend_Measure_Frequency::STANDARD,'de');
-        $newvalue = new Zend_Measure_Frequency('otherstring -100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $value = new Zend_Measure_Frequency('-100.100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $newvalue = new Zend_Measure_Frequency('-100,200',Zend_Measure_Frequency::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Frequency Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_FrequencyTest extends PHPUnit_Framework_TestCase
      */
     public function testFrequencySetString()
     {
-        $value = new Zend_Measure_Frequency('string -100.100,200',Zend_Measure_Frequency::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Frequency::STANDARD,'de');
+        $value = new Zend_Measure_Frequency('-100.100,200',Zend_Measure_Frequency::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Frequency::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Frequency Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_FrequencyTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Frequency('100',Zend_Measure_Frequency::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Frequency::UNKNOWN','de');
+            $value->setValue('-200.200,200','Frequency::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/IlluminationTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_IlluminationTest extends PHPUnit_Framework_TestCase
      */
     public function testIlluminationValueString()
     {
-        $value = new Zend_Measure_Illumination('string -100.100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $value = new Zend_Measure_Illumination('-100.100,200',Zend_Measure_Illumination::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_v Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_IlluminationTest extends PHPUnit_Framework_TestCase
      */
     public function testIlluminationEquality()
     {
-        $value = new Zend_Measure_Illumination('string -100.100,200',Zend_Measure_Illumination::STANDARD,'de');
-        $newvalue = new Zend_Measure_Illumination('otherstring -100.100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $value = new Zend_Measure_Illumination('-100.100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $newvalue = new Zend_Measure_Illumination('-100.100,200',Zend_Measure_Illumination::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Illumination Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_IlluminationTest extends PHPUnit_Framework_TestCase
      */
     public function testIlluminationNoEquality()
     {
-        $value = new Zend_Measure_Illumination('string -100.100,200',Zend_Measure_Illumination::STANDARD,'de');
-        $newvalue = new Zend_Measure_Illumination('otherstring -100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $value = new Zend_Measure_Illumination('-100.100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $newvalue = new Zend_Measure_Illumination('-100,200',Zend_Measure_Illumination::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Illumination Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_IlluminationTest extends PHPUnit_Framework_TestCase
      */
     public function testIlluminationSetString()
     {
-        $value = new Zend_Measure_Illumination('string -100.100,200',Zend_Measure_Illumination::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Illumination::STANDARD,'de');
+        $value = new Zend_Measure_Illumination('-100.100,200',Zend_Measure_Illumination::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Illumination::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Illumination Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_IlluminationTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Illumination('100',Zend_Measure_Illumination::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Illumination::UNKNOWN','de');
+            $value->setValue('-200.200,200','Illumination::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/LengthTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_LengthTest extends PHPUnit_Framework_TestCase
      */
     public function testLengthValueString()
     {
-        $value = new Zend_Measure_Length('string -100.100,200',Zend_Measure_Length::STANDARD,'de');
+        $value = new Zend_Measure_Length('-100.100,200',Zend_Measure_Length::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Length Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_LengthTest extends PHPUnit_Framework_TestCase
      */
     public function testLengthEquality()
     {
-        $value = new Zend_Measure_Length('string -100.100,200',Zend_Measure_Length::STANDARD,'de');
-        $newvalue = new Zend_Measure_Length('otherstring -100.100,200',Zend_Measure_Length::STANDARD,'de');
+        $value = new Zend_Measure_Length('-100.100,200',Zend_Measure_Length::STANDARD,'de');
+        $newvalue = new Zend_Measure_Length('-100.100,200',Zend_Measure_Length::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Length Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_LengthTest extends PHPUnit_Framework_TestCase
      */
     public function testLengthNoEquality()
     {
-        $value = new Zend_Measure_Length('string -100.100,200',Zend_Measure_Length::STANDARD,'de');
-        $newvalue = new Zend_Measure_Length('otherstring -100,200',Zend_Measure_Length::STANDARD,'de');
+        $value = new Zend_Measure_Length('-100.100,200',Zend_Measure_Length::STANDARD,'de');
+        $newvalue = new Zend_Measure_Length('-100,200',Zend_Measure_Length::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Length Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_LengthTest extends PHPUnit_Framework_TestCase
      */
     public function testLengthSetString()
     {
-        $value = new Zend_Measure_Length('string -100.100,200',Zend_Measure_Length::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Length::STANDARD,'de');
+        $value = new Zend_Measure_Length('-100.100,200',Zend_Measure_Length::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Length::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Length Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_LengthTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Length('100',Zend_Measure_Length::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Length::UNKNOWN','de');
+            $value->setValue('-200.200,200','Length::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Exception $e) {
             return true; // Test OK

tests/Zend/Measure/LightnessTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_LightnessTest extends PHPUnit_Framework_TestCase
      */
     public function testLightnessValueString()
     {
-        $value = new Zend_Measure_Lightness('string -100.100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $value = new Zend_Measure_Lightness('-100.100,200',Zend_Measure_Lightness::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Lightness Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_LightnessTest extends PHPUnit_Framework_TestCase
      */
     public function testLightnessEquality()
     {
-        $value = new Zend_Measure_Lightness('string -100.100,200',Zend_Measure_Lightness::STANDARD,'de');
-        $newvalue = new Zend_Measure_Lightness('otherstring -100.100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $value = new Zend_Measure_Lightness('-100.100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $newvalue = new Zend_Measure_Lightness('-100.100,200',Zend_Measure_Lightness::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Lightness Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_LightnessTest extends PHPUnit_Framework_TestCase
      */
     public function testLightnessNoEquality()
     {
-        $value = new Zend_Measure_Lightness('string -100.100,200',Zend_Measure_Lightness::STANDARD,'de');
-        $newvalue = new Zend_Measure_Lightness('otherstring -100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $value = new Zend_Measure_Lightness('-100.100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $newvalue = new Zend_Measure_Lightness('-100,200',Zend_Measure_Lightness::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Lightness Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_LightnessTest extends PHPUnit_Framework_TestCase
      */
     public function testLightnessSetString()
     {
-        $value = new Zend_Measure_Lightness('string -100.100,200',Zend_Measure_Lightness::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Lightness::STANDARD,'de');
+        $value = new Zend_Measure_Lightness('-100.100,200',Zend_Measure_Lightness::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Lightness::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Lightness Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_LightnessTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Lightness('100',Zend_Measure_Lightness::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Lightness::UNKNOWN','de');
+            $value->setValue('-200.200,200','Lightness::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/NumberTest.php

@@ -59,7 +59,7 @@ class Zend_Measure_NumberTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(100, $value->getValue(), 'Zend_Measure_Number value expected to be a decimal value');
         $value = new Zend_Measure_Number('-100.100,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertEquals(100100, $value->getValue(),'Zend_Measure_Number Object not returned');
-        $value = new Zend_Measure_Number('string -100.100,200',Zend_Measure_Number::STANDARD,'de');
+        $value = new Zend_Measure_Number('-100.100,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertEquals(100100, $value->getValue(),'Zend_Measure_Number Object not returned');
 
         try {
@@ -89,12 +89,12 @@ class Zend_Measure_NumberTest extends PHPUnit_Framework_TestCase
      */
     public function testNumberEquality()
     {
-        $value = new Zend_Measure_Number('string -100.100,200',Zend_Measure_Number::STANDARD,'de');
-        $newvalue = new Zend_Measure_Number('otherstring -100.100,200',Zend_Measure_Number::STANDARD,'de');
+        $value = new Zend_Measure_Number('-100.100,200',Zend_Measure_Number::STANDARD,'de');
+        $newvalue = new Zend_Measure_Number('-100.100,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Number Object should be equal');
 
-        $value = new Zend_Measure_Number('string -100.100,200',Zend_Measure_Number::STANDARD,'de');
-        $newvalue = new Zend_Measure_Number('otherstring -100,200',Zend_Measure_Number::STANDARD,'de');
+        $value = new Zend_Measure_Number('-100.100,200',Zend_Measure_Number::STANDARD,'de');
+        $newvalue = new Zend_Measure_Number('-100,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Number Object should be not equal');
     }
 
@@ -114,12 +114,12 @@ class Zend_Measure_NumberTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(200, $value->getValue(), 'Zend_Measure_Number value expected to be a decimal value');
         $value->setValue('-200.200,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertEquals(200200, $value->getValue(),'Zend_Measure_Number Object not returned');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Number::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Number::STANDARD,'de');
         $this->assertEquals(200200, $value->getValue(),'Zend_Measure_Number Object not returned');
 
         try {
             $value = new Zend_Measure_Number('100',Zend_Measure_Number::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Number::UNKNOWN','de');
+            $value->setValue('-200.200,200','Number::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success
@@ -255,6 +255,6 @@ class Zend_Measure_NumberTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('25 ⑽', $value->convertTo(Zend_Measure_Number::DECIMAL));
 
         $value = new Zend_Measure_Number('_X',Zend_Measure_Number::ROMAN, 'en');
-        $this->assertEquals('10000 ⑽', $value->convertTo(Zend_Measure_Number::DECIMAL));
+        $this->assertEquals('10,000 ⑽', $value->convertTo(Zend_Measure_Number::DECIMAL));
     }
 }

tests/Zend/Measure/PowerTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_PowerTest extends PHPUnit_Framework_TestCase
      */
     public function testPowerValueString()
     {
-        $value = new Zend_Measure_Power('string -100.100,200',Zend_Measure_Power::STANDARD,'de');
+        $value = new Zend_Measure_Power('-100.100,200',Zend_Measure_Power::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Power Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_PowerTest extends PHPUnit_Framework_TestCase
      */
     public function testPowerEquality()
     {
-        $value = new Zend_Measure_Power('string -100.100,200',Zend_Measure_Power::STANDARD,'de');
-        $newvalue = new Zend_Measure_Power('otherstring -100.100,200',Zend_Measure_Power::STANDARD,'de');
+        $value = new Zend_Measure_Power('-100.100,200',Zend_Measure_Power::STANDARD,'de');
+        $newvalue = new Zend_Measure_Power('-100.100,200',Zend_Measure_Power::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Power Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_PowerTest extends PHPUnit_Framework_TestCase
      */
     public function testPowerNoEquality()
     {
-        $value = new Zend_Measure_Power('string -100.100,200',Zend_Measure_Power::STANDARD,'de');
-        $newvalue = new Zend_Measure_Power('otherstring -100,200',Zend_Measure_Power::STANDARD,'de');
+        $value = new Zend_Measure_Power('-100.100,200',Zend_Measure_Power::STANDARD,'de');
+        $newvalue = new Zend_Measure_Power('-100,200',Zend_Measure_Power::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Power Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_PowerTest extends PHPUnit_Framework_TestCase
      */
     public function testPowerSetString()
     {
-        $value = new Zend_Measure_Power('string -100.100,200',Zend_Measure_Power::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Power::STANDARD,'de');
+        $value = new Zend_Measure_Power('-100.100,200',Zend_Measure_Power::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Power::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Power Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_PowerTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Power('100',Zend_Measure_Power::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Power::UNKNOWN','de');
+            $value->setValue('-200.200,200','Power::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/PressureTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_PressureTest extends PHPUnit_Framework_TestCase
      */
     public function testPressureValueString()
     {
-        $value = new Zend_Measure_Pressure('string -100.100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $value = new Zend_Measure_Pressure('-100.100,200',Zend_Measure_Pressure::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Pressure Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_PressureTest extends PHPUnit_Framework_TestCase
      */
     public function testPressureEquality()
     {
-        $value = new Zend_Measure_Pressure('string -100.100,200',Zend_Measure_Pressure::STANDARD,'de');
-        $newvalue = new Zend_Measure_Pressure('otherstring -100.100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $value = new Zend_Measure_Pressure('-100.100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $newvalue = new Zend_Measure_Pressure('-100.100,200',Zend_Measure_Pressure::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Pressure Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_PressureTest extends PHPUnit_Framework_TestCase
      */
     public function testPressureNoEquality()
     {
-        $value = new Zend_Measure_Pressure('string -100.100,200',Zend_Measure_Pressure::STANDARD,'de');
-        $newvalue = new Zend_Measure_Pressure('otherstring -100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $value = new Zend_Measure_Pressure('-100.100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $newvalue = new Zend_Measure_Pressure('-100,200',Zend_Measure_Pressure::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Pressure Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_PressureTest extends PHPUnit_Framework_TestCase
      */
     public function testPressureSetString()
     {
-        $value = new Zend_Measure_Pressure('string -100.100,200',Zend_Measure_Pressure::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Pressure::STANDARD,'de');
+        $value = new Zend_Measure_Pressure('-100.100,200',Zend_Measure_Pressure::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Pressure::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Pressure Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_PressureTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Pressure('100',Zend_Measure_Pressure::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Pressure::UNKNOWN','de');
+            $value->setValue('-200.200,200','Pressure::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/SpeedTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_SpeedTest extends PHPUnit_Framework_TestCase
      */
     public function testSpeedValueString()
     {
-        $value = new Zend_Measure_Speed('string -100.100,200',Zend_Measure_Speed::STANDARD,'de');
+        $value = new Zend_Measure_Speed('-100.100,200',Zend_Measure_Speed::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Speed Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_SpeedTest extends PHPUnit_Framework_TestCase
      */
     public function testSpeedEquality()
     {
-        $value = new Zend_Measure_Speed('string -100.100,200',Zend_Measure_Speed::STANDARD,'de');
-        $newvalue = new Zend_Measure_Speed('otherstring -100.100,200',Zend_Measure_Speed::STANDARD,'de');
+        $value = new Zend_Measure_Speed('-100.100,200',Zend_Measure_Speed::STANDARD,'de');
+        $newvalue = new Zend_Measure_Speed('-100.100,200',Zend_Measure_Speed::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Speed Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_SpeedTest extends PHPUnit_Framework_TestCase
      */
     public function testSpeedNoEquality()
     {
-        $value = new Zend_Measure_Speed('string -100.100,200',Zend_Measure_Speed::STANDARD,'de');
-        $newvalue = new Zend_Measure_Speed('otherstring -100,200',Zend_Measure_Speed::STANDARD,'de');
+        $value = new Zend_Measure_Speed('-100.100,200',Zend_Measure_Speed::STANDARD,'de');
+        $newvalue = new Zend_Measure_Speed('-100,200',Zend_Measure_Speed::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Speed Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_SpeedTest extends PHPUnit_Framework_TestCase
      */
     public function testSpeedSetString()
     {
-        $value = new Zend_Measure_Speed('string -100.100,200',Zend_Measure_Speed::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Speed::STANDARD,'de');
+        $value = new Zend_Measure_Speed('-100.100,200',Zend_Measure_Speed::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Speed::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Speed Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_SpeedTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Speed('100',Zend_Measure_Speed::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Speed::UNKNOWN','de');
+            $value->setValue('-200.200,200','Speed::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/TemperatureTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
      */
     public function testTemperatureValueString()
     {
-        $value = new Zend_Measure_Temperature('string -100.100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $value = new Zend_Measure_Temperature('-100.100,200',Zend_Measure_Temperature::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Temperature Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
      */
     public function testTemperatureEquality()
     {
-        $value = new Zend_Measure_Temperature('string -100.100,200',Zend_Measure_Temperature::STANDARD,'de');
-        $newvalue = new Zend_Measure_Temperature('otherstring -100.100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $value = new Zend_Measure_Temperature('-100.100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $newvalue = new Zend_Measure_Temperature('-100.100,200',Zend_Measure_Temperature::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Temperature Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
      */
     public function testTemperatureNoEquality()
     {
-        $value = new Zend_Measure_Temperature('string -100.100,200',Zend_Measure_Temperature::STANDARD,'de');
-        $newvalue = new Zend_Measure_Temperature('otherstring -100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $value = new Zend_Measure_Temperature('-100.100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $newvalue = new Zend_Measure_Temperature('-100,200',Zend_Measure_Temperature::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Temperature Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
      */
     public function testTemperatureSetString()
     {
-        $value = new Zend_Measure_Temperature('string -100.100,200',Zend_Measure_Temperature::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Temperature::STANDARD,'de');
+        $value = new Zend_Measure_Temperature('-100.100,200',Zend_Measure_Temperature::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Temperature::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Temperature Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Temperature('100',Zend_Measure_Temperature::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Temperature::UNKNOWN','de');
+            $value->setValue('-200.200,200','Temperature::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success
@@ -397,10 +397,10 @@ class Zend_Measure_TemperatureTest extends PHPUnit_Framework_TestCase
      */
     public function testDetailConversion()
     {
-        $unit= new Zend_Measure_Temperature(100, Zend_Measure_Temperature::KELVIN);
-        $this->assertSame('-279.67 °F', $unit->convertTo(Zend_Measure_Temperature::FAHRENHEIT));
+        $unit= new Zend_Measure_Temperature(100, Zend_Measure_Temperature::KELVIN, 'de');
+        $this->assertSame('-280,0 °F', $unit->convertTo(Zend_Measure_Temperature::FAHRENHEIT));
 
-        $unit= new Zend_Measure_Temperature(100, Zend_Measure_Temperature::FAHRENHEIT);
-        $this->assertSame('310.93 °K', $unit->convertTo(Zend_Measure_Temperature::KELVIN));
+        $unit= new Zend_Measure_Temperature(100, Zend_Measure_Temperature::FAHRENHEIT, 'de');
+        $this->assertSame('311,0 °K', $unit->convertTo(Zend_Measure_Temperature::KELVIN));
     }
 }

tests/Zend/Measure/TimeTest.php

@@ -149,7 +149,7 @@ class Zend_Measure_TimeTest extends PHPUnit_Framework_TestCase
      */
     public function testTimeValueString()
     {
-        $value = new Zend_Measure_Time('string -100.100,200',Zend_Measure_Time::STANDARD,'de');
+        $value = new Zend_Measure_Time('-100.100,200',Zend_Measure_Time::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Time Object not returned');
     }
 
@@ -160,8 +160,8 @@ class Zend_Measure_TimeTest extends PHPUnit_Framework_TestCase
      */
     public function testTimeEquality()
     {
-        $value = new Zend_Measure_Time('string -100.100,200',Zend_Measure_Time::STANDARD,'de');
-        $newvalue = new Zend_Measure_Time('otherstring -100.100,200',Zend_Measure_Time::STANDARD,'de');
+        $value = new Zend_Measure_Time('-100.100,200',Zend_Measure_Time::STANDARD,'de');
+        $newvalue = new Zend_Measure_Time('-100.100,200',Zend_Measure_Time::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Time Object should be equal');
     }
 
@@ -172,8 +172,8 @@ class Zend_Measure_TimeTest extends PHPUnit_Framework_TestCase
      */
     public function testTimeNoEquality()
     {
-        $value = new Zend_Measure_Time('string -100.100,200',Zend_Measure_Time::STANDARD,'de');
-        $newvalue = new Zend_Measure_Time('otherstring -100,200',Zend_Measure_Time::STANDARD,'de');
+        $value = new Zend_Measure_Time('-100.100,200',Zend_Measure_Time::STANDARD,'de');
+        $newvalue = new Zend_Measure_Time('-100,200',Zend_Measure_Time::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Time Object should be not equal');
     }
 
@@ -232,8 +232,8 @@ class Zend_Measure_TimeTest extends PHPUnit_Framework_TestCase
      */
     public function testTimeSetString()
     {
-        $value = new Zend_Measure_Time('string -100.100,200',Zend_Measure_Time::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Time::STANDARD,'de');
+        $value = new Zend_Measure_Time('-100.100,200',Zend_Measure_Time::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Time::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Time Object not returned');
     }
 
@@ -246,7 +246,7 @@ class Zend_Measure_TimeTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Time('100',Zend_Measure_Time::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Time::UNKNOWN','de');
+            $value->setValue('-200.200,200','Time::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Exception $e) {
             return true; // Test OK

tests/Zend/Measure/TorqueTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_TorqueTest extends PHPUnit_Framework_TestCase
      */
     public function testTorqueValueString()
     {
-        $value = new Zend_Measure_Torque('string -100.100,200',Zend_Measure_Torque::STANDARD,'de');
+        $value = new Zend_Measure_Torque('-100.100,200',Zend_Measure_Torque::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Torque Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_TorqueTest extends PHPUnit_Framework_TestCase
      */
     public function testTorqueEquality()
     {
-        $value = new Zend_Measure_Torque('string -100.100,200',Zend_Measure_Torque::STANDARD,'de');
-        $newvalue = new Zend_Measure_Torque('otherstring -100.100,200',Zend_Measure_Torque::STANDARD,'de');
+        $value = new Zend_Measure_Torque('-100.100,200',Zend_Measure_Torque::STANDARD,'de');
+        $newvalue = new Zend_Measure_Torque('-100.100,200',Zend_Measure_Torque::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Torque Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_TorqueTest extends PHPUnit_Framework_TestCase
      */
     public function testTorqueNoEquality()
     {
-        $value = new Zend_Measure_Torque('string -100.100,200',Zend_Measure_Torque::STANDARD,'de');
-        $newvalue = new Zend_Measure_Torque('otherstring -100,200',Zend_Measure_Torque::STANDARD,'de');
+        $value = new Zend_Measure_Torque('-100.100,200',Zend_Measure_Torque::STANDARD,'de');
+        $newvalue = new Zend_Measure_Torque('-100,200',Zend_Measure_Torque::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Torque Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_TorqueTest extends PHPUnit_Framework_TestCase
      */
     public function testTorqueSetString()
     {
-        $value = new Zend_Measure_Torque('string -100.100,200',Zend_Measure_Torque::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Torque::STANDARD,'de');
+        $value = new Zend_Measure_Torque('-100.100,200',Zend_Measure_Torque::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Torque::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Torque Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_TorqueTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Torque('100',Zend_Measure_Torque::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Torque::UNKNOWN','de');
+            $value->setValue('-200.200,200','Torque::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Viscosity/DynamicTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Viscosity_DynamicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_DynamicValueString()
     {
-        $value = new Zend_Measure_Viscosity_Dynamic('string -100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Dynamic('-100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Viscosity_Dynamic Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Viscosity_DynamicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_DynamicEquality()
     {
-        $value = new Zend_Measure_Viscosity_Dynamic('string -100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
-        $newvalue = new Zend_Measure_Viscosity_Dynamic('otherstring -100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Dynamic('-100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $newvalue = new Zend_Measure_Viscosity_Dynamic('-100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Viscosity_Dynamic Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Viscosity_DynamicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_DynamicNoEquality()
     {
-        $value = new Zend_Measure_Viscosity_Dynamic('string -100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
-        $newvalue = new Zend_Measure_Viscosity_Dynamic('otherstring -100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Dynamic('-100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $newvalue = new Zend_Measure_Viscosity_Dynamic('-100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Viscosity_Dynamic Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Viscosity_DynamicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_DynamicSetString()
     {
-        $value = new Zend_Measure_Viscosity_Dynamic('string -100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Dynamic('-100.100,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Viscosity_Dynamic Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Viscosity_DynamicTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Viscosity_Dynamic('100',Zend_Measure_Viscosity_Dynamic::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Viscosity_Dynamic::UNKNOWN','de');
+            $value->setValue('-200.200,200','Viscosity_Dynamic::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/Viscosity/KinematicTest.php

@@ -139,7 +139,7 @@ class Zend_Measure_Viscosity_KinematicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_KinematicValueString()
     {
-        $value = new Zend_Measure_Viscosity_Kinematic('string -100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Kinematic('-100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Viscosity_Kinematic Object not returned');
     }
 
@@ -150,8 +150,8 @@ class Zend_Measure_Viscosity_KinematicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_KinematicEquality()
     {
-        $value = new Zend_Measure_Viscosity_Kinematic('string -100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
-        $newvalue = new Zend_Measure_Viscosity_Kinematic('otherstring -100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Kinematic('-100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $newvalue = new Zend_Measure_Viscosity_Kinematic('-100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Viscosity_Kinematic Object should be equal');
     }
 
@@ -162,8 +162,8 @@ class Zend_Measure_Viscosity_KinematicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_KinematicNoEquality()
     {
-        $value = new Zend_Measure_Viscosity_Kinematic('string -100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
-        $newvalue = new Zend_Measure_Viscosity_Kinematic('otherstring -100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Kinematic('-100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $newvalue = new Zend_Measure_Viscosity_Kinematic('-100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Viscosity_Kinematic Object should be not equal');
     }
 
@@ -222,8 +222,8 @@ class Zend_Measure_Viscosity_KinematicTest extends PHPUnit_Framework_TestCase
      */
     public function testViscosity_KinematicSetString()
     {
-        $value = new Zend_Measure_Viscosity_Kinematic('string -100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $value = new Zend_Measure_Viscosity_Kinematic('-100.100,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Viscosity_Kinematic Object not returned');
     }
 
@@ -236,7 +236,7 @@ class Zend_Measure_Viscosity_KinematicTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Viscosity_Kinematic('100',Zend_Measure_Viscosity_Kinematic::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Viscosity_Kinematic::UNKNOWN','de');
+            $value->setValue('-200.200,200','Viscosity_Kinematic::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/VolumeTest.php

@@ -162,7 +162,7 @@ class Zend_Measure_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testVolumeValueString()
     {
-        $value = new Zend_Measure_Volume('string -100.100,200',Zend_Measure_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Volume('-100.100,200',Zend_Measure_Volume::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Volume Object not returned');
     }
 
@@ -173,8 +173,8 @@ class Zend_Measure_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testVolumeEquality()
     {
-        $value = new Zend_Measure_Volume('string -100.100,200',Zend_Measure_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Volume('otherstring -100.100,200',Zend_Measure_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Volume('-100.100,200',Zend_Measure_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Volume('-100.100,200',Zend_Measure_Volume::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Volume Object should be equal');
     }
 
@@ -185,8 +185,8 @@ class Zend_Measure_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testVolumeNoEquality()
     {
-        $value = new Zend_Measure_Volume('string -100.100,200',Zend_Measure_Volume::STANDARD,'de');
-        $newvalue = new Zend_Measure_Volume('otherstring -100,200',Zend_Measure_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Volume('-100.100,200',Zend_Measure_Volume::STANDARD,'de');
+        $newvalue = new Zend_Measure_Volume('-100,200',Zend_Measure_Volume::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Volume Object should be not equal');
     }
 
@@ -245,8 +245,8 @@ class Zend_Measure_VolumeTest extends PHPUnit_Framework_TestCase
      */
     public function testVolumeSetString()
     {
-        $value = new Zend_Measure_Volume('string -100.100,200',Zend_Measure_Volume::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Volume::STANDARD,'de');
+        $value = new Zend_Measure_Volume('-100.100,200',Zend_Measure_Volume::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Volume::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Volume Object not returned');
     }
 
@@ -259,7 +259,7 @@ class Zend_Measure_VolumeTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Volume('100',Zend_Measure_Volume::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Volume::UNKNOWN','de');
+            $value->setValue('-200.200,200','Volume::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success

tests/Zend/Measure/WeightTest.php

@@ -156,7 +156,7 @@ class Zend_Measure_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testWeightValueString()
     {
-        $value = new Zend_Measure_Weight('string -100.100,200',Zend_Measure_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Weight('-100.100,200',Zend_Measure_Weight::STANDARD,'de');
         $this->assertEquals(-100100.200, $value->getValue(),'Zend_Measure_Weight Object not returned');
     }
 
@@ -167,8 +167,8 @@ class Zend_Measure_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testWeightEquality()
     {
-        $value = new Zend_Measure_Weight('string -100.100,200',Zend_Measure_Weight::STANDARD,'de');
-        $newvalue = new Zend_Measure_Weight('otherstring -100.100,200',Zend_Measure_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Weight('-100.100,200',Zend_Measure_Weight::STANDARD,'de');
+        $newvalue = new Zend_Measure_Weight('-100.100,200',Zend_Measure_Weight::STANDARD,'de');
         $this->assertTrue($value->equals($newvalue),'Zend_Measure_Weight Object should be equal');
     }
 
@@ -179,8 +179,8 @@ class Zend_Measure_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testWeightNoEquality()
     {
-        $value = new Zend_Measure_Weight('string -100.100,200',Zend_Measure_Weight::STANDARD,'de');
-        $newvalue = new Zend_Measure_Weight('otherstring -100,200',Zend_Measure_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Weight('-100.100,200',Zend_Measure_Weight::STANDARD,'de');
+        $newvalue = new Zend_Measure_Weight('-100,200',Zend_Measure_Weight::STANDARD,'de');
         $this->assertFalse($value->equals($newvalue),'Zend_Measure_Weight Object should be not equal');
     }
 
@@ -239,8 +239,8 @@ class Zend_Measure_WeightTest extends PHPUnit_Framework_TestCase
      */
     public function testWeightSetString()
     {
-        $value = new Zend_Measure_Weight('string -100.100,200',Zend_Measure_Weight::STANDARD,'de');
-        $value->setValue('otherstring -200.200,200',Zend_Measure_Weight::STANDARD,'de');
+        $value = new Zend_Measure_Weight('-100.100,200',Zend_Measure_Weight::STANDARD,'de');
+        $value->setValue('-200.200,200',Zend_Measure_Weight::STANDARD,'de');
         $this->assertEquals(-200200.200, $value->getValue(),'Zend_Measure_Weight Object not returned');
     }
 
@@ -253,7 +253,7 @@ class Zend_Measure_WeightTest extends PHPUnit_Framework_TestCase
     {
         try {
             $value = new Zend_Measure_Weight('100',Zend_Measure_Weight::STANDARD,'de');
-            $value->setValue('otherstring -200.200,200','Weight::UNKNOWN','de');
+            $value->setValue('-200.200,200','Weight::UNKNOWN','de');
             $this->fail('Exception expected because of unknown type');
         } catch (Zend_Measure_Exception $e) {
             // success