From da82d7f7d2bdc64f46d2bfb9942066f46d092c21 Mon Sep 17 00:00:00 2001 From: adamw Date: Sat, 15 Jul 2017 14:10:14 +0200 Subject: Moving the uri interpolator tests --- .../softwaremill/sttp/UriInterpolatorTests.scala | 121 --------------------- 1 file changed, 121 deletions(-) delete mode 100644 tests/src/test/scala/com/softwaremill/sttp/UriInterpolatorTests.scala (limited to 'tests/src/test/scala/com') diff --git a/tests/src/test/scala/com/softwaremill/sttp/UriInterpolatorTests.scala b/tests/src/test/scala/com/softwaremill/sttp/UriInterpolatorTests.scala deleted file mode 100644 index 85348e6..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/UriInterpolatorTests.scala +++ /dev/null @@ -1,121 +0,0 @@ -package com.softwaremill.sttp - -import java.net.URI - -import org.scalatest.{FunSuite, Matchers} - -class UriInterpolatorTests extends FunSuite with Matchers { - val v1 = "y" - val v2 = "a c" - val v2queryEncoded = "a+c" - val v2encoded = "a%20c" - val v3 = "a?=&c" - val v3encoded = "a%3F%3D%26c" - val v4 = "f/g" - val v4encoded = "f%2Fg" - val secure = true - - val testData: List[(String, List[(URI, String)])] = List( - "basic" -> List( - (uri"http://example.com", "http://example.com"), - (uri"http://example.com/", "http://example.com/"), - (uri"http://example.com?x=y", "http://example.com?x=y"), - (uri"http://example.com/a/b/c", "http://example.com/a/b/c"), - (uri"http://example.com/a/b/c/", "http://example.com/a/b/c/"), - (uri"http://example.com/a/b/c?x=y&h=j", - "http://example.com/a/b/c?x=y&h=j") - ), - "scheme" -> List( - (uri"http${if (secure) "s" else ""}://example.com", - s"https://example.com"), - (uri"${if (secure) "https" else "http"}://example.com", - s"https://example.com"), - (uri"example.com?a=$v2", s"example.com?a=$v2queryEncoded") - ), - "authority" -> List( - (uri"http://$v1.com", s"http://$v1.com"), - (uri"http://$v2.com", s"http://$v2encoded.com"), - (uri"http://$None.example.com", s"http://example.com"), - (uri"http://$None.$None.example.com", s"http://example.com"), - (uri"http://${Some("sub")}.example.com", s"http://sub.example.com"), - (uri"http://${Some("sub1.sub2")}.example.com", - s"http://sub1.sub2.example.com"), - (uri"http://${List("sub1", "sub2")}.example.com", - s"http://sub1.sub2.example.com"), - (uri"http://${List("sub", "example", "com")}", s"http://sub.example.com") - ), - "authority with parameters" -> List( - (uri"http://$v1.com?x=$v2", s"http://$v1.com?x=$v2queryEncoded") - ), - "ports" -> List( - (uri"http://example.com:8080", s"http://example.com:8080"), - (uri"http://example.com:${8080}", s"http://example.com:8080"), - (uri"http://example.com:${8080}/x", s"http://example.com:8080/x") - ), - "path" -> List( - (uri"http://example.com/$v1", s"http://example.com/$v1"), - (uri"http://example.com/$v1/", s"http://example.com/$v1/"), - (uri"http://example.com/$v2", s"http://example.com/$v2encoded"), - (uri"http://example.com/$v2/$v1", s"http://example.com/$v2encoded/$v1"), - (uri"http://example.com/$v1/p/$v4", - s"http://example.com/$v1/p/$v4encoded"), - (uri"http://example.com/a/${List(v2, "c", v4)}/b", - s"http://example.com/a/$v2encoded/c/$v4encoded/b") - ), - "path with parameters" -> List( - (uri"http://example.com/$v1?x=$v2", - s"http://example.com/$v1?x=$v2queryEncoded"), - (uri"http://example.com/$v1/$v2?x=$v2", - s"http://example.com/$v1/$v2encoded?x=$v2queryEncoded") - ), - "query parameter values" -> List( - (uri"http://example.com?x=$v1", s"http://example.com?x=$v1"), - (uri"http://example.com/?x=$v1", s"http://example.com/?x=$v1"), - (uri"http://example.com?x=$v2", s"http://example.com?x=$v2queryEncoded"), - (uri"http://example.com?x=$v3", s"http://example.com?x=$v3encoded") - ), - "optional query parameters" -> List( - (uri"http://example.com?a=$None", s"http://example.com"), - (uri"http://example.com?a=b&c=$None", s"http://example.com?a=b"), - (uri"http://example.com?a=b&c=$None&e=f", s"http://example.com?a=b&e=f"), - (uri"http://example.com?a=${Some(v1)}", s"http://example.com?a=$v1"), - (uri"http://example.com?a=${Some(v1)}&c=d", - s"http://example.com?a=$v1&c=d") - ), - "parameter collections" -> List( - (uri"http://example.com?${Seq("a" -> "b", v2 -> v1, v1 -> v2)}", - s"http://example.com?a=b&$v2queryEncoded=$v1&$v1=$v2queryEncoded"), - (uri"http://example.com?${Seq("a" -> "b", "a" -> "c")}", - s"http://example.com?a=b&a=c"), - (uri"http://example.com?${Map("a" -> "b")}", s"http://example.com?a=b"), - (uri"http://example.com?x=y&${Map("a" -> "b")}", - s"http://example.com?x=y&a=b"), - (uri"http://example.com?x=y&${Map("a" -> None)}", - s"http://example.com?x=y"), - (uri"http://example.com?x=y&${Map("a" -> Some("b"))}", - s"http://example.com?x=y&a=b"), - (uri"http://example.com?x=y&${Seq("a" -> None)}", - s"http://example.com?x=y") - ), - "fragments" -> List( - (uri"http://example.com#$v1", s"http://example.com#$v1"), - (uri"http://example.com#$None", s"http://example.com") - ), - "everything" -> List( - (uri"${"http"}://$v1.$v2.com/$v1/$v2?$v1=$v2&$v3=$v4#$v1", - s"http://$v1.$v2encoded.com/$v1/$v2encoded?$v1=$v2queryEncoded&$v3encoded=$v4encoded#$v1") - ), - "embed whole url" -> List( - (uri"${"http://example.com:123/a"}/b/c", "http://example.com:123/a/b/c") - ) - ) - - for { - (groupName, testCases) <- testData - ((interpolated, expected), i) <- testCases.zipWithIndex - } { - test(s"[$groupName] interpolate to $expected (${i + 1})") { - interpolated should be(new URI(expected)) - } - } -} -- cgit v1.2.3