Changeset 527

Show
Ignore:
Timestamp:
04/14/07 21:30:40 (1 year ago)
Author:
mikey
Message:

added net.stubbles.rdbms.stubDatabaseConnectionPool::getConnectionDataIds()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/main/php/net/stubbles/rdbms/stubDatabaseConnectionPool.php

    r400 r527  
    3232     */ 
    3333    protected static $connectionData = array(); 
    34      
     34 
    3535    /** 
    3636     * returns a connection 
     
    6565        return self::$connections[$id]; 
    6666    } 
    67      
     67 
    6868    /** 
    6969     * adds connection data to the list of known connection data 
     
    7575        self::$connectionData[$connectionData->getId()] = $connectionData; 
    7676    } 
    77      
     77 
    7878    /** 
    7979     * checks whether connection data for a given id is available 
     
    8686        return isset(self::$connectionData[$id]); 
    8787    } 
    88      
     88 
    8989    /** 
    9090     * returns the connection data for a given id 
     
    101101        return null; 
    102102    } 
    103      
     103 
     104    /** 
     105     * returns a list of all ids of all connection data objects in the pool 
     106     * 
     107     * @return  array<string> 
     108     */ 
     109    public static function getConnectionDataIds() 
     110    { 
     111        return array_keys(self::$connectionData); 
     112    } 
     113 
    104114    /** 
    105115     * removes the connection data with the given id 
     
    111121        if (isset(self::$connectionData[$id]) == true) { 
    112122            self::$connectionData[$id] = null; 
     123            unset(self::$connectionData[$id]); 
    113124        } 
    114125    } 
    115      
     126 
    116127    /** 
    117128     * closes the connection with the given id 
     
    128139        } 
    129140    } 
    130      
     141 
    131142    /** 
    132143     * sets a connection for the given id 
  • trunk/src/test/php/net/stubbles/rdbms/stubDatabaseConnectionPoolTestCase.php

    r174 r527  
    2525        stubDatabaseConnectionPool::removeConnectionData(); 
    2626    } 
    27      
     27 
    2828    /** 
    2929     * clean test environment 
     
    3333        stubDatabaseConnectionPool::removeConnectionData(); 
    3434    } 
    35      
     35 
    3636    /** 
    3737     * check that setting/getting the connection data works as expected 
     
    4141        $this->assertFalse(stubDatabaseConnectionPool::hasConnectionData()); 
    4242        $this->assertNull(stubDatabaseConnectionPool::getConnectionData()); 
     43        $this->assertEqual(stubDatabaseConnectionPool::getConnectionDataIds(), array()); 
    4344        $connectionData = new stubDatabaseConnectionData(); 
    4445        stubDatabaseConnectionPool::addConnectionData($connectionData); 
    4546        $this->assertTrue(stubDatabaseConnectionPool::hasConnectionData()); 
    4647        $this->assertReference(stubDatabaseConnectionPool::getConnectionData(), $connectionData); 
     48        $this->assertEqual(stubDatabaseConnectionPool::getConnectionDataIds(), array(stubDatabaseConnectionData::DEFAULT_ID)); 
    4749        $this->assertFalse(stubDatabaseConnectionPool::hasConnectionData('foo')); 
    4850        $this->assertNull(stubDatabaseConnectionPool::getConnectionData('foo')); 
    4951        stubDatabaseConnectionPool::removeConnectionData(); 
    5052        $this->assertFalse(stubDatabaseConnectionPool::hasConnectionData()); 
     53        $this->assertEqual(stubDatabaseConnectionPool::getConnectionDataIds(), array()); 
    5154    } 
    52      
     55 
    5356    /** 
    5457     * assert that getting a connection without a saved connection and without 
     
    6063        stubDatabaseConnectionPool::getConnection(); 
    6164    } 
    62      
     65 
    6366    /** 
    6467     * assert that getting a connection without a saved connection and with an 
     
    7376        stubDatabaseConnectionPool::getConnection(); 
    7477    } 
    75      
     78 
    7679    /** 
    7780     * assert that getting a connection without a saved connection but with 
     
    8689        $this->assertIsA($connection, 'MockstubDatabaseConnection'); 
    8790    } 
    88      
     91 
    8992    /** 
    9093     * assert that getting a connection with a saved connection delivers the  
     
    100103        $this->assertReference($connection, $connectionTest); 
    101104    } 
    102      
     105 
    103106    /** 
    104107     * assert that a getting a closed connection without connection data