[limb-svn] r6887 - 3.x/trunk/limb/active_record/tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2008-04-02 00:32:33 +0400 (Wed, 02 Apr 2008)
New Revision: 6887
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6887

Modified:
   3.x/trunk/limb/active_record/tests/cases/.setup.php
   3.x/trunk/limb/active_record/tests/cases/.skipif.php
Log:
-- fixing active_record tests fixtures

Modified: 3.x/trunk/limb/active_record/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/.setup.php	2008-04-01 20:01:59 UTC (rev 6886)
+++ 3.x/trunk/limb/active_record/tests/cases/.setup.php	2008-04-01 20:32:33 UTC (rev 6887)
@@ -1,20 +1,5 @@
 <?php
-if(!defined('LIMB_VAR_DIR'))
-{
-  @define('LIMB_VAR_DIR', dirname(__FILE__) . '/../../../var');
-  if(!is_dir(LIMB_VAR_DIR) && !mkdir(LIMB_VAR_DIR))
-    throw new Exception("Could not create LIMB_VAR_DIR at '" . LIMB_VAR_DIR . "' during tests execution");
-}
-
 require_once(dirname(__FILE__) . '/../../common.inc.php');
-if(!lmbToolkit::instance()->isDefaultDbDSNAvailable())
-{
-  $dsn = 'sqlite://localhost/' . LIMB_VAR_DIR . '/sqlite_tests.db';
-  echo "Using default sqlite test database '$dsn'\n";
-  lmbToolkit::instance()->setDefaultDbDSN($dsn);
-}
-
-require_once(dirname(__FILE__) . '/../../common.inc.php');
 require_once('limb/dbal/src/lmbDbDump.class.php');
 require_once('limb/core/src/lmbSet.class.php');
 require_once('limb/core/src/lmbCollection.class.php');

Modified: 3.x/trunk/limb/active_record/tests/cases/.skipif.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/.skipif.php	2008-04-01 20:01:59 UTC (rev 6886)
+++ 3.x/trunk/limb/active_record/tests/cases/.skipif.php	2008-04-01 20:32:33 UTC (rev 6887)
@@ -1,6 +1,20 @@
 <?php
+if(!defined('LIMB_VAR_DIR'))
+{
+  @define('LIMB_VAR_DIR', dirname(__FILE__) . '/../../../var');
+  if(!is_dir(LIMB_VAR_DIR) && !mkdir(LIMB_VAR_DIR))
+    throw new Exception("Could not create LIMB_VAR_DIR at '" . LIMB_VAR_DIR . "' during tests execution");
+}
+
 require_once(dirname(__FILE__) . '/../../common.inc.php');
 
+if(!lmbToolkit::instance()->isDefaultDbDSNAvailable())
+{
+  $dsn = 'sqlite://localhost/' . LIMB_VAR_DIR . '/sqlite_tests.db';
+  echo "Using default sqlite test database '$dsn'\n";
+  lmbToolkit::instance()->setDefaultDbDSN($dsn);
+}
+
 $type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
 $skip = !file_exists(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
 $test_dir = basename(dirname(__FILE__));