Merge lp:~lewiszhang/coughphp/1.4-switch-to-phpunit into lp:coughphp/1.4

[Lewis Zhang]

Convert from SimpleTest to PHPUnit. To run the tests:

$ cd tests/
$ phpunit --verbose

If you would like to test Autoloader's register_shutdown_function hook:

$ phpunit --verbose --configuration phpunit-after.xml

Tested on PHPUnit version 3.5.5 installed via PEAR.

=== removed file 'scripts/test_all'
--- scripts/test_all	2009-03-24 15:02:40 +0000
+++ scripts/test_all	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$utest = dirname(__FILE__) . '/utest';
-$coughRoot = dirname(dirname(__FILE__)) . '/';
-
-echo "Testing the cough generator:\n";
-echo shell_exec(escapeshellarg($utest) . ' ' . escapeshellarg($coughRoot) . 'tests/cough_generator/Test*.class.php');
-echo "Testing core cough:\n";
-echo shell_exec(escapeshellarg($utest) . ' ' . escapeshellarg($coughRoot) . 'tests/cough/Test*.class.php');
-echo "Testing DAL (Database Abstraction Layer) without magic_quotes_gpc:\n";
-echo shell_exec('php -d magic_quotes_gpc=Off ' . escapeshellarg($utest) . ' ' . escapeshellarg($coughRoot) . 'tests/dal/TestCoughAsDatabase.class.php');
-echo "Testing DAL (Database Abstraction Layer) with magic_quotes_gpc:\n";
-echo shell_exec('php -d magic_quotes_gpc=On ' . escapeshellarg($utest) . ' ' . escapeshellarg($coughRoot) . 'tests/dal/TestCoughAsDatabase.class.php');
-echo "Testing Autoloader:\n";
-echo shell_exec(escapeshellarg($utest) . ' ' . escapeshellarg($coughRoot) . 'tests/autoloader/TestAutoloader.class.php');
-
-?>

=== removed file 'scripts/utest'
--- scripts/utest	2008-06-12 04:42:16 +0000
+++ scripts/utest	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-// CHANGE THIS TO YOUR `simpletest` PATH. (e.g. if it's in the include path, set it to empty string).
-define('SIMPLETEST_PATH', 'simpletest/');
-
-
-/////////////////////////////////
-// Don't change anything below //
-/////////////////////////////////
-
-
-// Check that we're running in command line mode with at least one argument
-if (!isset($_SERVER['argc']) || !isset($_SERVER['argv']) || $_SERVER['argc'] < 2)
-{
-	print_usage();
-	exit(1);
-}
-
-// Default options
-$files = array();
-
-// Parse command line options
-$argc = $_SERVER['argc'];
-$argv = $_SERVER['argv'];
-for ($i = 1; $i < $argc; $i++)
-{
-	$files[] = $argv[$i];
-}
-
-// Function for printing usage info
-function print_usage()
-{
-	$script = 'utest';
-	
-	echo 'NAME
-	' . $script . ' -- run tests using the SimpleTest unit tester
-
-SYNOPSIS
-	' . $script . ' file [file...]
-
-DESCRIPTION
-	' . $script . ' takes one or more files that include test classes and
-	passes them to the SimpleTest unit tester.
-
-EXAMPLES
-	Test one file in the current directory:
-	
-		' . $script . ' TestCoughCollection.class.php
-	
-	Test all files in the current directory that start with "Test" and end
-	with ".php"
-	
-		' . $script . ' Test*.php
-
-SEE ALSO
-	Download SimpleTest from http://simpletest.sourceforge.net/
-';
-}
-
-
-// simpletest is not strict compatible, so remove it
-$oldErrorReporting = error_reporting();
-error_reporting($oldErrorReporting & ~E_STRICT);
-
-// Run Tests
-require_once(SIMPLETEST_PATH . 'autorun.php');
-$test = new TestSuite('Running Tests');
-foreach ($files as $file)
-{
-	$test->addTestFile($file);
-}
-if (TextReporter::inCli())
-{
-	exit ($test->run(new TextReporter()) ? 0 : 1);
-}
-$test->run(new HtmlReporter());
-
-?>
\ No newline at end of file

=== added file 'tests/autoloader/AutoloaderCacheFileTest.class.php'
--- tests/autoloader/AutoloaderCacheFileTest.class.php	1970-01-01 00:00:00 +0000
+++ tests/autoloader/AutoloaderCacheFileTest.class.php	2010-12-15 07:59:33 +0000
@@ -0,0 +1,23 @@
+<?php
+class AutoloaderCacheFileTest extends PHPUnit_Framework_TestCase
+{
+	protected static $cacheFile = '';
+	
+	public static function setUpBeforeClass()
+	{
+		self::$cacheFile = dirname(__FILE__) . '/class_path_cache.txt';
+	}
+	
+	public static function removeCacheFile()
+	{
+		if (file_exists(self::$cacheFile)) {
+			unlink(self::$cacheFile);
+		}
+	}
+	
+	public function testWasCacheFileCreated()
+	{
+		$this->assertFileExists(self::$cacheFile);
+		self::removeCacheFile();
+	}
+}

=== renamed file 'tests/autoloader/TestAutoloader.class.php' => 'tests/autoloader/AutoloaderTest.class.php'
--- tests/autoloader/TestAutoloader.class.php	2008-09-22 04:12:07 +0000
+++ tests/autoloader/AutoloaderTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,39 +1,25 @@
 <?php
-
-class TestAutoloader extends UnitTestCase
+class AutoloaderTest extends PHPUnit_Framework_TestCase
 {
-	protected $cacheFile = '';
+	protected static $cacheFile = '';
 	
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
-		parent::__construct();
-		
-		$this->cacheFile = dirname(__FILE__) . 'class_path_cache.txt';
-		$this->removeCacheFile();
+		self::$cacheFile = dirname(__FILE__) . '/class_path_cache.txt';
+		self::removeCacheFile();
 		
 		include_once(dirname(dirname(dirname(__FILE__))) . '/extras/Autoloader.class.php');
 		Autoloader::addClassPath(dirname(__FILE__) . '/classes_app/');
 		Autoloader::addClassPath(dirname(__FILE__) . '/classes_shared/');
-		Autoloader::setCacheFilePath($this->cacheFile);
+		Autoloader::setCacheFilePath(self::$cacheFile);
 		//Autoloader::excludeFolderNamesMatchingRegex('/^CVS|\..*$/');
 		spl_autoload_register(array('Autoloader', 'loadClass'));
 	}
 	
