Skip to content

Commit f35978d

Browse files
committed
make private vals needed for tests methods
1 parent 14be266 commit f35978d

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/AnthropicServiceFactory.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import scala.concurrent.ExecutionContext
1717
*/
1818
object AnthropicServiceFactory extends AnthropicServiceConsts {
1919

20-
private val apiVersion = "2023-06-01"
21-
private val envAPIKey = "ANTHROPIC_API_KEY"
20+
private def apiVersion = "2023-06-01"
21+
private def envAPIKey = "ANTHROPIC_API_KEY"
2222

2323
/**
2424
* Create a new instance of the [[OpenAIChatCompletionService]] wrapping the AnthropicService

anthropic-client/src/test/scala/io/cequence/openaiscala/anthropic/service/impl/AnthropicServiceSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import io.cequence.openaiscala.anthropic.domain.Message.UserMessage
66
import io.cequence.openaiscala.anthropic.domain.settings.AnthropicCreateMessageSettings
77
import io.cequence.openaiscala.anthropic.service._
88
import io.cequence.openaiscala.domain.NonOpenAIModelId
9-
import org.scalamock.scalatest.AsyncMockFactory
109
import org.scalatest.GivenWhenThen
1110
import org.scalatest.wordspec.AsyncWordSpec
1211

1312
import scala.concurrent.ExecutionContext
1413

15-
class AnthropicServiceSpec extends AsyncWordSpec with GivenWhenThen with AsyncMockFactory {
14+
class AnthropicServiceSpec extends AsyncWordSpec with GivenWhenThen {
1615

1716
implicit val ec: ExecutionContext = ExecutionContext.global
1817
implicit val materializer: Materializer = Materializer(ActorSystem())

anthropic-client/src/test/scala/io/cequence/openaiscala/anthropic/service/impl/TestFactory.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import akka.actor.ActorSystem
44
import akka.stream.Materializer
55
import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory
66
import io.cequence.wsclient.domain.WsRequestContext
7-
import io.cequence.wsclient.service.ws.Timeouts
8-
import org.scalamock.scalatest.MockFactory
97
import org.scalatest.PrivateMethodTester.{PrivateMethod, _}
108
import play.api.libs.ws.StandaloneWSRequest
119
import play.api.libs.ws.ahc.StandaloneAhcWSResponse
@@ -61,9 +59,9 @@ class AnthropicServiceClassImpl(
6159
) extends AnthropicServiceImpl {}
6260

6361
object TestFactory {
64-
val getAPIKeyFromEnv = PrivateMethod[String]('getAPIKeyFromEnv)
65-
val apiVersionMethod = PrivateMethod[String]('apiVersion)
66-
val defaultCoreUrlMethod = PrivateMethod[String]('defaultCoreUrl)
62+
val getAPIKeyFromEnv = PrivateMethod[String](Symbol("getAPIKeyFromEnv"))
63+
val apiVersionMethod = PrivateMethod[String](Symbol("apiVersion"))
64+
val defaultCoreUrlMethod = PrivateMethod[String](Symbol("defaultCoreUrl"))
6765

6866
val factory = AnthropicServiceFactory
6967
val apiKey = factory invokePrivate getAPIKeyFromEnv()

openai-client/src/test/scala/io/cequence/openaiscala/service/HandleOpenAIErrorCodesSpec.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package io.cequence.openaiscala.service
22

3-
import io.cequence.openaiscala.domain.UserMessage
43
import io.cequence.openaiscala._
4+
import io.cequence.openaiscala.domain.UserMessage
55
import io.cequence.openaiscala.service.impl.TestFactory
6-
import org.scalamock.scalatest.AsyncMockFactory
76
import org.scalatest.GivenWhenThen
87
import org.scalatest.wordspec.AsyncWordSpec
98

10-
class HandleOpenAIErrorCodesSpec
11-
extends AsyncWordSpec
12-
with GivenWhenThen
13-
with AsyncMockFactory {
9+
class HandleOpenAIErrorCodesSpec extends AsyncWordSpec with GivenWhenThen {
1410

1511
private val irrelevantMessages = Seq(UserMessage("Hello"))
1612

0 commit comments

Comments
 (0)