Change way of handling platform specific tests

core/src/test/scala/sttp/model/UriTests.scala

@@ -8,7 +8,7 @@ import sttp.model.internal.UriCompatibility
 
 import java.net.URI
 
-class UriTests extends AnyFunSuite with Matchers with TryValues {
+class UriTests extends AnyFunSuite with Matchers with TryValues with UriTestsExtension {
 
   val HS = HostSegment
   val PS = PathSegment

core/src/test/scalajs/sttp/model/UriTestsHelper.scala → core/src/test/scalajs/sttp/model/UriTestsExtension.scala

@@ -5,18 +5,14 @@ import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import sttp.model.Uri._
 
-class UriTestsHelper extends AnyFunSuite with Matchers with TryValues {
+trait UriTestsExtension extends AnyFunSuite with Matchers with TryValues { this: UriTests =>
 
-  val QS = QuerySegment
-
-  val testUri = Uri.unsafeApply("http", None, "example.com", None, Nil, Nil, None)
-
-  val querySegmentsTestData = List(
+  private val tildeEncodingTest = List(
     List(QS.KeyValue("k", "v1~v2", valueEncoding = QuerySegmentEncoding.All)) -> "k=v1~v2"
   )
 
   for {
-    (segments, expected) <- querySegmentsTestData
+    (segments, expected) <- tildeEncodingTest
   } {
     test(s"$segments should serialize to$expected") {
       testUri.copy(querySegments = segments).toString should endWith(expected)

core/src/test/scalajvm/sttp/model/UriTestsHelper.scala → core/src/test/scalajvm/sttp/model/UriTestsExtension.scala

@@ -5,18 +5,14 @@ import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import sttp.model.Uri._
 
-class UriTestsHelper extends AnyFunSuite with Matchers with TryValues {
+trait UriTestsExtension extends AnyFunSuite with Matchers with TryValues { this: UriTests =>
 
-  val QS = QuerySegment
-
-  val testUri = Uri.unsafeApply("http", None, "example.com", None, Nil, Nil, None)
-
-  val querySegmentsTestData = List(
+  private val tildeEncodingTest = List(
     List(QS.KeyValue("k", "v1~v2", valueEncoding = QuerySegmentEncoding.All)) -> "k=v1%7Ev2"
   )
 
   for {
-    (segments, expected) <- querySegmentsTestData
+    (segments, expected) <- tildeEncodingTest
   } {
     test(s"$segments should serialize to$expected") {
       testUri.copy(querySegments = segments).toString should endWith(expected)

core/src/test/scalanative/sttp/model/UriTestsExtension.scala

@@ -0,0 +1,8 @@
+package sttp.model
+
+import org.scalatest.TryValues
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+import sttp.model.Uri._
+
+trait UriTestsExtension