-	public function __destruct()
-	{
-		// Not sure how to put this in the testing framework since we are testing
-		// functionality as the script ends...
-		if (!file_exists($this->cacheFile))
-		{
-			trigger_error('Cache file was not saved at end of script', E_USER_ERROR);
-		}
-		$this->removeCacheFile();
-	}
-	
-	public function removeCacheFile()
-	{
-		if (file_exists($this->cacheFile)) {
-			unlink($this->cacheFile);
+	public static function removeCacheFile()
+	{
+		if (file_exists(self::$cacheFile)) {
+			unlink(self::$cacheFile);
 		}
 	}
 	
@@ -46,7 +32,7 @@
 	public function testAppCanOverrideClasses()
 	{
 		$obj = new As_String();
-		$this->assertEqual($obj->getClassLocation(), 'app');
+		$this->assertEquals($obj->getClassLocation(), 'app');
 	}
 	
 	public function testExtendedClassesAreAlsoAutoloaded()
@@ -58,14 +44,14 @@
 	
 	public function testCacheFileSavingIsDelayedUntilScriptEnds()
 	{
-		$this->assertFalse(file_exists($this->cacheFile), 'Cache file should not exist yet');
+		$this->assertFalse(file_exists(self::$cacheFile), 'Cache file should not exist yet');
 	}
 	
 	public function testCacheFileCanBeManuallySaved()
 	{
 		Autoloader::saveCachedPaths();
-		$this->assertTrue(file_exists($this->cacheFile), 'Cache file should exist');
-		$this->assertTrue(filesize($this->cacheFile) > 0, 'Cache file should be non-empty');
+		$this->assertTrue(file_exists(self::$cacheFile), 'Cache file should exist');
+		$this->assertTrue(filesize(self::$cacheFile) > 0, 'Cache file should be non-empty');
 		$this->removeCacheFile();
 	}
 }

=== renamed file 'tests/cough/TestCoughCollection.class.php' => 'tests/cough/CoughCollectionTest.class.php' (properties changed: +x to -x)
--- tests/cough/TestCoughCollection.class.php	2009-11-05 19:53:50 +0000
+++ tests/cough/CoughCollectionTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,12 +1,11 @@
 <?php
-
-class TestCoughCollection extends UnitTestCase
+class CoughCollectionTest extends PHPUnit_Framework_TestCase
 {
 	//////////////////////////////////////
 	// Set Up
 	//////////////////////////////////////
 	
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		$coughRoot = dirname(dirname(dirname(__FILE__)));
 		require_once($coughRoot . '/cough/load.inc.php');
@@ -89,9 +88,9 @@
 		$sortMe1->add(new SortableElement($sortableData[0]));
 		$sortMe1->add(new SortableElement($sortableData[1]));
 		$sortMe1->add(new SortableElement($sortableData[2]));
-		$this->assertEqual($sortedCollectionIds, $sortMe1->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe1->getArrayKeys());
 		$sortMe1->sortByMethod('getManufacturerName');
-		$this->assertEqual($sortedCollectionIds, $sortMe1->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe1->getArrayKeys());
 		unset($sortMe1);
 		
 		// Create another sorted copy and sort it using another method
@@ -100,7 +99,7 @@
 		$sortMe2->add(new SortableElement($sortableData[1]));
 		$sortMe2->add(new SortableElement($sortableData[2]));
 		$sortMe2->sortByMethod('getProductName');
-		$this->assertEqual($sortedCollectionIds, $sortMe2->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe2->getArrayKeys());
 		unset($sortMe2);
 		
 		// Create another sorted copy and sort it using another method
@@ -109,7 +108,7 @@
 		$sortMe3->add(new SortableElement($sortableData[1]));
 		$sortMe3->add(new SortableElement($sortableData[2]));
 		$sortMe3->sortByMethod('getPrice');
-		$this->assertEqual($sortedCollectionIds, $sortMe3->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe3->getArrayKeys());
 		unset($sortMe3);
 		
 		///////////////////////////////////////////
@@ -121,9 +120,9 @@
 		$sortMe4->add(new SortableElement($sortableData[1]));
 		$sortMe4->add(new SortableElement($sortableData[2]));
 		$sortMe4->add(new SortableElement($sortableData[0]));
-		$this->assertNotEqual($sortedCollectionIds, $sortMe4->getArrayKeys());
+		$this->assertNotEquals($sortedCollectionIds, $sortMe4->getArrayKeys());
 		$sortMe4->sortByMethod('getManufacturerName');
-		$this->assertEqual($sortedCollectionIds, $sortMe4->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe4->getArrayKeys());
 		unset($sortMe4);
 		
 		// Create another unsorted copy and sort it using another method
@@ -131,9 +130,9 @@
 		$sortMe5->add(new SortableElement($sortableData[1]));
 		$sortMe5->add(new SortableElement($sortableData[2]));
 		$sortMe5->add(new SortableElement($sortableData[0]));
-		$this->assertNotEqual($sortedCollectionIds, $sortMe5->getArrayKeys());
+		$this->assertNotEquals($sortedCollectionIds, $sortMe5->getArrayKeys());
 		$sortMe5->sortByMethod('getProductName');
-		$this->assertEqual($sortedCollectionIds, $sortMe5->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe5->getArrayKeys());
 		unset($sortMe5);
 		
 		// Create another unsorted copy and sort it using another method
@@ -141,9 +140,9 @@
 		$sortMe6->add(new SortableElement($sortableData[1]));
 		$sortMe6->add(new SortableElement($sortableData[2]));
 		$sortMe6->add(new SortableElement($sortableData[0]));
-		$this->assertNotEqual($sortedCollectionIds, $sortMe6->getArrayKeys());
+		$this->assertNotEquals($sortedCollectionIds, $sortMe6->getArrayKeys());
 		$sortMe6->sortByMethod('getProductName');
-		$this->assertEqual($sortedCollectionIds, $sortMe6->getArrayKeys());
+		$this->assertEquals($sortedCollectionIds, $sortMe6->getArrayKeys());
 		unset($sortMe6);
 		
 	}
@@ -153,37 +152,37 @@
 		$collection = $this->buildSortableCollection();
 		
 		$collection->sortByMethods('getManufacturerName');
-		$this->assertEqual(array(1,4,2,3), $collection->getArrayKeys());
+		$this->assertEquals(array(1,4,2,3), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getManufacturerName', SORT_DESC);
-		$this->assertEqual(array(3,2,4,1), $collection->getArrayKeys());
+		$this->assertEquals(array(3,2,4,1), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getManufacturerName', 'getProductName');
-		$this->assertEqual(array(1,4,2,3), $collection->getArrayKeys());
+		$this->assertEquals(array(1,4,2,3), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getManufacturerName', 'getProductName', SORT_DESC);
-		$this->assertEqual(array(1,2,4,3), $collection->getArrayKeys());
+		$this->assertEquals(array(1,2,4,3), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getManufacturerName', SORT_DESC, 'getProductName', SORT_DESC);
-		$this->assertEqual(array(3,2,4,1), $collection->getArrayKeys());
+		$this->assertEquals(array(3,2,4,1), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getProductName', 'getManufacturerName');
-		$this->assertEqual(array(1,4,2,3), $collection->getArrayKeys());
+		$this->assertEquals(array(1,4,2,3), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getProductName', 'getManufacturerName', SORT_DESC);
-		$this->assertEqual(array(4,1,2,3), $collection->getArrayKeys());
+		$this->assertEquals(array(4,1,2,3), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getProductName', SORT_DESC, 'getManufacturerName', SORT_DESC);
-		$this->assertEqual(array(3,2,4,1), $collection->getArrayKeys());
+		$this->assertEquals(array(3,2,4,1), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getPrice');
-		$this->assertEqual(array(1,2,3,4), $collection->getArrayKeys());
+		$this->assertEquals(array(1,2,3,4), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getPrice', SORT_DESC);
-		$this->assertEqual(array(4,3,2,1), $collection->getArrayKeys());
+		$this->assertEquals(array(4,3,2,1), $collection->getArrayKeys());
 		
 		$collection->sortByMethods('getPrice', SORT_ASC, 'getProductName', SORT_DESC, 'getManufacturerName');
-		$this->assertEqual(array(1,2,3,4), $collection->getArrayKeys());
+		$this->assertEquals(array(1,2,3,4), $collection->getArrayKeys());
 		
 		
 		// test sort empty collection
@@ -251,7 +250,7 @@
 		foreach ($keyPermutations as $keyPermutation)
 		{
 			$collection->sortByKeys($keyPermutation);
-			$this->assertEqual($keyPermutation, $collection->getArrayKeys());
+			$this->assertEquals($keyPermutation, $collection->getArrayKeys());
 		}
 	}
 	
@@ -275,15 +274,15 @@
 			$iteratorData[$keyId] = $productName;
 		}
 		
-		$this->assertIdentical($manualData, $iteratorData);
+		$this->assertSame($manualData, $iteratorData);
 		
 		// count should work
-		$this->assertIdentical(count($manualData), count($iterator));
-		$this->assertIdentical(count($collection), count($iterator));
+		$this->assertSame(count($manualData), count($iterator));
+		$this->assertSame(count($collection), count($iterator));
 		
 		// empty should work
-		$this->assertIdentical(empty($manualData), empty($iterator));
-		$this->assertIdentical(empty($collection), empty($iterator));
+		$this->assertSame(empty($manualData), empty($iterator));
+		$this->assertSame(empty($collection), empty($iterator));
 	}
 	
 	public function testGetKeyValueIteratorWithCustomKeyId()
@@ -305,15 +304,15 @@
 			$iteratorData[$keyId] = $productName;
 		}
 		
-		$this->assertIdentical($manualData, $iteratorData);
+		$this->assertSame($manualData, $iteratorData);
 		
 		// count should work
-		$this->assertIdentical(count($manualData), count($iterator));
-		$this->assertIdentical(count($collection), count($iterator));
+		$this->assertSame(count($manualData), count($iterator));
+		$this->assertSame(count($collection), count($iterator));
 		
 		// empty should work
-		$this->assertIdentical(empty($manualData), empty($iterator));
-		$this->assertIdentical(empty($collection), empty($iterator));
+		$this->assertSame(empty($manualData), empty($iterator));
+		$this->assertSame(empty($collection), empty($iterator));
 	}
 	
 	public function testCanRemoveItemsFromCollectionWhileLooping()

=== renamed file 'tests/cough/TestCoughDatabaseFactory.class.php' => 'tests/cough/CoughDatabaseFactoryTest.class.php'
--- tests/cough/TestCoughDatabaseFactory.class.php	2009-03-24 15:16:02 +0000
+++ tests/cough/CoughDatabaseFactoryTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,6 +1,5 @@
 <?php
-
-class TestCoughDatabaseFactory extends UnitTestCase
+class CoughDatabaseFactoryTest extends PHPUnit_Framework_TestCase
 {
 	protected $configs = array();
 	
@@ -8,7 +7,7 @@
 	// Set Up
 	//////////////////////////////////////
 	
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		$coughRoot = dirname(dirname(dirname(__FILE__)));
 		require_once($coughRoot . '/cough/load.inc.php');
@@ -16,18 +15,22 @@
 	
 	public function setUp()
 	{
+		include(dirname(dirname(__FILE__)) . '/database_config.inc.php');
+		
 		CoughDatabaseFactory::reset();
 		$this->configs = array(
 			'config1' => array(
-				'host' => 'localhost',
-				'user' => 'nobody',
-				'port'	=> '3306',
+				'host' => $dsn['host'],
+				'user' => $dsn['user'],
+				'pass' => $dsn['pass'],
+				'port'	=> $dsn['port'],
 				'aliases' => array('testConfigAlias', 'reporting_server' => 'reports')
 			),
 			'config2' => array(
-				'host' => 'localhost',
-				'user' => 'nobody',
-				'port'	=> '3307',
+				'host' => $dsn['host'],
+				'user' => $dsn['user'],
+				'pass' => $dsn['pass'],
+				'port'	=> $dsn['port'],
 				'db_name_hash' => array('db_alias' => 'actual_db_name', 'write_server' => 'reports')
 			)
 		);
@@ -40,17 +43,17 @@
 	public function assertGetDatabaseNameWorks()
 	{
 		// An alias specified without the hash should have alias *and* database name equal to each other.
-		$this->assertIdentical(CoughDatabaseFactory::getDatabaseName('testConfigAlias'), 'testConfigAlias');
+		$this->assertSame(CoughDatabaseFactory::getDatabaseName('testConfigAlias'), 'testConfigAlias');
 		
 		// Specifying an alias with a hash allows access to the value stored therein.
-		$this->assertIdentical(CoughDatabaseFactory::getDatabaseName('reporting_server'), 'reports');
+		$this->assertSame(CoughDatabaseFactory::getDatabaseName('reporting_server'), 'reports');
 		
 		// Trying to access a database name that doesn't have a mapping should return the original value.
-		$this->assertIdentical(CoughDatabaseFactory::getDatabaseName('reports'), 'reports');
+		$this->assertSame(CoughDatabaseFactory::getDatabaseName('reports'), 'reports');
 		
 		// Specifying the db_name_hash allows a more direct way of configuring the aliases and database name mappings
-		$this->assertIdentical(CoughDatabaseFactory::getDatabaseName('db_alias'), 'actual_db_name');
-		$this->assertIdentical(CoughDatabaseFactory::getDatabaseName('write_server'), 'reports');
+		$this->assertSame(CoughDatabaseFactory::getDatabaseName('db_alias'), 'actual_db_name');
+		$this->assertSame(CoughDatabaseFactory::getDatabaseName('write_server'), 'reports');
 	}
 	
 	public function testAddConfig()
@@ -99,61 +102,60 @@
 		// test default adapter = "as" and old style "aliases" param
 		$testDbConfig = array(
 			'driver' => 'mysql',
-			'host' => 'localhost',
+			'host' => '',
 			'user' => 'cough_test',
 			'pass' => 'cough_test',
-			'port' => '3306',
+			'port' => ':/opt/local/var/run/mysql5/mysql.sock',
 			'aliases' => array('cough_test1')
 		);
 		CoughDatabaseFactory::addConfig($testDbConfig);
 		$test1Db = CoughDatabaseFactory::getDatabase('cough_test1');
-		$this->assertIsA($test1Db, 'As_Database');
+		$this->assertInstanceOf('As_Database', $test1Db);
 		
 		// test specifying adapter as "as" and new "db_name_hash" param
 		$testDbConfig = array(
 			'adapter' => 'as',
 			'driver' => 'mysql',
-			'host' => 'localhost',
+			'host' => '',
 			'user' => 'cough_test',
 			'pass' => 'cough_test',
-			'port' => '3306',
+			'port' => ':/opt/local/var/run/mysql5/mysql.sock',
 			'db_name_hash' => array('cough_test2' => 'test_cough_object')
 		);
 		CoughDatabaseFactory::addConfig($testDbConfig);
 		$test2Db = CoughDatabaseFactory::getDatabase('cough_test2');
-		$this->assertIsA($test2Db, 'As_Database');
+		$this->assertInstanceOf('As_Database', $test2Db);
 		
 		// test new style aliases param
 		$testDbConfig = array(
 			'driver' => 'mysql',
-			'host' => 'localhost',
+			'host' => '',
 			'user' => 'cough_test',
 			'pass' => 'cough_test',
-			'port' => '3306',
+			'port' => ':/opt/local/var/run/mysql5/mysql.sock',
 			'aliases' => array('cough_test4' => 'test_cough_object')
 		);
 		CoughDatabaseFactory::addConfig($testDbConfig);
 		$test4Db = CoughDatabaseFactory::getDatabase('cough_test4');
-		$this->assertIsA($test4Db, 'As_Database');
+		$this->assertInstanceOf('As_Database', $test4Db);
 		
 		// // test specifying adapter as "pdo"
 		// $testDbConfig = array(
 		// 	'adapter' => 'pdo',
 		// 	'driver' => 'mysql',
-		// 	'host' => 'localhost',
+		// 	'host' => '',
 		// 	'user' => 'cough_test',
 		// 	'pass' => 'cough_test',
-		// 	'port' => '3306',
+		// 	'port' => ':/opt/local/var/run/mysql5/mysql.sock',
 		// 	'aliases' => array('cough_test3' => 'test_cough_object')
 		// );
 		// CoughDatabaseFactory::addConfig($testDbConfig);
 		// $test3Db = CoughDatabaseFactory::getDatabase('cough_test3');
-		// $this->assertIsA($test3Db, 'CoughPdoDatabaseAdapter');
+		// $this->assertInstanceOf('CoughPdoDatabaseAdapter', $test3Db);
 		
 		// test getting the same database object back
 		$test1DbReference = CoughDatabaseFactory::getDatabase('cough_test1');
-		$this->assertReference($test1Db, $test1DbReference);
-		$this->assertIdentical($test1Db, $test1DbReference);
+		$this->assertSame($test1Db, $test1DbReference);
 		$this->assertFalse($test2Db === $test1DbReference);
 		// $this->assertFalse($test3Db === $test1DbReference);
 	}

=== renamed file 'tests/cough/TestCoughInstancePool.class.php' => 'tests/cough/CoughInstancePoolTest.class.php'
--- tests/cough/TestCoughInstancePool.class.php	2008-08-21 04:18:31 +0000
+++ tests/cough/CoughInstancePoolTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,8 +1,7 @@
 <?php
-
-class TestCoughInstancePool extends UnitTestCase
+class CoughInstancePoolTest extends PHPUnit_Framework_TestCase
 {
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		$coughRoot = dirname(dirname(dirname(__FILE__)));
 		require_once($coughRoot . '/cough/load.inc.php');
@@ -31,7 +30,7 @@
 		$this->assertTrue(CoughInstancePool::get('InstancePoolTestObject', $obj->getKeyId()) instanceof InstancePoolTestObject);
 		
 		// the item should be a reference to the same thing we gave it
-		$this->assertIdentical($obj, CoughInstancePool::get('InstancePoolTestObject', $obj->getKeyId()));
+		$this->assertSame($obj, CoughInstancePool::get('InstancePoolTestObject', $obj->getKeyId()));
 		
 		// the item should be removeable by passing the object and key
 		CoughInstancePool::remove($obj, $obj->getKeyId());
@@ -72,18 +71,18 @@
 		CoughInstancePool::add($objB2, $objB2->getKeyId());
 
 		// check they all come back good
-		$this->assertIdentical($objA1, CoughInstancePool::get(get_class($objA1), $objA1->getKeyId()));
-		$this->assertIdentical($objA2, CoughInstancePool::get(get_class($objA2), $objA2->getKeyId()));
-		$this->assertIdentical($objB1, CoughInstancePool::get(get_class($objB1), $objB1->getKeyId()));
-		$this->assertIdentical($objB2, CoughInstancePool::get(get_class($objB2), $objB2->getKeyId()));
+		$this->assertSame($objA1, CoughInstancePool::get(get_class($objA1), $objA1->getKeyId()));
+		$this->assertSame($objA2, CoughInstancePool::get(get_class($objA2), $objA2->getKeyId()));
+		$this->assertSame($objB1, CoughInstancePool::get(get_class($objB1), $objB1->getKeyId()));
+		$this->assertSame($objB2, CoughInstancePool::get(get_class($objB2), $objB2->getKeyId()));
 
 		// remove two at random and check that they are gone and the others are still good
 		CoughInstancePool::remove(get_class($objB1), $objB1->getKeyId());
 		CoughInstancePool::remove(get_class($objA2), $objA2->getKeyId());
 		$this->assertNull(CoughInstancePool::get(get_class($objB1), $objB1->getKeyId()));
 		$this->assertNull(CoughInstancePool::get(get_class($objA2), $objA2->getKeyId()));
-		$this->assertIdentical($objA1, CoughInstancePool::get(get_class($objA1), $objA1->getKeyId()));
-		$this->assertIdentical($objB2, CoughInstancePool::get(get_class($objB2), $objB2->getKeyId()));
+		$this->assertSame($objA1, CoughInstancePool::get(get_class($objA1), $objA1->getKeyId()));
+		$this->assertSame($objB2, CoughInstancePool::get(get_class($objB2), $objB2->getKeyId()));
 	}
 }
 

=== renamed file 'tests/cough/TestCoughObject.class.php' => 'tests/cough/CoughObjectTest.class.php' (properties changed: +x to -x)
--- tests/cough/TestCoughObject.class.php	2009-03-24 15:16:02 +0000
+++ tests/cough/CoughObjectTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,16 +1,14 @@
 <?php
-
 /**
- * @todo consider switching to PHPUnit, especially if it has PHP5 strict compatibility.
  * @todo consider splitting out some of the test methods, and rename them in a
  * way that indicates requirements rather than what it is doing.  The
- * TestAutoloader.class.php file is a good example.  Once we do this, we can also
+ * AutoloaderTest.class.php file is a good example.  Once we do this, we can also
  * benefit from concepts like Agile Documentation {@link http://www.phpunit.de/manual/3.3/en/other-uses-for-tests.html}
  **/
-class TestCoughObject extends UnitTestCase
+class CoughObjectTest extends PHPUnit_Framework_TestCase
 {
-	protected $db = null; // the database object
-	protected $coughTestDbResetSql = '';
+	protected static $db = null; // the database object
+	protected static $coughTestDbResetSql = '';
 	
 	//////////////////////////////////////
 	// Set Up
@@ -19,23 +17,23 @@
 	/**
 	 * Some things we only need to setup once (like generate all the code from the DB)
 	 **/
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		error_reporting(E_ALL);
-		$this->includeDependencies();
-		$this->setUpDatabase();
-		$this->loadSetupSql();
-		$this->resetCoughTestDatabase();
-		$this->generateCoughTestClasses();
-		$this->includeCoughTestClasses();
+		self::includeDependencies();
+		self::setUpDatabase();
+		self::loadSetupSql();
+		self::resetCoughTestDatabase();
+		self::generateCoughTestClasses();
+		self::includeCoughTestClasses();
 	}
 	
 	/**
 	 * Some things we only need to teardown once (like delete all the generated code)
 	 **/
-	public function __destruct()
+	public static function tearDownAfterClass()
 	{
-		$this->removeGeneratedFiles();
+		self::removeGeneratedFiles();
 	}
 	
 	/**
@@ -45,18 +43,18 @@
 	 **/
 	public function setUp()
 	{
-		$this->resetCoughTestDatabase();
+		self::resetCoughTestDatabase();
 	}
 	
-	public function resetCoughTestDatabase()
+	public static function resetCoughTestDatabase()
 	{
-		foreach ($this->coughTestDbResetSql as $sql)
+		foreach (self::$coughTestDbResetSql as $sql)
 		{
-			$this->db->query($sql);
+			self::$db->query($sql);
 		}
 	}
 	
-	public function setUpDatabase()
+	public static function setUpDatabase()
 	{
 		// Use connection information from the generation config (and just add the aliases)
 		include(dirname(__FILE__) . '/config/database_schema_generator.inc.php');
@@ -66,19 +64,19 @@
 		$testDbConfig['aliases'] = array($dbName);
 		
 		CoughDatabaseFactory::addConfig($testDbConfig);
-		$this->db = CoughDatabaseFactory::getDatabase($dbName);
+		self::$db = CoughDatabaseFactory::getDatabase($dbName);
 	}
 	
-	public function loadSetupSql()
+	public static function loadSetupSql()
 	{
 		// We have to run this sql dump one query at a time
-		$this->coughTestDbResetSql = explode(';', file_get_contents(dirname(__FILE__) . '/config/db_setup.sql'));
+		self::$coughTestDbResetSql = explode(';', file_get_contents(dirname(__FILE__) . '/config/db_setup.sql'));
 		
 		// the last element is a blank string, so get rid of it
-		array_pop($this->coughTestDbResetSql);
+		array_pop(self::$coughTestDbResetSql);
 	}
 	
-	public function includeDependencies()
+	public static function includeDependencies()
 	{
 		// include Cough + dependencies; this should be the only include necessary
 		$coughRoot = dirname(dirname(dirname(__FILE__)));
@@ -86,7 +84,7 @@
 		require_once($coughRoot . '/cough_generator/load.inc.php');
 	}
 	
-	public function generateCoughTestClasses()
+	public static function generateCoughTestClasses()
 	{
 		ob_start();
 		$facade = new CoughGeneratorFacade();
@@ -94,7 +92,7 @@
 		ob_end_clean();
 	}
 	
-	public function includeCoughTestClasses()
+	public static function includeCoughTestClasses()
 	{
 		$classPath = dirname(__FILE__) . '/config/output/';
 		// include Cough generated classes
@@ -128,7 +126,7 @@
 		
 		foreach ($sqlCommands as $sql)
 		{
-			$this->db->query($sql);
+			self::$db->query($sql);
 		}
 	}
 	
@@ -164,7 +162,7 @@
 		$newBook->setCreationDatetime(date('Y-m-d H:i:s'));
 		$newBook->save();
 		
-		$this->assertIdentical($newBook->getBookId(), 1);
+		$this->assertSame($newBook->getBookId(), 1);
 		
 		// test the most basic case (insert with no values)
 		$newBook2 = new Book();
@@ -202,9 +200,9 @@
 		$book = new Book2($data);
 		$getterData = $book->getFieldsThroughGetters();
 		
-		$this->assertEqual('Your title is mine now!', $getterData['title']);
-		$this->assertEqual($data['introduction'], $getterData['introduction']);
-		$this->assertEqual($data['creation_datetime'], $getterData['creation_datetime']);
+		$this->assertEquals('Your title is mine now!', $getterData['title']);
+		$this->assertEquals($data['introduction'], $getterData['introduction']);
+		$this->assertEquals($data['creation_datetime'], $getterData['creation_datetime']);
 	}
 	
 	public function testSetKeyId()
@@ -214,14 +212,14 @@
 		$book1->setKeyId(1);
 		$book2 = new Book();
 		$book2->setBookId(1);
-		$this->assertEqual($book1->getFields(), $book2->getFields());
+		$this->assertEquals($book1->getFields(), $book2->getFields());
 		
 		// do it again, but this time check the entire object state (this means we can't notify children of the change)
 		$book1 = new Book();
 		$book1->setKeyId(1, false); // false => don't notify children of key change
 		$book2 = new Book();
 		$book2->setBookId(1);
-		$this->assertEqual(serialize($book1), serialize($book2));
+		$this->assertEquals(serialize($book1), serialize($book2));
 	}
 	
 	public function testHasKeyId()
@@ -256,17 +254,17 @@
 		$sameBook = Book::constructByKey($newBook->getBookId());
 		
 		// this one fails; see ticket #27, http://trac.coughphp.com/ticket/27
-		//$this->assertIdentical($newBook->getBookId(), $sameBook->getBookId());
-		$this->assertEqual($newBook->getBookId(), $sameBook->getBookId());
+		//$this->assertSame($newBook->getBookId(), $sameBook->getBookId());
+		$this->assertEquals($newBook->getBookId(), $sameBook->getBookId());
 		
-		$this->assertIdentical($newBook->getTitle(), $sameBook->getTitle());
+		$this->assertSame($newBook->getTitle(), $sameBook->getTitle());
 		
 		// again, this is broke; see ticket #27
-		//$this->assertIdentical($newBook->getAuthorId(), $sameBook->getAuthorId());
-		$this->assertEqual($newBook->getAuthorId(), $sameBook->getAuthorId());
+		//$this->assertSame($newBook->getAuthorId(), $sameBook->getAuthorId());
+		$this->assertEquals($newBook->getAuthorId(), $sameBook->getAuthorId());
 		
-		$this->assertIdentical($newBook->getIntroduction(), $sameBook->getIntroduction());
-		$this->assertIdentical($newBook->getCreationDatetime(), $sameBook->getCreationDatetime());
+		$this->assertSame($newBook->getIntroduction(), $sameBook->getIntroduction());
+		$this->assertSame($newBook->getCreationDatetime(), $sameBook->getCreationDatetime());
 	}
 	
 	public function testUpdateObject()
@@ -278,13 +276,13 @@
 		
 		$newAuthor->setName('Mark Twain');
 		
-		$this->assertIdentical($newAuthor->getName(), 'Mark Twain');
+		$this->assertSame($newAuthor->getName(), 'Mark Twain');
 		
 		$newAuthor->save();
 		
 		$sameAuthor = Author::constructByKey($newAuthor->getAuthorId());
 		
-		$this->assertIdentical($sameAuthor->getName(), 'Mark Twain');
+		$this->assertSame($sameAuthor->getName(), 'Mark Twain');
 	}
 	
 	public function testRetireObject()
@@ -302,7 +300,7 @@
 		// handling. It's mostly meant as a way to keep items from showing up in related
 		// collections, NOT to keep the entitity from being retrieved (just delete it in
 		// that case).
-		$this->assertIsA(Library::constructByKey($newLibrary->getLibraryId()), 'Library');
+		$this->assertInstanceOf('Library', Library::constructByKey($newLibrary->getLibraryId()));
 	}
 	
 	public function testObjectsCanBeDeletedUsingRemoveAndSave()
