#34: Add new unit tests and remove unused tests

Adds new unit tests to test a few new areas of the code and removes unit tests that tested the previous logic. Some of these tests are already run on the royal mail library, and have been moved there.

.gitignore

@@ -2643,4 +2643,6 @@ composer.lock
 /var/package/Mage_Ogone_Official-1.14.2.2.xml
 /var/package/Magento_Mobile-1.14.2.2.xml
 /var/package/Phoenix_Moneybookers-1.14.2.2.xml
-/var/session
+/var/session
+/var/cache
+/var/phpunit.cache

app/code/community/Meanbee/Royalmail/Helper/Data.php

@@ -65,6 +65,26 @@ public function _setWeight($data)
         $this->_weight = $data;
     }
 
+    protected function _setCartTotal($value)
+    {
+        $this->_cart_total = $value;
+    }
+
+    public function getCartTotal()
+    {
+        return $this->_cart_total;
+    }
+
+    public function setNegativeWeight($value)
+    {
+        $this->_negative_weight = $value;
+    }
+
+    public function getNegativeWeight()
+    {
+        return $this->_negative_weight;
+    }
+
     // Return the weight in grammes
     public function _getWeight()
     {
@@ -85,24 +105,4 @@ public function _getWeight()
 
         return $weight;
     }
-
-    protected function _setCartTotal($value)
-    {
-        $this->_cart_total = $value;
-    }
-
-    public function getCartTotal()
-    {
-        return $this->_cart_total;
-    }
-
-    public function setNegativeWeight($value)
-    {
-        $this->_negative_weight = $value;
-    }
-
-    public function getNegativeWeight()
-    {
-        return $this->_negative_weight;
-    }
 }

app/code/community/Meanbee/Royalmail/Test/Config/Base.php

@@ -1,5 +1,5 @@
 <?php
-class Meanbee_Royalmail_Test_Config_Base extends EcomDev_PHPUnit_Test_Case_Config {
+class Meanbee_Royalmail_Test_Config_Base extends EcomDev_PHPUnit_Test_Case_Config{
     public function testValidCodepool() {
         $this->assertModuleCodePool('community');
     }

app/code/community/Meanbee/Royalmail/Test/Helper/Data.php

@@ -1,11 +1,47 @@
 <?php
 
-class Meanbee_Royalmail_Test_Helper_Data extends EcomDev_PHPUnit_Test_Case {
+class Meanbee_Royalmail_Test_Helper_Data extends EcomDev_PHPUnit_Test_Case
+{
+
+    private $_dataHelper;
+
+    public function setUp()
+    {
+        $this->_dataHelper = Mage::helper('royalmail');
+    }
+
+    public function tearDown()
+    {
+        $this->_dataHelper = null;
+    }
+
+    /**
+     * @test
+     */
+    public function testGetWeightKg()
+    {
+        $this->_dataHelper->setWeightUnit('kg');
+        $this->_dataHelper->_setWeight(0.02);
+        $this->assertEquals(20.0, Mage::helper('royalmail')->_getWeight());
+    }
+
+    /**
+     * @test
+     */
+    public function testGetWeightG()
+    {
+        $this->_dataHelper->setWeightUnit('g');
+        $this->_dataHelper->_setWeight(0.02);
+        $this->assertEquals(0.02, Mage::helper('royalmail')->_getWeight());
+    }
 
     /**
      * @test
      */
-    public function testGetCountryWorldZone() {
-        $this->assertEquals('wz2', Mage::helper('royalmail')->getWorldZone('TO'));
+    public function testGetWeightlb()
+    {
+        $this->_dataHelper->setWeightUnit('lb');
+        $this->_dataHelper->_setWeight(0.02);
+        $this->assertEquals(9.0718474000000011, Mage::helper('royalmail')->_getWeight());
     }
 }

app/code/community/Meanbee/Royalmail/Test/Model/Parcelsize.php

@@ -0,0 +1,13 @@
+<?php
+class Meanbee_Royalmail_Test_Model_Parcelsize extends Meanbee_Royalmail_Test_Util_Sourcemodel {
+    /** @var Meanbee_Royalmail_Model_Parcelsize */
+    protected $_model = null;
+
+    public function setUp() {
+        $this->_model = Mage::getModel('royalmail/parcelsize');
+    }
+
+    public function tearDown() {
+        $this->_model = null;
+    }
+}

app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail.php

@@ -1,23 +1,26 @@
 <?php
-class Meanbee_Royalmail_Test_Model_Shipping_Carrier_Royalmail extends Meanbee_Royalmail_Test_Model_Shipping_Carrier_Royalmail_Abstract {
+class Meanbee_Royalmail_Test_Model_Shipping_Carrier_Royalmail extends Meanbee_Royalmail_Test_Model_Shipping_Carrier_Royalmail_Abstract{
     /** @var Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail */
-    protected $_model = null;
+    private $_model = null;
+    private $_request;
 
     public function setUp() {
         $this->_model = Mage::getModel('royalmail/shipping_carrier_royalmail');
+        $this->_request = Mage::getModel('shipping/rate_request');
     }
 
     public function tearDown() {
         $this->_model = null;
+        $this->_request = null;
     }
 
+
     public function testGetAllowedMethods() {
         $this->assertTrue(is_array($this->_model->getAllowedMethods()));
     }
 
     public function testGetMethodsSingle() {
-        $this->assertTrue(is_string($this->_model->getMethods('letter')));
-        $this->assertNull($this->_model->getMethods('idontexist'));
+        $this->assertTrue(is_array($this->_model->getMethods()));
     }
 
     /**
@@ -28,4 +31,5 @@ public function testDisableByDefault() {
             100, 1.0, 'GB'
         )));
     }
-}
+
+}