Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 3647 invoked from network); 14 Nov 2009 00:09:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Nov 2009 00:09:52 -0000 Received: (qmail 93341 invoked by uid 500); 14 Nov 2009 00:09:52 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 93315 invoked by uid 500); 14 Nov 2009 00:09:52 -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 93305 invoked by uid 99); 14 Nov 2009 00:09:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Nov 2009 00:09:52 +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; Sat, 14 Nov 2009 00:09:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD4492388A0F; Sat, 14 Nov 2009 00:09:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r836072 - /incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala Date: Sat, 14 Nov 2009 00:09:28 -0000 To: esme-commits@incubator.apache.org From: dpp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091114000928.CD4492388A0F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dpp Date: Sat Nov 14 00:09:27 2009 New Revision: 836072 URL: http://svn.apache.org/viewvc?rev=836072&view=rev Log: Misc test enhancement Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala?rev=836072&r1=836071&r2=836072&view=diff ============================================================================== --- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala (original) +++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala Sat Nov 14 00:09:27 2009 @@ -40,6 +40,7 @@ import net.sourceforge.jwebunit.junit.WebTester import _root_.junit.framework.AssertionFailedError import testing.{ReportFailure, TestKit, HttpResponse, TestFramework} + class ApiSpecsAsTest extends JUnit3(ApiSpecs) object ApiSpecsRunner extends ConsoleRunner(ApiSpecs) @@ -48,9 +49,9 @@ val baseUrl = JettyTestServer.urlFor("") -implicit val reportError = new ReportFailure { - def fail(msg: String): Nothing = ApiSpecs.this.fail(msg) -} + implicit val reportError = new ReportFailure { + def fail(msg: String): Nothing = ApiSpecs.this.fail(msg) + } val theUser = User.createAndPopulate.nickname("api_test").saveMe val token = { @@ -66,17 +67,17 @@ } def shouldnt(f: => Unit): Unit = - try { - val x = f - fail("Shouldn't succeed") - } catch { - case _ => () - } + try { + val x = f + fail("Shouldn't succeed") + } catch { + case _ => () + } "API" should { "Login" in { - for { + for{ login <- post("/api/login", "token" -> token) !@ "Failed to log in" if (testSuccess(login)) status <- login.get("/api/status") !@ "Failed to get status" if (testSuccess(status)) otherStatus <- get("/api/status") if shouldnt(testSuccess(status))