@@ -348,11 +346,11 @@
 		
 		$ulysses->setAuthor_Object($joyce);
 		
-		$this->assertReference($ulysses->getAuthor_Object(), $joyce);
+		$this->assertSame($ulysses->getAuthor_Object(), $joyce);
 		
 		$ulysses->save();
 		
-		// $this->assertNotEqual($ulysses->getAuthorId(), $joyce->getAuthorId());
+		// $this->assertNotEquals($ulysses->getAuthorId(), $joyce->getAuthorId());
 		
 		// case 2: author object saved, book is saved
 		$twain = new Author();
@@ -368,11 +366,11 @@
 		
 		$huckFinn->setAuthor_Object($twain);
 		
-		$this->assertReference($huckFinn->getAuthor_Object(), $twain);
+		$this->assertSame($huckFinn->getAuthor_Object(), $twain);
 		
 		$huckFinn->save();
 		
-		$this->assertNotEqual($huckFinn->getAuthorId(), $twain->getAuthorId());
+		$this->assertNotEquals($huckFinn->getAuthorId(), $twain->getAuthorId());
 		
 		// case 3: author object is anonymous, book is anonymous
 		$murakami = new Author();
@@ -386,11 +384,11 @@
 		
 		$windup->setAuthor_Object($murakami);
 		
