summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricewind1991 <icewind1991@gmail.com>2013-05-11 14:22:08 -0700
committericewind1991 <icewind1991@gmail.com>2013-05-11 14:22:08 -0700
commitdd4a31df48b17ec5062033444a8dcd34600a12a3 (patch)
tree931e980675f3686ed74989ab3291b49058c8f884
parentea88e295d39275ff04aa5b8bbd98b0abfb6ec4aa (diff)
parent0d852dce3b060537ceb1418d97d00426f437527c (diff)
downloadnextcloud-server-dd4a31df48b17ec5062033444a8dcd34600a12a3.tar.gz
nextcloud-server-dd4a31df48b17ec5062033444a8dcd34600a12a3.zip
Merge pull request #3309 from owncloud/no_explicit_autoload
Use new autoloader class in tests
-rw-r--r--tests/lib/public/contacts.php2
-rw-r--r--tests/lib/template.php7
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index ce5d762226b..d6008876a00 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,8 +19,6 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-OC::autoload('OCP\Contacts');
-
class Test_Contacts extends PHPUnit_Framework_TestCase
{
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 6e88d4c07fc..fd12119da58 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -20,10 +20,13 @@
*
*/
-OC::autoload('OC_Template');
-
class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
+ public function setUp() {
+ $loader = new \OC\Autoloader();
+ $loader->load('OC_Template');
+ }
+
public function testP() {
// FIXME: do we need more testcases?
$htmlString = "<script>alert('xss');</script>";