From 17e35986f86e08ab5d9c37cbb09fc0f562aa026d Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Wed, 30 Oct 2024 12:50:15 -0500 Subject: [PATCH] move the ConsulDiscoverable tests into another package to make sure nothing relies on them being in a specific place --- .../smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala | 3 ++- .../smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala | 4 ++-- .../com/dwolla/consul/smithy4s/ConsulDiscoverableSpec.scala | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/smithy4s-tests/src/test/scala-2/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala b/smithy4s-tests/src/test/scala-2/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala index 0d00c18..28181e9 100644 --- a/smithy4s-tests/src/test/scala-2/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala +++ b/smithy4s-tests/src/test/scala-2/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala @@ -1,5 +1,6 @@ -package com.dwolla.consul.smithy4s +package some_other_package +import com.dwolla.consul.smithy4s._ import com.dwolla.test.HelloService import munit.FunSuite import org.http4s.Uri diff --git a/smithy4s-tests/src/test/scala-3/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala b/smithy4s-tests/src/test/scala-3/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala index f0b1336..b843869 100644 --- a/smithy4s-tests/src/test/scala-3/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala +++ b/smithy4s-tests/src/test/scala-3/com/dwolla/consul/smithy4s/ConsulDiscoverableSpecPerScalaVersion.scala @@ -1,4 +1,4 @@ -package com.dwolla.consul.smithy4s +package some_other_package import munit._ @@ -6,7 +6,7 @@ import munit._ trait ConsulDiscoverableSpecPerScalaVersion { self: FunSuite => test("ConsulDiscoverable typeclass macro returns no instance when the type parameter isn't a Smithy Service") { assertEquals( - compileErrors("""ConsulDiscoverable[NotASmithy4sService]"""), + compileErrors("import com.dwolla.consul.smithy4s._\nConsulDiscoverable[NotASmithy4sService]"), """error: Instances are only available for Smithy4s Services annotated with @discoverable |ConsulDiscoverable[NotASmithy4sService] | ^""".stripMargin diff --git a/smithy4s-tests/src/test/scala/com/dwolla/consul/smithy4s/ConsulDiscoverableSpec.scala b/smithy4s-tests/src/test/scala/com/dwolla/consul/smithy4s/ConsulDiscoverableSpec.scala index 24a8336..ae2ec2e 100644 --- a/smithy4s-tests/src/test/scala/com/dwolla/consul/smithy4s/ConsulDiscoverableSpec.scala +++ b/smithy4s-tests/src/test/scala/com/dwolla/consul/smithy4s/ConsulDiscoverableSpec.scala @@ -1,4 +1,4 @@ -package com.dwolla.consul.smithy4s +package some_other_package import munit._