-		$this->assertReference($windup->getAuthor_Object(), $murakami);
+		$this->assertSame($windup->getAuthor_Object(), $murakami);
 		
 		$windup->save();
 		
-		// $this->assertNotEqual($windup->getAuthorId(), $murakami->getAuthorId());
+		// $this->assertNotEquals($windup->getAuthorId(), $murakami->getAuthorId());
 		
 		// case 4: author object is saved, book is anonymous
 		$heinlein = new Author();
@@ -405,11 +403,11 @@
 		
 		$stranger->setAuthor_Object($heinlein);
 		
-		$this->assertReference($stranger->getAuthor_Object(), $heinlein);
+		$this->assertSame($stranger->getAuthor_Object(), $heinlein);
 		
 		$stranger->save();
 		
-		$this->assertNotEqual($stranger->getAuthorId(), $heinlein->getAuthorId());
+		$this->assertNotEquals($stranger->getAuthorId(), $heinlein->getAuthorId());
 	}
 	
 	public function testAddAndRemoveObject()
@@ -427,12 +425,12 @@
 		
 		$joyce->addBook($ulysses);
 		$booksByJoyce = $joyce->getBook_Collection();
-		$this->assertReference($booksByJoyce[$ulysses->getBookId()], $ulysses);
+		$this->assertSame($booksByJoyce[$ulysses->getBookId()], $ulysses);
 		
 		$joyce->save();
 		
