From 79e3f4e121146254a8e17c3bd271679c815eca8c Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 18 Apr 2011 22:39:06 +0200
Subject: make import test easier

---
 tests/Api/PostsAddTest.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 4b0bb0a..1bd6174 100644
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -514,7 +514,7 @@ TXT;
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 1))
         );
-        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1');
+        list($req, $uId) = $this->getLoggedInRequest();
         $req->setMethod(HTTP_Request2::METHOD_POST);
         $req->setUrl($GLOBALS['unittestUrl'] . 'importNetscape.php' . '?unittestMode=1');
         $req->addUpload('userfile', dirname(__FILE__) . '/../data/BookmarkTest_netscapebookmarks.html');
@@ -538,18 +538,13 @@ TXT;
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 2))
         );
-        list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
+        list($req, $uId) = $this->getLoggedInRequest();
         $req->setMethod(HTTP_Request2::METHOD_POST);
         $req->setUrl($GLOBALS['unittestUrl'] . 'import.php' . '?unittestMode=1');
-        $testcookiekey = md5($GLOBALS['dbname'].$GLOBALS['tableprefix']).'-login';
-        $userinfo = $this->us->getUser($uId);
-        $testcookiepassword = $userinfo['password'];
-        $testusername = $userinfo['username'];
-        $testcookievalue = $uId . ':' . md5($testusername . $testcookiepassword);
-        $req->setCookieJar(true);
-        $req->addCookie($testcookiekey, $testcookievalue);
         $req->addUpload('userfile', dirname(__FILE__) . '/../data/BookmarkTest_deliciousbookmarks.xml');
-        $req->send();
+        $res = $req->send();
+        $this->assertEquals(302, $res->getStatus(), 'Bookmark import failed');
+
         $this->us->setCurrentUserId($uId);
         $bms = $this->bs->getBookmarks(0, null, $uId);
         $this->assertEquals(3, count($bms['bookmarks']));
-- 
cgit v1.2.3-54-g00ecf