refactor and add to src-2

Author: wb14123

requests/test/src-2/requests/Scala2RequestTests.scala

@@ -3,15 +3,15 @@ package requests
 import utest._
 import ujson._
 
-object Scala2RequestTests extends TestSuite{
+object Scala2RequestTests extends HttpbinTestSuite {
   val tests = Tests{
 
     test("params"){
 
       test("post"){
         for(chunkedUpload <- Seq(true, false)) {
           val res1 = requests.post(
-            "https://httpbin.org/post",
+            s"http://$localHttpbin/post",
             data = Map("hello" -> "world", "foo" -> "baz"),
             chunkedUpload = chunkedUpload
           ).text()
@@ -22,7 +22,7 @@ object Scala2RequestTests extends TestSuite{
       test("put") {
         for (chunkedUpload <- Seq(true, false)) {
           val res1 = requests.put(
-            "https://httpbin.org/put",
+            s"http://$localHttpbin/put",
             data = Map("hello" -> "world", "foo" -> "baz"),
             chunkedUpload = chunkedUpload
           ).text()
@@ -31,10 +31,10 @@ object Scala2RequestTests extends TestSuite{
       }
 
       test("send"){
-        requests.send("get")("https://httpbin.org/get?hello=world&foo=baz")
+        requests.send("get")(s"http://$localHttpbin/get?hello=world&foo=baz")
 
         val res1 = requests.send("put")(
-          "https://httpbin.org/put",
+          s"http://$localHttpbin/put",
           data = Map("hello" -> "world", "foo" -> "baz"),
           chunkedUpload = true
         ).text

requests/test/src/requests/HttpbinTestSuite.scala

@@ -0,0 +1,21 @@
+package requests
+
+import com.dimafeng.testcontainers.GenericContainer
+import org.testcontainers.containers.wait.strategy.Wait
+import utest._
+
+abstract class HttpbinTestSuite extends TestSuite {
+
+  private val containerDef = GenericContainer.Def(
+    "kennethreitz/httpbin",
+    exposedPorts = Seq(80),
+    waitStrategy = Wait.forHttp("/")
+  )
+  private val container = containerDef.start()
+
+  val localHttpbin: String = s"${container.containerIpAddress}:${container.mappedPort(80)}"
+
+  override def utestAfterAll(): Unit = {
+    container.stop()
+  }
+}

requests/test/src/requests/RequestTests.scala

@@ -1,24 +1,9 @@
 package requests
 
-import com.dimafeng.testcontainers.GenericContainer
-import org.testcontainers.containers.wait.strategy.Wait
 import utest._
 import ujson._
 
-object RequestTests extends TestSuite{
-
-  val containerDef = GenericContainer.Def(
-    "kennethreitz/httpbin",
-    exposedPorts = Seq(80),
-    waitStrategy = Wait.forHttp("/")
-  )
-  val container = containerDef.start()
-  val localHttpbinHost = container.containerIpAddress
-  val localHttpbin = s"${localHttpbinHost}:${container.mappedPort(80)}"
-
-  override def utestAfterAll(): Unit = {
-    container.stop()
-  }
+object RequestTests extends HttpbinTestSuite {
 
   val tests = Tests{
     test("matchingMethodWorks"){