-		$this->assertEqual($ulysses->getAuthorId(), $joyce->getAuthorId());
-		$this->assertIdentical($ulysses->getAuthor_Object(), $joyce);
+		$this->assertEquals($ulysses->getAuthorId(), $joyce->getAuthorId());
+		$this->assertSame($ulysses->getAuthor_Object(), $joyce);
 		
 		// case 2: author object saved, book is saved
 		$twain = new Author();
@@ -448,12 +446,12 @@
 		
 		$twain->addBook($huckFinn);
 		$booksByTwain = $twain->getBook_Collection();
-		$this->assertReference($booksByTwain[$huckFinn->getBookId()], $huckFinn);
+		$this->assertSame($booksByTwain[$huckFinn->getBookId()], $huckFinn);
 		
 		$twain->save();
 		
-		$this->assertEqual($huckFinn->getAuthorId(), $twain->getAuthorId());
-		$this->assertIdentical($huckFinn->getAuthor_Object(), $twain);
+		$this->assertEquals($huckFinn->getAuthorId(), $twain->getAuthorId());
+		$this->assertSame($huckFinn->getAuthor_Object(), $twain);
 		
 		// case 3: author object anonymous, book is anonymous
 		$murakami = new Author();
@@ -467,19 +465,19 @@
 		
 		$murakami->addBook($windup);
 		$booksByMurakami = $murakami->getBook_Collection();
