updating billing test

have to refactor the Method names

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
index dfede00..ad394a7 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
@@ -33,8 +33,8 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);
-        
-        $this->object = new Toolkit_Members_Billing_Billing;
+
+        $this->object = new Toolkit_Members_Billing_Billing();
     }
 
     protected function getDatabaseTester()
@@ -145,12 +145,11 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
         $ret = $this->object->setMember_id(12);
         $this->assertInstanceOf('Toolkit_Members_Billing_Billing', $ret);
     }
-    
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetBadMember_id() {
-        $ret = $this->object->setMember_id('hhh');
+
+    public function testSetBadMemberId() {
+
+        $this->setExpectedException('InvalidArgumentException');
+        $this->object->setMemberId('hhh');
     }
 
     /**
@@ -169,13 +168,11 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
         $this->assertInstanceOf('Toolkit_Members_Billing_Billing', $ret);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testExceptionFromBadSetBillingType()
     {
-        $ret = $this->object->setBilling_type(null);
-        $ret = $this->object->setBilling_type(9);
+        $this->setExpectedException('InvalidArgumentException');
+        $this->object->setBillingType(null);
+        $this->object->setBillingType(9);
     }
 
     /**
@@ -183,7 +180,7 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
      */
     public function testExceptionFromBadSetBillingTypeNumber()
     {
-        $ret = $this->object->setBilling_type(9);
+        $ret = $this->object->setBillingType(9);
     }
 
     /**
@@ -191,14 +188,14 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
      */
     public function testExceptionFromBadSetPaymentMethod()
     {
-        $ret = $this->object->setPayment_method('nen');
+        $ret = $this->object->setPaymentMethod('nen');
     }
 
     public function testInsertBilling()
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();
-        
+
         $stub = $this->getMock(
             'Toolkit_Members_Billing_Billing',
             array('insert')
@@ -206,7 +203,7 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
         $stub->expects($this->once())
             ->method('insert');
         $stub->insert($this->pdo);
-        
+
 //        $ret = Toolkit_Members_Billing_Factory::createDbObjectByValues(
 //            'Toolkit_Members_Billing_Billing',
 //            array(
@@ -227,7 +224,7 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
 //        );
 //        $this->assertInstanceOf('Toolkit_Members_Billing_Billing', $ret);
 //        $ret->save($this->pdo);
-        
+
         $tester->onTearDown();
     }
 
@@ -235,7 +232,7 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();
-        
+
 //        $ret = Toolkit_Members_Billing_Factory::createDbObjectById(
 //            $this->pdo,
 //            'Toolkit_Members_Billing_Billing',
@@ -243,10 +240,10 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
 //        );
 //        $this->assertInstanceOf('Toolkit_Members_Billing_Billing', $ret);
 //        $ret->save($this->pdo);
-        
+
         $stub = $this->getMock('Toolkit_Members_Billing_Billing');
         $stub->update($this->pdo);
-        
+
         $tester->onTearDown();
     }
 }

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
index 922316a..4a975af 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
@@ -34,7 +34,7 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);
-        
+
         $this->object = new Toolkit_Members_Billing_MemberAccount();
     }
     protected function getDatabaseTester()
@@ -60,7 +60,7 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
      * This method is called after a test is executed.
      */
     protected function tearDown() {
-        
+
     }
 
     /**
@@ -102,25 +102,25 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
         $ret = $this->object->setMember_id(1);
         $this->assertInstanceOf('Toolkit_Members_Billing_MemberAccount', $ret);
     }
-    
+
     /**
      * @expectedException InvalidArgumentException
      */
     public function testSetMemberIdBadThrowsException()
     {
         $member_id = 'five';
-        $this->object->setMember_id($member_id);
+        $this->object->setMemberId($member_id);
     }
-    
+
     /**
      * @expectedException InvalidArgumentException
      */
     public function testSetPaymentTypeBadThrowsException()
     {
         $payment_type = 'five';
-        $this->object->setPayment_type($payment_type);
+        $this->object->setPaymentType($payment_type);
     }
-    
+
     /**
      * @expectedException Exception
      */