Development

Changeset 7432

You must first sign up to be able to contribute.

Changeset 7432

Show
Ignore:
Timestamp:
02/09/08 14:54:32 (8 months ago)
Author:
fabien
Message:

refactored symfony core unit test bootstrap files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/plugins/sfCompat10Plugin/test/bootstrap/unit.php

    r7304 r7432  
    99 */ 
    1010 
    11 $_test_dir = realpath(dirname(__FILE__).'/..'); 
    12 require_once($_test_dir.'/../../../vendor/lime/lime.php'); 
    13 require_once($_test_dir.'/../../../config/sfConfig.class.php'); 
    14 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib')); 
     11require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php'); 
    1512 
    1613require_once(dirname(__FILE__).'/../../../../autoload/sfSimpleAutoload.class.php'); 
    17 require_once(dirname(__FILE__).'/../../../../util/sfToolkit.class.php'); 
    18 $autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_%s.data', md5(__FILE__))); 
    19 $autoload->addDirectory(realpath(dirname(__FILE__).'/../../../..')); 
     14$autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_compat10_%s.data', md5(__FILE__))); 
    2015$autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib')); 
    21 $autoload->addFile(dirname(__FILE__).'/../../../../exception/sfValidatorException.class.php'); 
    2216$autoload->register(); 
    2317 
    24 sfConfig::set('sf_test_cache_dir', sfToolkit::getTmpDir()); 
    25  
    26 class sfException extends Exception 
    27 { 
    28   private $name = null; 
    29  
    30   protected function setName($name) 
    31   { 
    32     $this->name = $name; 
    33   } 
    34  
    35   public function getName() 
    36   { 
    37     return $this->name; 
    38   } 
    39 } 
     18$_test_dir = realpath(dirname(__FILE__).'/..'); 

  • branches/1.1/lib/plugins/sfCompat10Plugin/test/unit/config/sfValidatorConfigHandlerTest.php

    r5320 r7432  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    1313$t = new lime_test(1, new lime_output_color()); 

  • branches/1.1/lib/plugins/sfCompat10Plugin/test/unit/sfMailTest.php

    r5106 r7432  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../bootstrap/unit.php'); 
    1212 
    1313$t = new lime_test(2, new lime_output_color()); 

  • branches/1.1/lib/plugins/sfPropelPlugin/test/unit/database/sfPropelDatabaseTest.php

    r6462 r7432  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212set_include_path(sfConfig::get('sf_symfony_lib_dir').'/plugins/sfPropelPlugin/lib/vendor'.PATH_SEPARATOR.get_include_path()); 
    1313 

  • branches/1.1/lib/plugins/sfPropelPlugin/test/unit/sfMixerTest.php

    r5105 r7432  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../bootstrap/unit.php'); 
    1212 
    13 $o = new lime_output_color(); 
    14 $t = new lime_test(10, $o); 
     13$t = new lime_test(10, new lime_output_color()); 
    1514 
    1615class myClass 

  • branches/1.1/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php

    r7394 r7432  
    1010 */ 
    1111 
    12 require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php'); 
     12require_once(dirname(__FILE__).'/../bootstrap/unit.php'); 
    1313 
    1414class my_lime_test extends lime_test 

  • branches/1.1/test/bootstrap/unit.php

    r7322 r7432  
    2222sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib')); 
    2323 
    24 require_once(dirname(__FILE__).'/../../lib/autoload/sfSimpleAutoload.class.php'); 
     24require_once(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php'); 
     25sfCoreAutoload::register(); 
     26 
    2527require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php'); 
    26 $autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_%s.data', md5(__FILE__))); 
    27 $autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib')); 
    28 $autoload->register(); 
    29  
    3028sfConfig::set('sf_test_cache_dir', sfToolkit::getTmpDir()); 
    31  
    32 class sfException extends Exception 
    33 { 
    34   private $name = null; 
    35  
    36   protected function setName($name) 
    37   { 
    38     $this->name = $name; 
    39   } 
    40  
    41   public function getName() 
    42   { 
    43     return $this->name; 
    44   } 
    45 } 

  • branches/1.1/test/unit/exception/sfExceptionsTest.php

    r6683 r7432  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    13 $t = new lime_test(17, new lime_output_color()); 
     13$t = new lime_test(16, new lime_output_color()); 
    1414 
    1515foreach (array( 
    1616  'cache', 'configuration', 'controller', 'database',  
    1717  'error404', 'factory', 'file', 'filter', 'forward', 'initialization', 'parse', 'render', 'security', 
    18   'stop', 'storage', 'validator', 'view' 
     18  'stop', 'storage', 'view' 
    1919) as $class) 
    2020{