Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 62741 invoked from network); 31 Jan 2010 21:32:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Jan 2010 21:32:23 -0000 Received: (qmail 87588 invoked by uid 500); 31 Jan 2010 21:32:23 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 87553 invoked by uid 500); 31 Jan 2010 21:32:22 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 87543 invoked by uid 99); 31 Jan 2010 21:32:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Jan 2010 21:32:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Jan 2010 21:32:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7579F2388A02; Sun, 31 Jan 2010 21:32:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905126 - /incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Date: Sun, 31 Jan 2010 21:32:01 -0000 To: esme-commits@incubator.apache.org From: esjewett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100131213201.7579F2388A02@eris.apache.org> Author: esjewett Date: Sun Jan 31 21:32:01 2010 New Revision: 905126 URL: http://svn.apache.org/viewvc?rev=905126&view=rev Log: Fix API2 tests to use existing tokens rather than creating a new token for each test Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=905126&r1=905125&r2=905126&view=diff ============================================================================== --- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original) +++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Sun Jan 31 21:32:01 2010 @@ -24,6 +24,7 @@ import org.specs.runner.ConsoleRunner import net.liftweb.util._ import net.liftweb.common._ +import net.liftweb.mapper.{By} import org.specs.matcher._ import Helpers._ import net.sourceforge.jwebunit.junit.WebTester @@ -51,10 +52,7 @@ // role in the test.default.props file. val theUser = find_or_create_user("api_test") - val token = { - val toke = AuthToken.create.user(theUser).saveMe - toke.uniqueId.is - } + val token = find_or_create_token(theUser) val post_session = post("session", "token" -> token) @@ -67,6 +65,17 @@ val session = new LiftSession(Helpers.randomString(20), "", Empty) S.initIfUninitted(session) {User.createAndPopulate.nickname(userName).saveMe} } + } + + def find_or_create_token(tokenUser: User): String = { + val token: Box[AuthToken] = AuthToken.find(By(AuthToken.user,tokenUser)) + + if(token.isDefined) + token.open_!.uniqueId.is + else { + val toke = AuthToken.create.user(tokenUser).saveMe + toke.uniqueId.is + } } def sleep(wait: Long): Box[Boolean] = { @@ -164,9 +173,8 @@ } "with a valid session but no role authorization returns 403 (forbidden)" in { - val new_user = find_or_create_user("tester") - val new_toke = AuthToken.create.user(new_user).saveMe - val new_token = new_toke.uniqueId.is + val new_user = find_or_create_user("tester2") + val new_token = find_or_create_token(new_user) for{ sess <- post("session", "token" -> new_token) @@ -190,9 +198,8 @@ } "/users/USERID/tokens GET" in { - val new_user = find_or_create_user("tester") - val new_toke = AuthToken.create.user(new_user).saveMe - val new_token = new_toke.uniqueId.is + val new_user = find_or_create_user("tester3") + val new_token = find_or_create_token(new_user) "with valid session" in { for{ @@ -205,9 +212,8 @@ } "with valid session but no role authorization returns 403 (forbidden)" in { - val new_user = find_or_create_user("tester") - val new_toke = AuthToken.create.user(new_user).saveMe - val new_token = new_toke.uniqueId.is + val new_user = find_or_create_user("tester4") + val new_token = find_or_create_token(new_user) for{ sess <- post("session", "token" -> new_token) @@ -227,7 +233,7 @@ } "/users/USERID/tokens POST" in { - val new_user = find_or_create_user("tester") + val new_user = find_or_create_user("tester5") "with valid session" in { for{ @@ -243,9 +249,8 @@ } "with valid session but no role authorization returns 403 (forbidden)" in { - val new_user = find_or_create_user("tester") - val new_toke = AuthToken.create.user(new_user).saveMe - val new_token = new_toke.uniqueId.is + val new_user = find_or_create_user("tester6") + val new_token = find_or_create_token(new_user) for{ sess <- post("session", "token" -> new_token) @@ -765,8 +770,7 @@ "with valid session and new messages but no pool authorization returns 403 (forbidden)" in { val new_user = find_or_create_user("tester6") - val new_toke = AuthToken.create.user(new_user).saveMe - val new_token = new_toke.uniqueId.is + val new_token = find_or_create_token(new_user) for{ sess <- post_session