From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 6 Apr 2011 07:50:42 +0000 (+0200)
Subject: move unittest config deletion to setup since that makes it easier to debug, and does... 
X-Git-Tag: v0.98.0~46^2~19
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=366987a97d41f1a276dfd43921a2fcf1f6e70f00;p=semanticscuttle.git

move unittest config deletion to setup since that makes it easier to debug, and does not break config when the test fatal errored
---

diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php
index 73135fb..9081a4a 100644
--- a/tests/TestBaseApi.php
+++ b/tests/TestBaseApi.php
@@ -47,6 +47,11 @@ class TestBaseApi extends TestBase
         }
         $this->url = $GLOBALS['unittestUrl'] . $this->urlPart;
 
+        //clean up before test
+        if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) {
+            unlink($GLOBALS['datadir'] . '/config.unittest.php');
+        }
+
         $this->us = SemanticScuttle_Service_Factory::get('User');
         $this->us->deleteAll();
         $this->bs = SemanticScuttle_Service_Factory::get('Bookmark');
@@ -57,18 +62,6 @@ class TestBaseApi extends TestBase
 
 
 
-    /**
-     * Clean up after test
-     */
-    public function tearDown()
-    {
-        if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) {
-            unlink($GLOBALS['datadir'] . '/config.unittest.php');
-        }
-    }
-
-
-
     /**
      * Gets a HTTP request object.
      * Uses $this->url plus $urlSuffix as request URL.