From 34bb8675759665e3f7d04d3fe3f2f46a41bdcc58 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 19 Mar 2012 14:30:13 -0400
Subject: [PATCH] Minor test cleanup

---
 tests/databases/mysql-qb.php | 204 -----------------------------------
 tests/databases/odbc.php     |   5 -
 2 files changed, 209 deletions(-)

diff --git a/tests/databases/mysql-qb.php b/tests/databases/mysql-qb.php
index 4e35202..3899d07 100644
--- a/tests/databases/mysql-qb.php
+++ b/tests/databases/mysql-qb.php
@@ -36,208 +36,4 @@ class MySQLQBTest extends QBTest {
 	{
 		$this->assertTrue(in_array('mysql', pdo_drivers()));
 	}
-	
-	function TestGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test');
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimit()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test', 2);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimitSkip()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test', 2, 1);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectWhereGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->where('id >', 1)
-			->where('id <', 900)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectWhereGet2()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->where('id !=', 1)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromLimitGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->limit(3)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderBy()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderByRandom()
-	{
-		if (empty($this->db))  return;
-		
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'rand')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGroupBy()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->group_by('k')
-			->group_by('val')
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrWhere()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where(' id ', 1)
-			->or_where('key >', 0)
-			->limit(2, 1)
-			->get();
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestLike()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->from('create_test')
-			->like('key', 'og')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestJoin()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->from('create_test')
-			->join('create_join cj', 'cj.id = create_test.id')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestInsert()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->set('id', 4)
-			->set('key', 4)
-			->set('val', 5)
-			->insert('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestUpdate()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->set('id', 4)
-			->set('key', 'gogle')
-			->set('val', 'non-word')
-			->where('id', 4)
-			->update('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestDelete()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->where('id', 4)->delete('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
 }
\ No newline at end of file
diff --git a/tests/databases/odbc.php b/tests/databases/odbc.php
index aaf849e..50b2098 100644
--- a/tests/databases/odbc.php
+++ b/tests/databases/odbc.php
@@ -18,11 +18,6 @@
  * @extends UnitTestCase
  */
 class ODBCTest extends UnitTestCase {
-
-	function __construct()
-	{
-	
-	}
 	
 	function TestExists()
 	{