-		$this->assertReference($booksByMurakami->getPosition(0), $windup);
+		$this->assertSame($booksByMurakami->getPosition(0), $windup);
 		
 		$murakami->save();
 		
-		$this->assertEqual($windup->getAuthorId(), $murakami->getAuthorId());
-		$this->assertIdentical($windup->getAuthor_Object(), $murakami);
+		$this->assertEquals($windup->getAuthorId(), $murakami->getAuthorId());
+		$this->assertSame($windup->getAuthor_Object(), $murakami);
 		
 		$this->resetCoughTestDatabase();
 		
 		$twain->save();
 		
-		$this->assertEqual($huckFinn->getAuthorId(), $twain->getAuthorId());
-		$this->assertIdentical($huckFinn->getAuthor_Object(), $twain);
+		$this->assertEquals($huckFinn->getAuthorId(), $twain->getAuthorId());
+		$this->assertSame($huckFinn->getAuthor_Object(), $twain);
 		
 		// case 4: author object is saved, book is anonymous
 		$heinlein = new Author();
@@ -494,12 +492,12 @@
 		
 		$heinlein->addBook($stranger);
 		$booksByHeinlein = $heinlein->getBook_Collection();
-		$this->assertReference($booksByHeinlein->getPosition(0), $stranger);
+		$this->assertSame($booksByHeinlein->getPosition(0), $stranger);
 		
 		$heinlein->save();
 		
-		$this->assertEqual($stranger->getAuthorId(), $heinlein->getAuthorId());
-		$this->assertIdentical($stranger->getAuthor_Object(), $heinlein);
+		$this->assertEquals($stranger->getAuthorId(), $heinlein->getAuthorId());
+		$this->assertSame($stranger->getAuthor_Object(), $heinlein);
 		
 		// test remove object
 		
@@ -524,29 +522,29 @@
 		$author->addBook($book);
 		$author->addBook($book2);
 		
-		$this->assertEqual(count($author->getBook_Collection()), 2);
+		$this->assertEquals(count($author->getBook_Collection()), 2);
 		
 		// $book2library = new Book2library();
 		// $book2library->setLibrary_Object($library);
 		// $book->addBook2library($book2library);
 		// $book2->addBook2library($book2library);
 		
-		// $this->db->getDb()->startLoggingQueries();
+		// self::$db->getDb()->startLoggingQueries();
 		
 		$author->save();
 		
 		// $this->dump($author->getBook_Collection());
-		// print_r($this->db->getDb()->getQueryLog());
+		// print_r(self::$db->getDb()->getQueryLog());
 		
 		$this->assertNotNull($author->getAuthorId());
 		
 		$this->assertNotNull($book->getBookId());
 		$this->assertNotNull($book->getAuthorId());
-		$this->assertIdentical($book->getAuthorId(), $author->getAuthorId());
+		$this->assertSame($book->getAuthorId(), $author->getAuthorId());
 		
 		$this->assertNotNull($book2->getBookId());
 		$this->assertNotNull($book2->getAuthorId());
-		$this->assertIdentical($book2->getAuthorId(), $author->getAuthorId());
+		$this->assertSame($book2->getAuthorId(), $author->getAuthorId());
 	}
 	
 	public function testManyToMany()
@@ -600,7 +598,7 @@
 		$sameLibrary = Library::constructByKey($library->getLibraryId());
 		$bookJoinsInTravis = $sameLibrary->getBook2library_Collection();
 		// $this->dump($bookJoinsInTravis);
-		$this->assertEqual(count($bookJoinsInTravis), 2);
+		$this->assertEquals(count($bookJoinsInTravis), 2);
 		
 		// This test is similar to the 4 that are commented out below, but this shows what is different
 		// AND it ignores the creation_datetime and last_modified_datetime differences b/c they are
@@ -623,23 +621,23 @@
 		
 		// these fail because the $book and $book2 don't have some default values set after save like creation_datetime
 		// (which is intentional; call load() after save if you want to get the updated data.)
-		// $this->assertIdentical($bookJoinsInTravis->getPosition(0)->getBook_Object(), $book);
-		// $this->assertIdentical($bookJoinsInTravis->getPosition(1)->getBook_Object(), $book2);
+		// $this->assertSame($bookJoinsInTravis->getPosition(0)->getBook_Object(), $book);
+		// $this->assertSame($bookJoinsInTravis->getPosition(1)->getBook_Object(), $book2);
 
-		$this->assertEqual($bookJoinsInTravis->getPosition(0)->getBook_Object()->getBookId(), $book->getBookId());
-		$this->assertEqual($bookJoinsInTravis->getPosition(1)->getBook_Object()->getBookId(), $book2->getBookId());
+		$this->assertEquals($bookJoinsInTravis->getPosition(0)->getBook_Object()->getBookId(), $book->getBookId());
+		$this->assertEquals($bookJoinsInTravis->getPosition(1)->getBook_Object()->getBookId(), $book2->getBookId());
 		
 		$sameLibrary2 = Library::constructByKey($library2->getLibraryId());
 		$bookJoinsInLbj = $sameLibrary2->getBook2library_Collection();
-		$this->assertEqual(count($bookJoinsInLbj), 2);
+		$this->assertEquals(count($bookJoinsInLbj), 2);
 		
 		// these fail because the $book and $book2 don't have some default values set after save like creation_datetime
 		// (which is intentional; call load() after save if you want to get the updated data.)
