Update all test for running on local machine

Take out implement comment parts and test on local machine

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
index ad394a7..5de338d 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_BillingTest.php
@@ -65,7 +65,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetBilling_type().

      */
     public function testSetBilling_type() {
         $ret = $this->object->setBilling_type(1);
      */
     public function testSetBilling_type() {
         $ret = $this->object->setBilling_type(1);


@@ -73,7 +72,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetPaid().

      */
     public function testSetPaid() {
         $ret = $this->object->setPaid(true);
      */
     public function testSetPaid() {
         $ret = $this->object->setPaid(true);


@@ -81,7 +79,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetPayment_method().

      */
     public function testSetPayment_method() {
         $ret = $this->object->setPayment_method(1);
      */
     public function testSetPayment_method() {
         $ret = $this->object->setPayment_method(1);


@@ -89,7 +86,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetPayment_method().

      */
     public function testSetPayment_method_empty() {
         $ret = $this->object->setPayment_method(null);
      */
     public function testSetPayment_method_empty() {
         $ret = $this->object->setPayment_method(null);


@@ -109,10 +105,10 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
         $this->assertInternalType('float', $ret);
     }
 
         $this->assertInternalType('float', $ret);
     }
 

-    public function testGetBalanceReturnsFloat()
+    public function testGetBalanceReturnsString()

     {
         $ret = $this->object->getBalance();
     {
         $ret = $this->object->getBalance();

-        $this->assertInternalType('float', $ret);
+        $this->assertInternalType('string', $ret);

     }
 
     /**
     }
 
     /**


@@ -137,7 +133,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetMember_id().

      */
     public function testSetMember_id() {
         $ret = $this->object->setMember_id(null);
      */
     public function testSetMember_id() {
         $ret = $this->object->setMember_id(null);


@@ -153,7 +148,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetEmailed().

      */
     public function testSetEmailed() {
         $ret = $this->object->setEmailed(true);
      */
     public function testSetEmailed() {
         $ret = $this->object->setEmailed(true);


@@ -161,7 +155,6 @@ class Toolkit_Members_Billing_BillingTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetPrinted().

      */
     public function testSetPrinted() {
         $ret = $this->object->setPrinted(true);
      */
     public function testSetPrinted() {
         $ret = $this->object->setPrinted(true);

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_InvoicesTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_InvoicesTest.php
index 448fab8..4bc7dba 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_InvoicesTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_InvoicesTest.php
@@ -23,7 +23,7 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
      * This method is called before a test is executed.
      */
     protected function setUp() {
      * This method is called before a test is executed.
      */
     protected function setUp() {

-        
+

         $_GET = $_POST = array();
                $dsn = 'sqlite::memory:';
                $driverOptions = array(
         $_GET = $_POST = array();
                $dsn = 'sqlite::memory:';
                $driverOptions = array(


@@ -35,9 +35,9 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);

-        
+

         $this->object = new Toolkit_Members_Billing_Invoices();
         $this->object = new Toolkit_Members_Billing_Invoices();

-        
+

     }
 
     protected function getDatabaseTester()
     }
 
     protected function getDatabaseTester()


@@ -58,7 +58,7 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
        {
                return new PHPUnit_Extensions_Database_DataSet_FlatXMLDataSet($file);
        }
        {
                return new PHPUnit_Extensions_Database_DataSet_FlatXMLDataSet($file);
        }

-    
+

     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.


@@ -68,7 +68,6 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testCreateInvoices().

      */
     public function testCreateInvoices() {
         $tester = $this->getDatabaseTester();
      */
     public function testCreateInvoices() {
         $tester = $this->getDatabaseTester();


@@ -80,7 +79,6 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetCurrentInvoiceDate().

      */
     public function testGetCurrentInvoiceDate() {
         $day   = 1;
      */
     public function testGetCurrentInvoiceDate() {
         $day   = 1;


@@ -100,7 +98,6 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetNextInvoiceDate().

      */
     public function testGetNextInvoiceDate() {
         $day   = 1;
      */
     public function testGetNextInvoiceDate() {
         $day   = 1;


@@ -123,7 +120,6 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testHasInvoice().

      */
     public function testHasInvoice() {
         $tester = $this->getDatabaseTester();
      */
     public function testHasInvoice() {
         $tester = $this->getDatabaseTester();


@@ -135,7 +131,7 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
         );
         $hasInvoice = ($this->object->hasInvoice($this->pdo, $member));
         $this->assertTrue($hasInvoice);
         );
         $hasInvoice = ($this->object->hasInvoice($this->pdo, $member));
         $this->assertTrue($hasInvoice);

-        
+

         $tester->onTearDown();
     }
 
         $tester->onTearDown();
     }
 


@@ -159,7 +155,7 @@ class Toolkit_Members_Billing_InvoicesTest extends PHPUnit_Framework_TestCase {
             'member_id'    => 2,
             'payment_type' => 1
         );
             'member_id'    => 2,
             'payment_type' => 1
         );

-        
+

         $mockObject = $this->getMock(
             'Toolkit_Members_Billing_Invoices'
         );
         $mockObject = $this->getMock(
             'Toolkit_Members_Billing_Invoices'
         );

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
index 4a975af..b3cf265 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberAccountTest.php
@@ -64,7 +64,6 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetEmail_invoice().

      */
     public function testSetEmail_invoice() {
         $ret = $this->object->setEmail_invoice(true);
      */
     public function testSetEmail_invoice() {
         $ret = $this->object->setEmail_invoice(true);


@@ -72,7 +71,6 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetUsmail_invoice().

      */
     public function testSetUsmail_invoice() {
         $ret = $this->object->setUsmail_invoice(true);
      */
     public function testSetUsmail_invoice() {
         $ret = $this->object->setUsmail_invoice(true);


@@ -80,7 +78,6 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetFax_invoice().

      */
     public function testSetFax_invoice() {
         $ret = $this->object->setFax_invoice(true);
      */
     public function testSetFax_invoice() {
         $ret = $this->object->setFax_invoice(true);


@@ -88,7 +85,6 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetPayment_type().

      */
     public function testSetPayment_type() {
         $ret = $this->object->setPayment_type(1);
      */
     public function testSetPayment_type() {
         $ret = $this->object->setPayment_type(1);


@@ -96,7 +92,6 @@ class Toolkit_Members_Billing_MemberAccountTest extends PHPUnit_Framework_TestCa
     }
 
     /**
     }
 
     /**

-     * @todo Implement testSetMember_id().

      */
     public function testSetMember_id() {
         $ret = $this->object->setMember_id(1);
      */
     public function testSetMember_id() {
         $ret = $this->object->setMember_id(1);

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberListsTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberListsTest.php
index 37c5994..bf02b5e 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberListsTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_MemberListsTest.php
@@ -37,10 +37,10 @@ class Toolkit_Members_Billing_MemberListsTest
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);

-        
+

         $this->object = new Toolkit_Members_Billing_MemberLists($this->pdo);
     }
         $this->object = new Toolkit_Members_Billing_MemberLists($this->pdo);
     }

-    
+

     protected function getDatabaseTester()
        {
         $connection = new PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection($this->pdo, 'demo');
     protected function getDatabaseTester()
        {
         $connection = new PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection($this->pdo, 'demo');


@@ -66,11 +66,10 @@ class Toolkit_Members_Billing_MemberListsTest
      */
     protected function tearDown()
     {
      */
     protected function tearDown()
     {

-        
+

     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetOpenAccounts().

      */
     public function testGetOpenAccounts()
     {
      */
     public function testGetOpenAccounts()
     {


@@ -78,7 +77,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetAccountsByAge().

      */
     public function testGetAccountsByAge()
     {
      */
     public function testGetAccountsByAge()
     {


@@ -86,7 +84,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetClosedAccounts().

      */
     public function testGetClosedAccounts()
     {
      */
     public function testGetClosedAccounts()
     {


@@ -94,7 +91,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetPrintableInvoices().

      */
     public function testGetPrintableInvoices()
     {
      */
     public function testGetPrintableInvoices()
     {


@@ -102,7 +98,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetEmailableInvoices().

      */
     public function testGetEmailableInvoices()
     {
      */
     public function testGetEmailableInvoices()
     {


@@ -110,7 +105,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetMailableInvoices().

      */
     public function testGetMailableInvoices()
     {
      */
     public function testGetMailableInvoices()
     {


@@ -118,7 +112,6 @@ class Toolkit_Members_Billing_MemberListsTest
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetNeededInvoices().

      */
     public function testGetNeededInvoices()
     {
      */
     public function testGetNeededInvoices()
     {

diff --git a/Toolkit/Members/Billing/Toolkit_Members_Billing_StatementTest.php b/Toolkit/Members/Billing/Toolkit_Members_Billing_StatementTest.php
index 15c67ce..e8d1b3c 100644 (file)
--- a/Toolkit/Members/Billing/Toolkit_Members_Billing_StatementTest.php
+++ b/Toolkit/Members/Billing/Toolkit_Members_Billing_StatementTest.php
@@ -33,7 +33,7 @@ class Toolkit_Members_Billing_StatementTest extends PHPUnit_Framework_TestCase {
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);
 
         $file = TEST_PATH . 'Toolkit/Members/files/memberdb.sql';
                Toolkit_Common::createTables($this->pdo, $file);

-        
+

         $this->object = new Toolkit_Members_Billing_Statement();
     }
 
         $this->object = new Toolkit_Members_Billing_Statement();
     }
 


@@ -65,7 +65,6 @@ class Toolkit_Members_Billing_StatementTest extends PHPUnit_Framework_TestCase {
     }
 
     /**
     }
 
     /**

-     * @todo Implement testGetBalanceDue().

      */
     public function testGetBalanceDue() {
         $ret = $this->object->getBalanceDue(
      */
     public function testGetBalanceDue() {
         $ret = $this->object->getBalanceDue(


@@ -87,35 +86,35 @@ class Toolkit_Members_Billing_StatementTest extends PHPUnit_Framework_TestCase {
         );
         $this->assertEquals('0.00', $ret);
     }
         );
         $this->assertEquals('0.00', $ret);
     }

-    
+

     public function testCreateMemberStatements()
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();
     public function testCreateMemberStatements()
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();

-        
+

         $_REQUEST['id'] = 1;
         $ret = $this->object->createMemberStatements(
             $this->pdo,
             1
         );
         $_REQUEST['id'] = 1;
         $ret = $this->object->createMemberStatements(
             $this->pdo,
             1
         );

-        
+

         $tester->onTearDown();
     }
     public function testCreateAllMemberStatements()
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();
         $tester->onTearDown();
     }
     public function testCreateAllMemberStatements()
     {
         $tester = $this->getDatabaseTester();
                $tester->onSetUp();

-        
+

         $_REQUEST['id'] = 1;
         $ret = $this->object->createMemberStatements(
             $this->pdo,
             1,
             true
         );
         $_REQUEST['id'] = 1;
         $ret = $this->object->createMemberStatements(
             $this->pdo,
             1,
             true
         );

-        
+

         $tester->onTearDown();
     }
         $tester->onTearDown();
     }

-    
+

     /**
      * @expectedException InvalidArgumentException
      */
     /**
      * @expectedException InvalidArgumentException
      */


@@ -128,7 +127,7 @@ class Toolkit_Members_Billing_StatementTest extends PHPUnit_Framework_TestCase {
             true
         );
     }
             true
         );
     }

-    
+

     /**
      * @expected PDOException
      */
     /**
      * @expected PDOException
      */

diff --git a/bootstrap.php b/bootstrap.php
index 53fe9b1..1682453 100644 (file)
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -9,7 +9,6 @@
  */
 $_ENV['GLM_HOST_ID'] = 'STEVE';
 
  */
 $_ENV['GLM_HOST_ID'] = 'STEVE';
 

-// TODO: check include path

 ini_set(
     'include_path',
     '/var/www/server/glmPEAR'
 ini_set(
     'include_path',
     '/var/www/server/glmPEAR'

diff --git a/configuration.xml b/configuration.xml
index 01c9683..aab6f37 100644 (file)
--- a/configuration.xml
+++ b/configuration.xml
@@ -4,10 +4,12 @@
     <filter>
         <blacklist>
             <directory>/var/www/server/www.uptravel.com/Toolkit/Members/templates</directory>
     <filter>
         <blacklist>
             <directory>/var/www/server/www.uptravel.com/Toolkit/Members/templates</directory>

+            <directory>/var/www/server/www.uptravel.com/Toolkit/Members/Billing/templates</directory>

             <file>/var/www/server/www.uptravel.com/setup.phtml</file>
             <file>/var/www/server/www.uptravel.com/setup_functions.phtml</file>
             <file>/var/www/server/www.uptravel.com/Toolkit/Common.php</file>
             <file>/var/www/server/www.uptravel.com/Toolkit/Table.php</file>
             <file>/var/www/server/www.uptravel.com/setup.phtml</file>
             <file>/var/www/server/www.uptravel.com/setup_functions.phtml</file>
             <file>/var/www/server/www.uptravel.com/Toolkit/Common.php</file>
             <file>/var/www/server/www.uptravel.com/Toolkit/Table.php</file>

+            <file>/var/www/server/www.uptravel.com/Toolkit/Logger.php</file>

         </blacklist>
         <whitelist>
             <directory suffix=".php">/var/www/server/www.uptravel.com/Toolkit/Billing</directory>
         </blacklist>
         <whitelist>
             <directory suffix=".php">/var/www/server/www.uptravel.com/Toolkit/Billing</directory>