Changeset 8295

Timestamp:

04/04/08 18:02:20 (2 years ago)

Author:

fabien

Message:

moved Propel initialization and fixtures loading in ProjectConfiguration? in Propel functional tests

Files:

• branches/1.1/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php (modified) (2 diffs)
• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php (modified) (1 diff)

branches/1.1/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php

@@ -23 +23 @@
-$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
-sfContext::createInstance($configuration);
-$dispatcher = $configuration->getEventDispatcher();
-
-// remove all cache
-sf_functional_test_shutdown();
+
+$configuration->initializePropel();
+if (isset($fixtures))
+{
+  $configuration->loadFixtures($fixtures);
+}
-
-register_shutdown_function('sf_functional_test_shutdown');
@@ -36 +41 @@
-}
-
-// build Propel om/map/sql/forms
-$files = glob(sfConfig::get('sf_lib_dir').'/model/om/*.php');
-if (false === $files || !count($files))
-{
-  chdir(sfConfig::get('sf_root_dir'));
-  $task = new sfPropelBuildModelTask($dispatcher, new sfFormatter());
-  ob_start();
-  $task->run();
-  $output = ob_get_clean();
-}
-
-$files = glob(sfConfig::get('sf_data_dir').'/sql/*.php');
-if (false === $files || !count($files))
-{
-  chdir(sfConfig::get('sf_root_dir'));
-  $task = new sfPropelBuildSqlTask($dispatcher, new sfFormatter());
-  ob_start();
-  $task->run();
-  $output = ob_get_clean();
-}
-
-$files = glob(sfConfig::get('sf_lib_dir').'/form/base/*.php');
-if (false === $files || !count($files))
-{
-  chdir(sfConfig::get('sf_root_dir'));
-  $task = new sfPropelBuildFormsTask($dispatcher, new sfFormatter());
-  $task->run();
-}
-
-if (isset($fixtures))
-{
-  // initialize database manager
-  $databaseManager = new sfDatabaseManager($configuration);
-
-  // cleanup database
-  $db = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'/database.sqlite';
-  if (file_exists($db))
-  {
-    unlink($db);
-  }
-
-  // initialize database
-  $sql = file_get_contents(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.'lib.model.schema.sql');
-  $sql = preg_replace('/^\s*\-\-.+$/m', '', $sql);
-  $sql = preg_replace('/^\s*DROP TABLE .+?$/m', '', $sql);
-  $con = Propel::getConnection();
-  $tables = preg_split('/CREATE TABLE/', $sql);
-  foreach ($tables as $table)
-  {
-    $table = trim($table);
-    if (!$table)
-    {
-      continue;
-    }
-
-    $con->executeQuery('CREATE TABLE '.$table);
-  }
-
-  // load fixtures
-  $data = new sfPropelData();
-  if (is_array($fixtures))
-  {
-    $data->loadDataFromArray($fixtures);
-  }
-  else
-  {
-    $data->loadData(sfConfig::get('sf_data_dir').'/'.$fixtures);
-  }
-}
-
-return true;

branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php

@@ -9 +9 @@
-  {
-  }
+
+  public function initializePropel()
+  {
+    // build Propel om/map/sql/forms
+    $files = glob(sfConfig::get('sf_lib_dir').'/model/om/*.php');
+    if (false === $files || !count($files))
+    {
+      chdir(sfConfig::get('sf_root_dir'));
+      $task = new sfPropelBuildModelTask($this->dispatcher, new sfFormatter());
+      ob_start();
+      $task->run();
+      $output = ob_get_clean();
+    }
+
+    $files = glob(sfConfig::get('sf_data_dir').'/sql/*.php');
+    if (false === $files || !count($files))
+    {
+      chdir(sfConfig::get('sf_root_dir'));
+      $task = new sfPropelBuildSqlTask($this->dispatcher, new sfFormatter());
+      ob_start();
+      $task->run();
+      $output = ob_get_clean();
+    }
+
+    $files = glob(sfConfig::get('sf_lib_dir').'/form/base/*.php');
+    if (false === $files || !count($files))
+    {
+      chdir(sfConfig::get('sf_root_dir'));
+      $task = new sfPropelBuildFormsTask($this->dispatcher, new sfFormatter());
+      $task->run();
+    }
+  }
+
+  public function loadFixtures($fixtures)
+  {
+    // initialize database manager
+    $databaseManager = new sfDatabaseManager($this);
+
+    // cleanup database
+    $db = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'/database.sqlite';
+    if (file_exists($db))
+    {
+      unlink($db);
+    }
+
+    // initialize database
+    $sql = file_get_contents(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.'lib.model.schema.sql');
+    $sql = preg_replace('/^\s*\-\-.+$/m', '', $sql);
+    $sql = preg_replace('/^\s*DROP TABLE .+?$/m', '', $sql);
+    $con = Propel::getConnection();
+    $tables = preg_split('/CREATE TABLE/', $sql);
+    foreach ($tables as $table)
+    {
+      $table = trim($table);
+      if (!$table)
+      {
+        continue;
+      }
+
+      $con->executeQuery('CREATE TABLE '.$table);
+    }
+
+    // load fixtures
+    $data = new sfPropelData();
+    if (is_array($fixtures))
+    {
+      $data->loadDataFromArray($fixtures);
+    }
+    else
+    {
+      $data->loadData(sfConfig::get('sf_data_dir').'/'.$fixtures);
+    }
+  }
-}