You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2010/02/17 00:43:52 UTC
svn commit: r910775 - in /incubator/esme/trunk/server: ./
src/test/scala/org/apache/esme/ src/test/scala/org/apache/esme/api/
src/test/scala/org/apache/esme/lib/
Author: esjewett
Date: Tue Feb 16 23:43:51 2010
New Revision: 910775
URL: http://svn.apache.org/viewvc?rev=910775&view=rev
Log:
Remove jwebunit dependency
Modified:
incubator/esme/trunk/server/pom.xml
incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=910775&r1=910774&r2=910775&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Tue Feb 16 23:43:51 2010
@@ -214,18 +214,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>[6.1.6,)</version>
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala?rev=910775&r1=910774&r2=910775&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala Tue Feb 16 23:43:51 2010
@@ -26,8 +26,7 @@
import net.liftweb.util._
import net.liftweb.common._
import org.specs.matcher._
-import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
+import Helpers._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -70,24 +69,7 @@
def stop() = {
server_.stop()
server_.join()
- }
-
- def browse(startPath: String, f:(WebTester) => Unit) = {
- val wc = new WebTester()
- try {
- wc.setScriptingEnabled(false)
- wc.beginAt(JettyTestServer.urlFor(startPath))
- f(wc)
- } catch {
- case exc: AssertionFailedError => {
- System.err.println("serveur response: ", wc.getServeurResponse())
- throw exc
- }
- } finally {
- wc.closeBrowser()
- }
- }
-
+ }
}
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=910775&r1=910774&r2=910775&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 Tue Feb 16 23:43:51 2010
@@ -27,7 +27,6 @@
import net.liftweb.mapper.{By}
import org.specs.matcher._
import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -36,8 +35,7 @@
import model._
import net.liftweb.http._
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
class Api2SpecsAsTest extends JUnit3(Api2Specs)
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=910775&r1=910774&r2=910775&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 Tue Feb 16 23:43:51 2010
@@ -25,8 +25,7 @@
import net.liftweb.util._
import net.liftweb.common._
import org.specs.matcher._
-import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
+import Helpers._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -34,8 +33,7 @@
import org.apache.esme._
import model._
import net.liftweb.http._
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework, Response}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala?rev=910775&r1=910774&r2=910775&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala Tue Feb 16 23:43:51 2010
@@ -26,8 +26,7 @@
import net.liftweb.common._
import org.specs.matcher._
import Helpers._
-import MsgParser._
-import net.sourceforge.jwebunit.junit.WebTester
+import MsgParser._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -36,8 +35,7 @@
import model._
import net.liftweb.http._
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
class MsgParserSpecsAsTest extends JUnit3(MsgParserSpecs)