Moved DB unit tests from .\test-phpUnit to .\tests folder.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9788 201d5d3c-b55e-5fd7-737f-ddc643e51545

test-phpUnit/debug.php

@@ -1,12 +0,0 @@
-<?php 
-	require('config/config.inc.php');        
-  
-	$oDB = &DB::getInstance('mssql');
-	//$oDB = &DB::getInstance();
-	$dbParser = $oDB->getParser();
-	$dbParser = new DBParser('[', ']');
-	$parser = new QueryParser($xml_obj->query, $dbParser);
-	$query_file = $parser->toString();
-	var_dump($parser->toString());
-
-?>

tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php

@@ -1,6 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
-
          /**
          * Test class for TableTag.
          */

tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php

@@ -1,6 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
-
          /**
          * Test class for TablesTag.
          */

tests/classes/db/config/config.inc.php

@@ -1,36 +1,30 @@
 <?php
 	error_reporting(E_ALL ^ E_NOTICE);
-	define('_XE_PATH_', str_replace('test-phpUnit/config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
-	define('_TEST_PATH_', _XE_PATH_ . 'test-phpUnit/');
+	define('_XE_PATH_', str_replace('tests/classes/db/config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
+	define('_TEST_PATH_', _XE_PATH_ . 'tests/classes/db/');
 
 	if(!defined('__DEBUG__')) define('__DEBUG__', 4);
         define('__ZBXE__', true);
         define('__XE__',   true);
 
-	require_once(_XE_PATH_.'test-phpUnit/Helper.class.php');
-        require_once(_XE_PATH_.'test-phpUnit/QueryTester.class.php');
-	require_once(_XE_PATH_.'test-phpUnit/db/DBTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/CubridTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/CubridOnlineTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/MssqlTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/MssqlOnlineTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/MysqlTest.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/SqliteTest.php');
+	require_once(_TEST_PATH_.'Helper.class.php');
+        require_once(_TEST_PATH_.'QueryTester.class.php');
+	require_once(_TEST_PATH_.'db/DBTest.php');
+        require_once(_TEST_PATH_.'db/CubridTest.php');
+        require_once(_TEST_PATH_.'db/CubridOnlineTest.php');
+        require_once(_TEST_PATH_.'db/MssqlTest.php');
+        require_once(_TEST_PATH_.'db/MssqlOnlineTest.php');
+        require_once(_TEST_PATH_.'db/MysqlTest.php');
+        require_once(_TEST_PATH_.'db/SqliteTest.php');
 
         require_once(_XE_PATH_.'config/config.inc.php');
-//	require_once(_XE_PATH_.'classes/object/Object.class.php');
-//	require_once(_XE_PATH_.'classes/handler/Handler.class.php');
-//	require_once(_XE_PATH_.'classes/context/Context.class.php');
-//	require_once(_XE_PATH_.'classes/file/FileHandler.class.php');
-//	require_once(_XE_PATH_.'classes/xml/XmlParser.class.php');
 	require_once(_XE_PATH_.'classes/xml/XmlQueryParser.150.class.php');
-//
 
 	require_once(_XE_PATH_.'classes/db/DB.class.php');
 	require_once(_XE_PATH_.'classes/db/DBCubrid.class.php');
 	require_once(_XE_PATH_.'classes/db/DBMssql.class.php');
         require_once(_XE_PATH_.'classes/db/DBMysql.class.php');
-        require_once(_XE_PATH_.'test-phpUnit/db/MockDb.php');
+        require_once(_TEST_PATH_.'db/MockDb.php');
 
     require_once(_XE_PATH_.'classes/xml/xmlquery/DBParser.class.php');
     require_once(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');

tests/classes/db/db/DBTest.php

@@ -1,5 +1,6 @@
 <?php
-    class DBTest extends PHPUnit_Framework_TestCase {
+
+class DBTest extends PHPUnit_Framework_TestCase {
 
         function _testQuery($xml_file, $argsString, $expected, $methodName, $columnList = null){
                 echo PHP_EOL . ' ----------------------------------- ' .PHP_EOL;

tests/classes/db/db/ExpressionParserTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class ExpressionParserTest extends PHPUnit_Framework_TestCase {
 		/* Escape char for:

tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php

@@ -1,7 +1,6 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
-	class CubridDeleteTest extends CubridTest {
+        class CubridDeleteTest extends CubridTest {
 
 		function _test($xml_file, $argsString, $expected){
                     $this->_testQuery($xml_file, $argsString, $expected,  'getDeleteSql');

tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class CubridInsertTest extends CubridTest {
 

tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class CubridSelectTest extends CubridTest {
 

tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class CubridUpdateTest extends CubridTest {
 

tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class MssqlSelectTest extends MssqlTest {
 

tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class MssqlUpdateTest extends MssqlTest {
 

tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class MysqlSelectTest extends MysqlTest {
 

tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php

@@ -1,7 +1,6 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
-	class MysqlUpdateTest extends MysqlTest {
+        class MysqlUpdateTest extends MysqlTest {
 
                 function _test($xml_file, $argsString, $expected, $columnList = null){
                     $this->_testQuery($xml_file, $argsString, $expected, 'getUpdateSql', $columnList);

tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class SqliteDeleteTest extends SqliteTest {
 

tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php

@@ -1,5 +1,4 @@
 <?php
-	require(_XE_PATH_ . 'test-phpUnit/config/config.inc.php');
 
 	class SqliteUpdateTest extends SqliteTest {