-		// $this->assertIdentical($bookJoinsInLbj->getPosition(0)->getBook_Object(), $book);
-		// $this->assertIdentical($bookJoinsInLbj->getPosition(1)->getBook_Object(), $book2);
+		// $this->assertSame($bookJoinsInLbj->getPosition(0)->getBook_Object(), $book);
+		// $this->assertSame($bookJoinsInLbj->getPosition(1)->getBook_Object(), $book2);
 
-		$this->assertEqual($bookJoinsInLbj->getPosition(0)->getBook_Object()->getBookId(), $book->getBookId());
-		$this->assertEqual($bookJoinsInLbj->getPosition(1)->getBook_Object()->getBookId(), $book2->getBookId());
+		$this->assertEquals($bookJoinsInLbj->getPosition(0)->getBook_Object()->getBookId(), $book->getBookId());
+		$this->assertEquals($bookJoinsInLbj->getPosition(1)->getBook_Object()->getBookId(), $book2->getBookId());
 	}
 	
 	public function testTransactions()
@@ -658,7 +656,7 @@
 		$authors = new Author_Collection();
 		$authors->load();
 		
-		$this->assertEqual(count($authors), 1);
+		$this->assertEquals(count($authors), 1);
 	}
 	
 	public function getFieldMismatches($object1, $object2)

=== renamed file 'tests/cough_generator/TestCoughGenerator.class.php' => 'tests/cough_generator/CoughGeneratorTest.class.php'
--- tests/cough_generator/TestCoughGenerator.class.php	2009-03-24 15:16:02 +0000
+++ tests/cough_generator/CoughGeneratorTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * This unit test's goal is to take three pieces of information (db_setup,
  * generator_config, and expected_output) and ensure that the given db_setup and
@@ -33,11 +32,11 @@
  * @package tests
  * @author Anthony Bush
  **/
-class TestCoughGenerator extends UnitTestCase
+class CoughGeneratorTest extends PHPUnit_Framework_TestCase
 {
-	protected $db = null;
+	protected static $db = null;
 	
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		// include cough generator, core cough, and the as_database DAL.
 		$coughRoot = dirname(dirname(dirname(__FILE__)));
@@ -51,10 +50,10 @@
 		CoughDatabaseFactory::addConfig($coughDbConfig);
 		
 		// Cache the db object for rest of tests
-		$this->db = CoughDatabaseFactory::getDatabase($dsn['db_name']);
-		
+		self::$db = CoughDatabaseFactory::getDatabase($dsn['db_name']);
+		self::$db->selectDb($dsn['db_name']);
 		// Clean DB before start
-		$this->dropAllTables();
+		self::dropAllTables();
 	}
 	
 	public function executeSqlFile($sqlFile)
@@ -66,7 +65,7 @@
 		array_pop($sqlCommands);
 
 		foreach ($sqlCommands as $sql) {
-			$this->db->query($sql);
+			self::$db->query($sql);
 		}
 	}
 	
@@ -87,12 +86,12 @@
 		rmdir($classPath);
 	}
 	
-	protected function dropAllTables()
+	protected static function dropAllTables()
 	{
-		$result = $this->db->query('SHOW TABLES');
+		$result = self::$db->query('SHOW TABLES');
 		while ($row = $result->getRow())
 		{
-			$this->db->query('DROP TABLE IF EXISTS ' . $this->db->backtick($row['Tables_in_test_cough_object']));
+			self::$db->query('DROP TABLE IF EXISTS ' . self::$db->backtick($row['Tables_in_test_cough_object']));
 		}
 	}
 	

=== renamed file 'tests/dal/TestCoughAsDatabase.class.php' => 'tests/dal/CoughAsDatabaseTest.class.php'
--- tests/dal/TestCoughAsDatabase.class.php	2009-03-24 15:02:40 +0000
+++ tests/dal/CoughAsDatabaseTest.class.php	2010-12-15 07:59:33 +0000
@@ -1,38 +1,37 @@
 <?php
-
-class TestCoughAsDatabase extends UnitTestCase
+class CoughAsDatabaseTest extends PHPUnit_Framework_TestCase
 {
 	//////////////////////////////////////
 	// Set Up
 	//////////////////////////////////////
 	
-	protected $db = null;
-	protected $adapterName = 'as';
-	protected $resultObjectClassName = 'As_DatabaseResult';
+	protected static $db = null;
+	protected static $adapterName = 'as';
+	protected static $resultObjectClassName = 'As_DatabaseResult';
 	
-	public function __construct()
+	public static function setUpBeforeClass()
 	{
 		// include core cough, and the as_database DAL.
 		require_once(dirname(dirname(dirname(__FILE__))) . '/cough/load.inc.php');
-		$this->loadAdapterModule();
-		$this->initDatabase();
+		self::loadAdapterModule();
+		self::initDatabase();
 	}
 	
-	public function loadAdapterModule()
+	public static function loadAdapterModule()
 	{
 		require_once(dirname(dirname(dirname(__FILE__))) . '/as_database2/load.inc.php');
 	}
 	
-	public function initDatabase()
+	public static function initDatabase()
 	{
 		// setup database
 		require(dirname(dirname(__FILE__)) . '/database_config.inc.php');
 		$testDbConfig = $dsn;
-		$testDbConfig['adapter'] = $this->adapterName;
+		$testDbConfig['adapter'] = self::$adapterName;
 		$testDbConfig['aliases'] = array($dsn['db_name']);
 		CoughDatabaseFactory::reset();
 		CoughDatabaseFactory::addConfig($testDbConfig);
-		$this->db = CoughDatabaseFactory::getDatabase($dsn['db_name']);
+		self::$db = CoughDatabaseFactory::getDatabase($dsn['db_name']);
 	}
 	
 	public function executeSqlFile($sqlFile)
@@ -44,7 +43,7 @@
 		array_pop($sqlCommands);
 
 		foreach ($sqlCommands as $sql) {
-			$this->db->execute($sql);
+			self::$db->execute($sql);
 		}
 	}
 	
@@ -78,8 +77,8 @@
 	
 	public function testQuery()
 	{
-		$result = $this->db->query('SELECT * FROM person');
-		$this->assertIsA($result, $this->resultObjectClassName);
+		$result = self::$db->query('SELECT * FROM person');
+		$this->assertInstanceOf(self::$resultObjectClassName, $result);
 		$expectedRows = array(
 			'0' => array(
 				'person_id' => '1',
@@ -102,25 +101,25 @@
 				'political_party_id' => '99'
 			)
 		);
-		$this->assertIdentical($result->getRows(), $expectedRows);
+		$this->assertSame($result->getRows(), $expectedRows);
 		
 		// test empty result
-		$result = $this->db->query('SELECT * FROM school_type_empty_table');
-		$this->assertIdentical($result->getRows(), array());
+		$result = self::$db->query('SELECT * FROM school_type_empty_table');
+		$this->assertSame($result->getRows(), array());
 		
 		// test derived field name
-		$result = $this->db->query('SELECT 3306 AS `port`');
+		$result = self::$db->query('SELECT 3306 AS `port`');
 		$expectedRows = array(array(
 			'port' => '3306'	
 		));
-		$this->assertIdentical($result->getRows(), $expectedRows);
+		$this->assertSame($result->getRows(), $expectedRows);
 		
 		// test select mysql function
-		$result = $this->db->query('SELECT COUNT(*) FROM person');
+		$result = self::$db->query('SELECT COUNT(*) FROM person');
 		$expectedRows = array(array(
 			'COUNT(*)' => '3'
 		));
-		$this->assertIdentical($result->getRows(), $expectedRows);
+		$this->assertSame($result->getRows(), $expectedRows);
 	}
 	
 	public function testExecute()
