CRM-17860 - CiviTester - Split into separate class files

[civicrm-core.git] / tests / phpunit / CiviTest / CiviUnitTestCase.php

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
old mode 100755 (executable)
new mode 100644 (file)
index 7457569..c92568a
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -89,11 +89,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    */
   protected $tempDirs;
 
-  /**
-   * @var Utils instance
-   */
-  public static $utils;
-
   /**
    * @var boolean populateOnce allows to skip db resets in setUp
    *
@@ -160,9 +155,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
 
     self::$_dbName = self::getDBName();
 
-    //  create test database
-    self::$utils = new CiviTestPdoUtils(CIVICRM_DSN);
-
     // also load the class loader
     require_once 'CRM/Core/ClassLoader.php';
     CRM_Core_ClassLoader::singleton()->register();
@@ -228,7 +220,8 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
 
       self::$dbInit = TRUE;
     }
-    return $this->createDefaultDBConnection(self::$utils->pdo, $dbName);
+
+    return $this->createDefaultDBConnection(Civi\Test::pdo(), $dbName);
   }
 
   /**
@@ -260,7 +253,9 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
     }
     self::$populateOnce = NULL;
 
-    return CiviTestDB::realPopulateDB(self::getDBName(), self::$utils);
+    Civi\Test::data()->populate();
+
+    return TRUE;
   }
 
   public static function setUpBeforeClass() {
@@ -416,7 +411,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
 
     $this->cleanTempDirs();
     $this->unsetExtensionSystem();
-    $this->clearOutputBuffer();
   }
 
   /**
@@ -3226,12 +3220,6 @@ AND    ( TABLE_NAME LIKE 'civicrm_value_%' )
     }
   }
 
-  public function clearOutputBuffer() {
-    while (ob_get_level() > 0) {
-      ob_end_clean();
-    }
-  }
-
   /**
    * Assert the attachment exists.
    *