@@ -128,30 +127,30 @@
 		// test getLastInsertId before we have done any inserts
 		// NOTE: PDO returns string "0" and As_Database returns integer 0... I would prefer the return value to be 
 		// null, but perhaps this is not a meaningful issue
-		//$this->assertNull($this->db->getLastInsertId()); // currently fails
-		$this->assertEqual($this->db->getLastInsertId(), 0);
+		//$this->assertNull(self::$db->getLastInsertId()); // currently fails
+		$this->assertEquals(self::$db->getLastInsertId(), 0);
 		
 		// test execute insert
-		$numAffected = $this->db->execute("INSERT person VALUES ('', 'Venkman', 0, 3)");
-		$this->assertIdentical($numAffected, 1);
+		$numAffected = self::$db->execute("INSERT person VALUES ('', 'Venkman', 0, 3)");
+		$this->assertSame($numAffected, 1);
 		
 		// test getLastInsertId
 		// NOTE: PDO returns string 12, but As_Database returns integer 12... this may or may not be a discrepancy that
 		// needs to be resolved
-		$venkmanPersonId = $this->db->getLastInsertId();
-		//$this->assertIdentical($venkmanPersonId, 12); // currently fails
-		$this->assertEqual($venkmanPersonId, 12);
+		$venkmanPersonId = self::$db->getLastInsertId();
+		//$this->assertSame($venkmanPersonId, 12); // currently fails
+		$this->assertEquals($venkmanPersonId, 12);
 		
 		// test insert succeeded
-		$result = $this->db->getResult('SELECT person.name FROM person WHERE person.person_id = 12');
-		$this->assertIdentical($result, 'Venkman');
+		$result = self::$db->getResult('SELECT person.name FROM person WHERE person.person_id = 12');
+		$this->assertSame($result, 'Venkman');
 		
 		// test execute update
-		$numAffected = $this->db->execute('UPDATE person SET political_party_id = 4 WHERE political_party_id = 2');
-		$this->assertIdentical($numAffected, 2);
+		$numAffected = self::$db->execute('UPDATE person SET political_party_id = 4 WHERE political_party_id = 2');
+		$this->assertSame($numAffected, 2);
 		
 		// test update succeeded
-		$result = $this->db->query('SELECT name FROM person WHERE political_party_id = 4');
+		$result = self::$db->query('SELECT name FROM person WHERE political_party_id = 4');
 		$expectedRows = array(
 			'0' => array(
 				'name' => 'Anthony'
@@ -161,34 +160,34 @@
 				'name' => 'Lewis'
 			)
 		);
-		$this->assertIdentical($result->getRows(), $expectedRows);
+		$this->assertSame($result->getRows(), $expectedRows);
 		
 		// test execute delete
-		$numAffected = $this->db->execute('DELETE FROM person WHERE is_retired = 0');
-		$this->assertIdentical($numAffected, 4);
+		$numAffected = self::$db->execute('DELETE FROM person WHERE is_retired = 0');
+		$this->assertSame($numAffected, 4);
 		
 		// test delete succeeded
-		$result = $this->db->getResult('SELECT COUNT(*) FROM person');
-		$this->assertIdentical($result, '0');
+		$result = self::$db->getResult('SELECT COUNT(*) FROM person');
+		$this->assertSame($result, '0');
 	}
 	
 	public function testQuote()
 	{
 		// Test handling of magic_quotes_gpc (lack thereof), and escaping of characters
 		$acidString = "\000\n\r\032!@#^%&!@^%#!*@&#!()))()!(  .   . . ..\\\\.\\\"  \\'   // /./ x?? ddfsdfdsf je;;ee  //.. ,, SELECT * FROM person balhhh )";
-		$quotedString = $this->db->quote($acidString);
+		$quotedString = self::$db->quote($acidString);
 		$sql = 'UPDATE person SET person.name = ' . $quotedString;
-		$this->db->execute($sql);
+		self::$db->execute($sql);
 		
 		// Not all DB layers support LIMIT
 		// $sql = 'SELECT person.name FROM person LIMIT 1';
-		$sql = $this->db->getSelectQuery();
+		$sql = self::$db->getSelectQuery();
 		$sql->setSelect('person.name');
 		$sql->setFrom('person');
 		$sql->setLimit(1);
 		
-		$returnedString = $this->db->getResult($sql);
-		$this->assertEqual($acidString, $returnedString);
+		$returnedString = self::$db->getResult($sql);
+		$this->assertEquals($acidString, $returnedString);
 	}
 }
 

=== modified file 'tests/database_config.inc.php'
--- tests/database_config.inc.php	2008-11-13 03:44:26 +0000
+++ tests/database_config.inc.php	2010-12-15 07:59:33 +0000
@@ -8,16 +8,22 @@
  * <code>
  * CREATE DATABASE test_cough_object;
  * GRANT USAGE ON `test_cough_object`.* TO `cough_test`@`localhost` IDENTIFIED BY 'cough_test';
+ * CREATE DATABASE reports;
+ * GRANT USAGE ON `reports`.* TO `cough_test`@`localhost` IDENTIFIED BY 'cough_test';
+ * CREATE DATABASE actual_db_name;
+ * GRANT USAGE ON `actual_db_name`.* TO `cough_test`@`localhost` IDENTIFIED BY 'cough_test';
+ * CREATE DATABASE testConfigAlias;
+ * GRANT USAGE ON `testConfigAlias`.* TO `cough_test`@`localhost` IDENTIFIED BY 'cough_test';
  * FLUSH PRIVILEGES;
  * </code>
  * 
  * @var array
  **/
 $dsn = array(
-	'host' => 'localhost',
+	'host' => '',
 	'user' => 'cough_test',
 	'pass' => 'cough_test',
-	'port' => 3306,
+	'port' => ':/tmp/mysql.sock',
 	'driver' => 'mysql',
 	'db_name' => 'test_cough_object',
 );

=== added file 'tests/phpunit-after.xml'
--- tests/phpunit-after.xml	1970-01-01 00:00:00 +0000
+++ tests/phpunit-after.xml	2010-12-15 07:59:33 +0000
@@ -0,0 +1,8 @@
+<phpunit>
+	<testsuites>
+		<testsuite name="Autoloader Cache File Test Suite">
+			<directory>autoloader/*Test.class.php files</directory>
+			<file>autoloader/AutoloaderCacheFileTest.class.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file

=== added file 'tests/phpunit.xml'
--- tests/phpunit.xml	1970-01-01 00:00:00 +0000
+++ tests/phpunit.xml	2010-12-15 07:59:33 +0000
@@ -0,0 +1,23 @@
+<phpunit>
+	<testsuites>
+		<testsuite name="CoughPHP Test Suite">
+			<directory>cough/*Test.class.php files</directory>
+			<file>cough/CoughCollectionTest.class.php</file>
+			<file>cough/CoughDatabaseFactoryTest.class.php</file>
+			<file>cough/CoughInstancePoolTest.class.php</file>
+			<file>cough/CoughObjectTest.class.php</file>
+		</testsuite>
+		<testsuite name="CoughPHP Generator Test Suite">
+			<directory>cough_generator/*Test.class.php files</directory>
+			<file>cough_generator/CoughGeneratorTest.class.php</file>
+		</testsuite>
+		<testsuite name="CoughPHP DAL Test Suite">
+			<directory>dal/*Test.class.php files</directory>
+			<file>dal/CoughAsDatabaseTest.class.php</file>
+		</testsuite>
+		<testsuite name="Autoloader Test Suite">
+			<directory>autoloader/*Test.class.php files</directory>
+			<file>autoloader/AutoloaderTest.class.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file