diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 0056f0ab..ad56a78c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "4.9.1" + ".": "4.10.0" } \ No newline at end of file diff --git a/.stats.yml b/.stats.yml index 17749e26..f6897576 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 81 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/courier%2Fcourier-3fc1c86b4a83a16393aaf17d1fb3ac6098d30dd057ba872973b57285a7a3f0d0.yml -openapi_spec_hash: 02a545d217b13399f311e99561f9de1d -config_hash: 0789c3cddc625bb9712b3bded274ab6c +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/courier%2Fcourier-b3852cdd1020811766572923d26a6c95f4a538bf4c7268462b6ba39f34480b3e.yml +openapi_spec_hash: b2e2f2357342e9a6b16a591d0b946e38 +config_hash: 6f072c60adb74a68d27be5a0e5ea3124 diff --git a/CHANGELOG.md b/CHANGELOG.md index d183d7d5..bf415330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## 4.10.0 (2026-02-25) + +Full Changelog: [v4.9.1...v4.10.0](https://github.com/trycourier/courier-java/compare/v4.9.1...v4.10.0) + +### Features + +* **client:** add connection pooling option ([b2e1bcb](https://github.com/trycourier/courier-java/commit/b2e1bcbd856bbe7d247497b2296dd8f368fdc6da)) + + +### Bug Fixes + +* **types:** remove brand field from ElementalContent model ([cb336a3](https://github.com/trycourier/courier-java/commit/cb336a3bb81b5e2bd25483be06c45bdfd518fe2b)) + + +### Chores + +* drop apache dependency ([90094b9](https://github.com/trycourier/courier-java/commit/90094b91bb84ab5f9b01d351031431990495e2fa)) +* **internal:** expand imports ([b1b8ef3](https://github.com/trycourier/courier-java/commit/b1b8ef384a3acddc0ce6cd79cfca840e6da4c748)) +* **internal:** make `OkHttp` constructor internal ([4e39320](https://github.com/trycourier/courier-java/commit/4e393200781dd186e45a32ff8d18be7083e83b31)) +* **internal:** remove mock server code ([b63945e](https://github.com/trycourier/courier-java/commit/b63945ee56673ba3e736de9d2170b0a27e7dcd82)) +* **internal:** update `TestServerExtension` comment ([26b5aed](https://github.com/trycourier/courier-java/commit/26b5aede00f47e7a0bae77e058e36a00361060b0)) +* make `Properties` more resilient to `null` ([401bc43](https://github.com/trycourier/courier-java/commit/401bc435edc5a6798afb1c1619a0de37cdb7a9fe)) +* update mock server docs ([ff62ef0](https://github.com/trycourier/courier-java/commit/ff62ef0c2c8c232f96a3b3e5ade9c6ac22a1b248)) + + +### Documentation + +* add AUTO-GENERATED-OVERVIEW markers for README sync ([#92](https://github.com/trycourier/courier-java/issues/92)) ([4bc2f46](https://github.com/trycourier/courier-java/commit/4bc2f4661c8c7d35d72234c1f5520eec71a39bcc)) + ## 4.9.1 (2026-02-07) Full Changelog: [v4.9.0...v4.9.1](https://github.com/trycourier/courier-java/compare/v4.9.0...v4.9.1) diff --git a/README.md b/README.md index 1572f135..804ce850 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.courier/courier-java)](https://central.sonatype.com/artifact/com.courier/courier-java/4.9.1) -[![javadoc](https://javadoc.io/badge2/com.courier/courier-java/4.9.1/javadoc.svg)](https://javadoc.io/doc/com.courier/courier-java/4.9.1) +[![Maven Central](https://img.shields.io/maven-central/v/com.courier/courier-java)](https://central.sonatype.com/artifact/com.courier/courier-java/4.10.0) +[![javadoc](https://javadoc.io/badge2/com.courier/courier-java/4.10.0/javadoc.svg)](https://javadoc.io/doc/com.courier/courier-java/4.10.0) @@ -14,7 +14,7 @@ It is generated with [Stainless](https://www.stainless.com/). -The REST API documentation can be found on [www.courier.com](https://www.courier.com/docs). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.courier/courier-java/4.9.1). +The REST API documentation can be found on [www.courier.com](https://www.courier.com/docs). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.courier/courier-java/4.10.0). @@ -25,7 +25,7 @@ The REST API documentation can be found on [www.courier.com](https://www.courier ### Gradle ```kotlin -implementation("com.courier:courier-java:4.9.1") +implementation("com.courier:courier-java:4.10.0") ``` ### Maven @@ -34,7 +34,7 @@ implementation("com.courier:courier-java:4.9.1") com.courier courier-java - 4.9.1 + 4.10.0 ``` @@ -388,6 +388,25 @@ CourierClient client = CourierOkHttpClient.builder() .build(); ``` +### Connection pooling + +To customize the underlying OkHttp connection pool, configure the client using the `maxIdleConnections` and `keepAliveDuration` methods: + +```java +import com.courier.client.CourierClient; +import com.courier.client.okhttp.CourierOkHttpClient; +import java.time.Duration; + +CourierClient client = CourierOkHttpClient.builder() + .fromEnv() + // If `maxIdleConnections` is set, then `keepAliveDuration` must be set, and vice versa. + .maxIdleConnections(10) + .keepAliveDuration(Duration.ofMinutes(2)) + .build(); +``` + +If both options are unset, OkHttp's default connection pool settings are used. + ### HTTPS > [!NOTE] diff --git a/build.gradle.kts b/build.gradle.kts index aae0be02..653fe829 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.courier" - version = "4.9.1" // x-release-please-version + version = "4.10.0" // x-release-please-version } subprojects { diff --git a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClient.kt b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClient.kt index 429e095e..73be7c55 100644 --- a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClient.kt +++ b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClient.kt @@ -47,6 +47,8 @@ class CourierOkHttpClient private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var dispatcherExecutorService: ExecutorService? = null private var proxy: Proxy? = null + private var maxIdleConnections: Int? = null + private var keepAliveDuration: Duration? = null private var sslSocketFactory: SSLSocketFactory? = null private var trustManager: X509TrustManager? = null private var hostnameVerifier: HostnameVerifier? = null @@ -75,6 +77,46 @@ class CourierOkHttpClient private constructor() { /** Alias for calling [Builder.proxy] with `proxy.orElse(null)`. */ fun proxy(proxy: Optional) = proxy(proxy.getOrNull()) + /** + * The maximum number of idle connections kept by the underlying OkHttp connection pool. + * + * If this is set, then [keepAliveDuration] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun maxIdleConnections(maxIdleConnections: Int?) = apply { + this.maxIdleConnections = maxIdleConnections + } + + /** + * Alias for [Builder.maxIdleConnections]. + * + * This unboxed primitive overload exists for backwards compatibility. + */ + fun maxIdleConnections(maxIdleConnections: Int) = + maxIdleConnections(maxIdleConnections as Int?) + + /** + * Alias for calling [Builder.maxIdleConnections] with `maxIdleConnections.orElse(null)`. + */ + fun maxIdleConnections(maxIdleConnections: Optional) = + maxIdleConnections(maxIdleConnections.getOrNull()) + + /** + * The keep-alive duration for idle connections in the underlying OkHttp connection pool. + * + * If this is set, then [maxIdleConnections] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun keepAliveDuration(keepAliveDuration: Duration?) = apply { + this.keepAliveDuration = keepAliveDuration + } + + /** Alias for calling [Builder.keepAliveDuration] with `keepAliveDuration.orElse(null)`. */ + fun keepAliveDuration(keepAliveDuration: Optional) = + keepAliveDuration(keepAliveDuration.getOrNull()) + /** * The socket factory used to secure HTTPS connections. * @@ -317,6 +359,8 @@ class CourierOkHttpClient private constructor() { OkHttpClient.builder() .timeout(clientOptions.timeout()) .proxy(proxy) + .maxIdleConnections(maxIdleConnections) + .keepAliveDuration(keepAliveDuration) .dispatcherExecutorService(dispatcherExecutorService) .sslSocketFactory(sslSocketFactory) .trustManager(trustManager) diff --git a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClientAsync.kt b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClientAsync.kt index 2e2adb16..8a1baa2a 100644 --- a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClientAsync.kt +++ b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/CourierOkHttpClientAsync.kt @@ -47,6 +47,8 @@ class CourierOkHttpClientAsync private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var dispatcherExecutorService: ExecutorService? = null private var proxy: Proxy? = null + private var maxIdleConnections: Int? = null + private var keepAliveDuration: Duration? = null private var sslSocketFactory: SSLSocketFactory? = null private var trustManager: X509TrustManager? = null private var hostnameVerifier: HostnameVerifier? = null @@ -75,6 +77,46 @@ class CourierOkHttpClientAsync private constructor() { /** Alias for calling [Builder.proxy] with `proxy.orElse(null)`. */ fun proxy(proxy: Optional) = proxy(proxy.getOrNull()) + /** + * The maximum number of idle connections kept by the underlying OkHttp connection pool. + * + * If this is set, then [keepAliveDuration] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun maxIdleConnections(maxIdleConnections: Int?) = apply { + this.maxIdleConnections = maxIdleConnections + } + + /** + * Alias for [Builder.maxIdleConnections]. + * + * This unboxed primitive overload exists for backwards compatibility. + */ + fun maxIdleConnections(maxIdleConnections: Int) = + maxIdleConnections(maxIdleConnections as Int?) + + /** + * Alias for calling [Builder.maxIdleConnections] with `maxIdleConnections.orElse(null)`. + */ + fun maxIdleConnections(maxIdleConnections: Optional) = + maxIdleConnections(maxIdleConnections.getOrNull()) + + /** + * The keep-alive duration for idle connections in the underlying OkHttp connection pool. + * + * If this is set, then [maxIdleConnections] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun keepAliveDuration(keepAliveDuration: Duration?) = apply { + this.keepAliveDuration = keepAliveDuration + } + + /** Alias for calling [Builder.keepAliveDuration] with `keepAliveDuration.orElse(null)`. */ + fun keepAliveDuration(keepAliveDuration: Optional) = + keepAliveDuration(keepAliveDuration.getOrNull()) + /** * The socket factory used to secure HTTPS connections. * @@ -317,6 +359,8 @@ class CourierOkHttpClientAsync private constructor() { OkHttpClient.builder() .timeout(clientOptions.timeout()) .proxy(proxy) + .maxIdleConnections(maxIdleConnections) + .keepAliveDuration(keepAliveDuration) .dispatcherExecutorService(dispatcherExecutorService) .sslSocketFactory(sslSocketFactory) .trustManager(trustManager) diff --git a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/OkHttpClient.kt b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/OkHttpClient.kt index ca6ffdbe..86340f02 100644 --- a/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/OkHttpClient.kt +++ b/courier-java-client-okhttp/src/main/kotlin/com/courier/client/okhttp/OkHttpClient.kt @@ -16,11 +16,13 @@ import java.time.Duration import java.util.concurrent.CancellationException import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutorService +import java.util.concurrent.TimeUnit import javax.net.ssl.HostnameVerifier import javax.net.ssl.SSLSocketFactory import javax.net.ssl.X509TrustManager import okhttp3.Call import okhttp3.Callback +import okhttp3.ConnectionPool import okhttp3.Dispatcher import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType @@ -33,7 +35,7 @@ import okhttp3.logging.HttpLoggingInterceptor import okio.BufferedSink class OkHttpClient -private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClient) : HttpClient { +internal constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClient) : HttpClient { override fun execute(request: HttpRequest, requestOptions: RequestOptions): HttpResponse { val call = newCall(request, requestOptions) @@ -200,6 +202,8 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien private var timeout: Timeout = Timeout.default() private var proxy: Proxy? = null + private var maxIdleConnections: Int? = null + private var keepAliveDuration: Duration? = null private var dispatcherExecutorService: ExecutorService? = null private var sslSocketFactory: SSLSocketFactory? = null private var trustManager: X509TrustManager? = null @@ -211,6 +215,28 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien fun proxy(proxy: Proxy?) = apply { this.proxy = proxy } + /** + * Sets the maximum number of idle connections kept by the underlying [ConnectionPool]. + * + * If this is set, then [keepAliveDuration] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun maxIdleConnections(maxIdleConnections: Int?) = apply { + this.maxIdleConnections = maxIdleConnections + } + + /** + * Sets the keep-alive duration for idle connections in the underlying [ConnectionPool]. + * + * If this is set, then [maxIdleConnections] must also be set. + * + * If unset, then OkHttp's default is used. + */ + fun keepAliveDuration(keepAliveDuration: Duration?) = apply { + this.keepAliveDuration = keepAliveDuration + } + fun dispatcherExecutorService(dispatcherExecutorService: ExecutorService?) = apply { this.dispatcherExecutorService = dispatcherExecutorService } @@ -240,6 +266,22 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien .apply { dispatcherExecutorService?.let { dispatcher(Dispatcher(it)) } + val maxIdleConnections = maxIdleConnections + val keepAliveDuration = keepAliveDuration + if (maxIdleConnections != null && keepAliveDuration != null) { + connectionPool( + ConnectionPool( + maxIdleConnections, + keepAliveDuration.toNanos(), + TimeUnit.NANOSECONDS, + ) + ) + } else { + check((maxIdleConnections != null) == (keepAliveDuration != null)) { + "Both or none of `maxIdleConnections` and `keepAliveDuration` must be set, but only one was set" + } + } + val sslSocketFactory = sslSocketFactory val trustManager = trustManager if (sslSocketFactory != null && trustManager != null) { diff --git a/courier-java-core/build.gradle.kts b/courier-java-core/build.gradle.kts index 15e9f371..d4f0b6c8 100644 --- a/courier-java-core/build.gradle.kts +++ b/courier-java-core/build.gradle.kts @@ -27,8 +27,6 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2") - implementation("org.apache.httpcomponents.core5:httpcore5:5.2.4") - implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1") testImplementation(kotlin("test")) testImplementation(project(":courier-java-client-okhttp")) diff --git a/courier-java-core/src/main/kotlin/com/courier/core/Properties.kt b/courier-java-core/src/main/kotlin/com/courier/core/Properties.kt index f1fb24f6..20b78089 100644 --- a/courier-java-core/src/main/kotlin/com/courier/core/Properties.kt +++ b/courier-java-core/src/main/kotlin/com/courier/core/Properties.kt @@ -34,9 +34,9 @@ fun getOsName(): String { } } -fun getOsVersion(): String = System.getProperty("os.version", "unknown") +fun getOsVersion(): String = System.getProperty("os.version", "unknown") ?: "unknown" fun getPackageVersion(): String = - CourierClient::class.java.`package`.implementationVersion ?: "unknown" + CourierClient::class.java.`package`?.implementationVersion ?: "unknown" -fun getJavaVersion(): String = System.getProperty("java.version", "unknown") +fun getJavaVersion(): String = System.getProperty("java.version", "unknown") ?: "unknown" diff --git a/courier-java-core/src/main/kotlin/com/courier/core/http/HttpRequestBodies.kt b/courier-java-core/src/main/kotlin/com/courier/core/http/HttpRequestBodies.kt index 5736754c..c2ddbd06 100644 --- a/courier-java-core/src/main/kotlin/com/courier/core/http/HttpRequestBodies.kt +++ b/courier-java-core/src/main/kotlin/com/courier/core/http/HttpRequestBodies.kt @@ -5,16 +5,16 @@ package com.courier.core.http import com.courier.core.MultipartField +import com.courier.core.toImmutable import com.courier.errors.CourierInvalidDataException import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.json.JsonMapper import com.fasterxml.jackson.databind.node.JsonNodeType +import java.io.ByteArrayInputStream import java.io.InputStream import java.io.OutputStream +import java.util.UUID import kotlin.jvm.optionals.getOrNull -import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder -import org.apache.hc.core5.http.ContentType -import org.apache.hc.core5.http.HttpEntity @JvmSynthetic internal inline fun json(jsonMapper: JsonMapper, value: T): HttpRequestBody = @@ -37,92 +37,231 @@ internal fun multipartFormData( jsonMapper: JsonMapper, fields: Map>, ): HttpRequestBody = - object : HttpRequestBody { - private val entity: HttpEntity by lazy { - MultipartEntityBuilder.create() - .apply { - fields.forEach { (name, field) -> - val knownValue = field.value.asKnown().getOrNull() - val parts = - if (knownValue is InputStream) { - // Read directly from the `InputStream` instead of reading it all - // into memory due to the `jsonMapper` serialization below. - sequenceOf(name to knownValue) - } else { - val node = jsonMapper.valueToTree(field.value) - serializePart(name, node) + MultipartBody.Builder() + .apply { + fields.forEach { (name, field) -> + val knownValue = field.value.asKnown().getOrNull() + val parts = + if (knownValue is InputStream) { + // Read directly from the `InputStream` instead of reading it all + // into memory due to the `jsonMapper` serialization below. + sequenceOf(name to knownValue) + } else { + val node = jsonMapper.valueToTree(field.value) + serializePart(name, node) + } + + parts.forEach { (name, bytes) -> + val partBody = + if (bytes is ByteArrayInputStream) { + val byteArray = bytes.readBytes() + + object : HttpRequestBody { + + override fun writeTo(outputStream: OutputStream) { + outputStream.write(byteArray) + } + + override fun contentType(): String = field.contentType + + override fun contentLength(): Long = byteArray.size.toLong() + + override fun repeatable(): Boolean = true + + override fun close() {} } + } else { + object : HttpRequestBody { + + override fun writeTo(outputStream: OutputStream) { + bytes.copyTo(outputStream) + } + + override fun contentType(): String = field.contentType + + override fun contentLength(): Long = -1L - parts.forEach { (name, bytes) -> - addBinaryBody( - name, - bytes, - ContentType.parseLenient(field.contentType), - field.filename().getOrNull(), - ) + override fun repeatable(): Boolean = false + + override fun close() = bytes.close() + } } - } + + addPart( + MultipartBody.Part.create( + name, + field.filename().getOrNull(), + field.contentType, + partBody, + ) + ) } - .build() + } } + .build() - private fun serializePart( - name: String, - node: JsonNode, - ): Sequence> = - when (node.nodeType) { - JsonNodeType.MISSING, - JsonNodeType.NULL -> emptySequence() - JsonNodeType.BINARY -> sequenceOf(name to node.binaryValue().inputStream()) - JsonNodeType.STRING -> sequenceOf(name to node.textValue().inputStream()) - JsonNodeType.BOOLEAN -> - sequenceOf(name to node.booleanValue().toString().inputStream()) - JsonNodeType.NUMBER -> - sequenceOf(name to node.numberValue().toString().inputStream()) - JsonNodeType.ARRAY -> - sequenceOf( - name to - node - .elements() - .asSequence() - .mapNotNull { element -> - when (element.nodeType) { - JsonNodeType.MISSING, - JsonNodeType.NULL -> null - JsonNodeType.STRING -> node.textValue() - JsonNodeType.BOOLEAN -> node.booleanValue().toString() - JsonNodeType.NUMBER -> node.numberValue().toString() - null, - JsonNodeType.BINARY, - JsonNodeType.ARRAY, - JsonNodeType.OBJECT, - JsonNodeType.POJO -> - throw CourierInvalidDataException( - "Unexpected JsonNode type in array: ${node.nodeType}" - ) - } - } - .joinToString(",") - .inputStream() - ) - JsonNodeType.OBJECT -> - node.fields().asSequence().flatMap { (key, value) -> - serializePart("$name[$key]", value) - } - JsonNodeType.POJO, - null -> - throw CourierInvalidDataException("Unexpected JsonNode type: ${node.nodeType}") +private fun serializePart(name: String, node: JsonNode): Sequence> = + when (node.nodeType) { + JsonNodeType.MISSING, + JsonNodeType.NULL -> emptySequence() + JsonNodeType.BINARY -> sequenceOf(name to node.binaryValue().inputStream()) + JsonNodeType.STRING -> sequenceOf(name to node.textValue().byteInputStream()) + JsonNodeType.BOOLEAN -> sequenceOf(name to node.booleanValue().toString().byteInputStream()) + JsonNodeType.NUMBER -> sequenceOf(name to node.numberValue().toString().byteInputStream()) + JsonNodeType.ARRAY -> + sequenceOf( + name to + node + .elements() + .asSequence() + .mapNotNull { element -> + when (element.nodeType) { + JsonNodeType.MISSING, + JsonNodeType.NULL -> null + JsonNodeType.STRING -> element.textValue() + JsonNodeType.BOOLEAN -> element.booleanValue().toString() + JsonNodeType.NUMBER -> element.numberValue().toString() + null, + JsonNodeType.BINARY, + JsonNodeType.ARRAY, + JsonNodeType.OBJECT, + JsonNodeType.POJO -> + throw CourierInvalidDataException( + "Unexpected JsonNode type in array: ${element.nodeType}" + ) + } + } + .joinToString(",") + .byteInputStream() + ) + JsonNodeType.OBJECT -> + node.fields().asSequence().flatMap { (key, value) -> + serializePart("$name[$key]", value) + } + JsonNodeType.POJO, + null -> throw CourierInvalidDataException("Unexpected JsonNode type: ${node.nodeType}") + } + +private class MultipartBody +private constructor(private val boundary: String, private val parts: List) : HttpRequestBody { + private val boundaryBytes: ByteArray = boundary.toByteArray() + private val contentType = "multipart/form-data; boundary=$boundary" + + // This must remain in sync with `contentLength`. + override fun writeTo(outputStream: OutputStream) { + parts.forEach { part -> + outputStream.write(DASHDASH) + outputStream.write(boundaryBytes) + outputStream.write(CRLF) + + outputStream.write(CONTENT_DISPOSITION) + outputStream.write(part.contentDisposition.toByteArray()) + outputStream.write(CRLF) + + outputStream.write(CONTENT_TYPE) + outputStream.write(part.contentType.toByteArray()) + outputStream.write(CRLF) + + outputStream.write(CRLF) + part.body.writeTo(outputStream) + outputStream.write(CRLF) + } + + outputStream.write(DASHDASH) + outputStream.write(boundaryBytes) + outputStream.write(DASHDASH) + outputStream.write(CRLF) + } + + override fun contentType(): String = contentType + + // This must remain in sync with `writeTo`. + override fun contentLength(): Long { + var byteCount = 0L + + parts.forEach { part -> + val contentLength = part.body.contentLength() + if (contentLength == -1L) { + return -1L } - private fun String.inputStream(): InputStream = toByteArray().inputStream() + byteCount += + DASHDASH.size + + boundaryBytes.size + + CRLF.size + + CONTENT_DISPOSITION.size + + part.contentDisposition.toByteArray().size + + CRLF.size + + CONTENT_TYPE.size + + part.contentType.toByteArray().size + + CRLF.size + + CRLF.size + + contentLength + + CRLF.size + } - override fun writeTo(outputStream: OutputStream) = entity.writeTo(outputStream) + byteCount += DASHDASH.size + boundaryBytes.size + DASHDASH.size + CRLF.size + return byteCount + } - override fun contentType(): String = entity.contentType + override fun repeatable(): Boolean = parts.all { it.body.repeatable() } - override fun contentLength(): Long = entity.contentLength + override fun close() { + parts.forEach { it.body.close() } + } - override fun repeatable(): Boolean = entity.isRepeatable + class Builder { + private val boundary = UUID.randomUUID().toString() + private val parts: MutableList = mutableListOf() - override fun close() = entity.close() + fun addPart(part: Part) = apply { parts.add(part) } + + fun build() = MultipartBody(boundary, parts.toImmutable()) + } + + class Part + private constructor( + val contentDisposition: String, + val contentType: String, + val body: HttpRequestBody, + ) { + companion object { + fun create( + name: String, + filename: String?, + contentType: String, + body: HttpRequestBody, + ): Part { + val disposition = buildString { + append("form-data; name=") + appendQuotedString(name) + if (filename != null) { + append("; filename=") + appendQuotedString(filename) + } + } + return Part(disposition, contentType, body) + } + } + } + + companion object { + private val CRLF = byteArrayOf('\r'.code.toByte(), '\n'.code.toByte()) + private val DASHDASH = byteArrayOf('-'.code.toByte(), '-'.code.toByte()) + private val CONTENT_DISPOSITION = "Content-Disposition: ".toByteArray() + private val CONTENT_TYPE = "Content-Type: ".toByteArray() + + private fun StringBuilder.appendQuotedString(key: String) { + append('"') + for (ch in key) { + when (ch) { + '\n' -> append("%0A") + '\r' -> append("%0D") + '"' -> append("%22") + else -> append(ch) + } + } + append('"') + } } +} diff --git a/courier-java-core/src/main/kotlin/com/courier/core/http/RetryingHttpClient.kt b/courier-java-core/src/main/kotlin/com/courier/core/http/RetryingHttpClient.kt index 91211328..b41448f2 100644 --- a/courier-java-core/src/main/kotlin/com/courier/core/http/RetryingHttpClient.kt +++ b/courier-java-core/src/main/kotlin/com/courier/core/http/RetryingHttpClient.kt @@ -1,3 +1,5 @@ +// File generated from our OpenAPI spec by Stainless. + package com.courier.core.http import com.courier.core.DefaultSleeper diff --git a/courier-java-core/src/main/kotlin/com/courier/models/ElementalContent.kt b/courier-java-core/src/main/kotlin/com/courier/models/ElementalContent.kt index ec80329c..e3659f80 100644 --- a/courier-java-core/src/main/kotlin/com/courier/models/ElementalContent.kt +++ b/courier-java-core/src/main/kotlin/com/courier/models/ElementalContent.kt @@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty import java.util.Collections import java.util.Objects -import java.util.Optional import kotlin.jvm.optionals.getOrNull class ElementalContent @@ -24,7 +23,6 @@ class ElementalContent private constructor( private val elements: JsonField>, private val version: JsonField, - private val brand: JsonField, private val additionalProperties: MutableMap, ) { @@ -34,8 +32,7 @@ private constructor( @ExcludeMissing elements: JsonField> = JsonMissing.of(), @JsonProperty("version") @ExcludeMissing version: JsonField = JsonMissing.of(), - @JsonProperty("brand") @ExcludeMissing brand: JsonField = JsonMissing.of(), - ) : this(elements, version, brand, mutableMapOf()) + ) : this(elements, version, mutableMapOf()) /** * @throws CourierInvalidDataException if the JSON field has an unexpected type or is @@ -51,12 +48,6 @@ private constructor( */ fun version(): String = version.getRequired("version") - /** - * @throws CourierInvalidDataException if the JSON field has an unexpected type (e.g. if the - * server responded with an unexpected value). - */ - fun brand(): Optional = brand.getOptional("brand") - /** * Returns the raw JSON value of [elements]. * @@ -73,13 +64,6 @@ private constructor( */ @JsonProperty("version") @ExcludeMissing fun _version(): JsonField = version - /** - * Returns the raw JSON value of [brand]. - * - * Unlike [brand], this method doesn't throw if the JSON field has an unexpected type. - */ - @JsonProperty("brand") @ExcludeMissing fun _brand(): JsonField = brand - @JsonAnySetter private fun putAdditionalProperty(key: String, value: JsonValue) { additionalProperties.put(key, value) @@ -111,14 +95,12 @@ private constructor( private var elements: JsonField>? = null private var version: JsonField? = null - private var brand: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(elementalContent: ElementalContent) = apply { elements = elementalContent.elements.map { it.toMutableList() } version = elementalContent.version - brand = elementalContent.brand additionalProperties = elementalContent.additionalProperties.toMutableMap() } @@ -205,19 +187,6 @@ private constructor( */ fun version(version: JsonField) = apply { this.version = version } - fun brand(brand: String?) = brand(JsonField.ofNullable(brand)) - - /** Alias for calling [Builder.brand] with `brand.orElse(null)`. */ - fun brand(brand: Optional) = brand(brand.getOrNull()) - - /** - * Sets [Builder.brand] to an arbitrary JSON value. - * - * You should usually call [Builder.brand] with a well-typed [String] value instead. This - * method is primarily for setting the field to an undocumented or not yet supported value. - */ - fun brand(brand: JsonField) = apply { this.brand = brand } - fun additionalProperties(additionalProperties: Map) = apply { this.additionalProperties.clear() putAllAdditionalProperties(additionalProperties) @@ -254,7 +223,6 @@ private constructor( ElementalContent( checkRequired("elements", elements).map { it.toImmutable() }, checkRequired("version", version), - brand, additionalProperties.toMutableMap(), ) } @@ -268,7 +236,6 @@ private constructor( elements().forEach { it.validate() } version() - brand() validated = true } @@ -288,8 +255,7 @@ private constructor( @JvmSynthetic internal fun validity(): Int = (elements.asKnown().getOrNull()?.sumOf { it.validity().toInt() } ?: 0) + - (if (version.asKnown().isPresent) 1 else 0) + - (if (brand.asKnown().isPresent) 1 else 0) + (if (version.asKnown().isPresent) 1 else 0) override fun equals(other: Any?): Boolean { if (this === other) { @@ -299,16 +265,13 @@ private constructor( return other is ElementalContent && elements == other.elements && version == other.version && - brand == other.brand && additionalProperties == other.additionalProperties } - private val hashCode: Int by lazy { - Objects.hash(elements, version, brand, additionalProperties) - } + private val hashCode: Int by lazy { Objects.hash(elements, version, additionalProperties) } override fun hashCode(): Int = hashCode override fun toString() = - "ElementalContent{elements=$elements, version=$version, brand=$brand, additionalProperties=$additionalProperties}" + "ElementalContent{elements=$elements, version=$version, additionalProperties=$additionalProperties}" } diff --git a/courier-java-core/src/test/kotlin/com/courier/TestServerExtension.kt b/courier-java-core/src/test/kotlin/com/courier/TestServerExtension.kt deleted file mode 100644 index b9615827..00000000 --- a/courier-java-core/src/test/kotlin/com/courier/TestServerExtension.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.courier - -import java.lang.RuntimeException -import java.net.URL -import org.junit.jupiter.api.extension.BeforeAllCallback -import org.junit.jupiter.api.extension.ConditionEvaluationResult -import org.junit.jupiter.api.extension.ExecutionCondition -import org.junit.jupiter.api.extension.ExtensionContext - -class TestServerExtension : BeforeAllCallback, ExecutionCondition { - - override fun beforeAll(context: ExtensionContext?) { - try { - URL(BASE_URL).openConnection().connect() - } catch (e: Exception) { - throw RuntimeException( - """ - The test suite will not run without a mock Prism server running against your OpenAPI spec. - - You can set the environment variable `SKIP_MOCK_TESTS` to `true` to skip running any tests - that require the mock server. - - To fix: - - 1. Install Prism (requires Node 16+): - - With npm: - $ npm install -g @stoplight/prism-cli - - With yarn: - $ yarn global add @stoplight/prism-cli - - 2. Run the mock server - - To run the server, pass in the path of your OpenAPI spec to the prism command: - $ prism mock path/to/your.openapi.yml - """ - .trimIndent(), - e, - ) - } - } - - override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult { - return if (System.getenv(SKIP_TESTS_ENV).toBoolean()) { - ConditionEvaluationResult.disabled( - "Environment variable $SKIP_TESTS_ENV is set to true" - ) - } else { - ConditionEvaluationResult.enabled( - "Environment variable $SKIP_TESTS_ENV is not set to true" - ) - } - } - - companion object { - - val BASE_URL = System.getenv("TEST_API_BASE_URL") ?: "http://localhost:4010" - - const val SKIP_TESTS_ENV: String = "SKIP_MOCK_TESTS" - } -} diff --git a/courier-java-core/src/test/kotlin/com/courier/core/http/HttpRequestBodiesTest.kt b/courier-java-core/src/test/kotlin/com/courier/core/http/HttpRequestBodiesTest.kt new file mode 100644 index 00000000..2c91aef2 --- /dev/null +++ b/courier-java-core/src/test/kotlin/com/courier/core/http/HttpRequestBodiesTest.kt @@ -0,0 +1,729 @@ +// File generated from our OpenAPI spec by Stainless. + +package com.courier.core.http + +import com.courier.core.MultipartField +import com.courier.core.jsonMapper +import java.io.ByteArrayOutputStream +import java.io.InputStream +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +internal class HttpRequestBodiesTest { + + @Test + fun multipartFormData_serializesFieldWithFilename() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "file" to + MultipartField.builder() + .value("hello") + .filename("hello.txt") + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(output.size().toLong()).isEqualTo(body.contentLength()) + val boundary = body.contentType()!!.substringAfter("multipart/form-data; boundary=") + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="file"; filename="hello.txt" + |Content-Type: text/plain + | + |hello + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesFieldWithoutFilename() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "field" to + MultipartField.builder() + .value("value") + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(output.size().toLong()).isEqualTo(body.contentLength()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="field" + |Content-Type: text/plain + | + |value + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesInputStream() { + // Use `.buffered()` to get a non-ByteArrayInputStream, which hits the non-repeatable code + // path. + val inputStream = "stream content".byteInputStream().buffered() + val body = + multipartFormData( + jsonMapper(), + mapOf( + "data" to + MultipartField.builder() + .value(inputStream) + .contentType("application/octet-stream") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isFalse() + assertThat(body.contentLength()).isEqualTo(-1L) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="data" + |Content-Type: application/octet-stream + | + |stream content + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesByteArray() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "binary" to + MultipartField.builder() + .value("abc".toByteArray()) + .contentType("application/octet-stream") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="binary" + |Content-Type: application/octet-stream + | + |abc + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesBooleanValue() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "flag" to + MultipartField.builder() + .value(true) + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="flag" + |Content-Type: text/plain + | + |true + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesNumberValue() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "count" to + MultipartField.builder().value(42).contentType("text/plain").build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="count" + |Content-Type: text/plain + | + |42 + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesNullValueAsNoParts() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "present" to + MultipartField.builder() + .value("yes") + .contentType("text/plain") + .build(), + "absent" to + MultipartField.builder() + .value(null as String?) + .contentType("text/plain") + .build(), + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="present" + |Content-Type: text/plain + | + |yes + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesArray() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "items" to + MultipartField.builder>() + .value(listOf("alpha", "beta", "gamma")) + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="items" + |Content-Type: text/plain + | + |alpha,beta,gamma + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesObjectAsNestedParts() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "meta" to + MultipartField.builder>() + .value(mapOf("key1" to "val1", "key2" to "val2")) + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="meta[key1]" + |Content-Type: text/plain + | + |val1 + |--$boundary + |Content-Disposition: form-data; name="meta[key2]" + |Content-Type: text/plain + | + |val2 + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesMultipleFields() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "name" to + MultipartField.builder() + .value("Alice") + .contentType("text/plain") + .build(), + "age" to + MultipartField.builder().value(30).contentType("text/plain").build(), + "file" to + MultipartField.builder() + .value("file contents") + .filename("doc.txt") + .contentType("text/plain") + .build(), + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="name" + |Content-Type: text/plain + | + |Alice + |--$boundary + |Content-Disposition: form-data; name="age" + |Content-Type: text/plain + | + |30 + |--$boundary + |Content-Disposition: form-data; name="file"; filename="doc.txt" + |Content-Type: text/plain + | + |file contents + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_quotesSpecialCharactersInNameAndFilename() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "field\nname" to + MultipartField.builder() + .value("value") + .filename("file\r\"name.txt") + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="field%0Aname"; filename="file%0D%22name.txt" + |Content-Type: text/plain + | + |value + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_writeIsRepeatable() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "field" to + MultipartField.builder() + .value("repeatable") + .contentType("text/plain") + .build() + ), + ) + + val output1 = ByteArrayOutputStream() + body.writeTo(output1) + val output2 = ByteArrayOutputStream() + body.writeTo(output2) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output1.size().toLong()) + val boundary = boundary(body) + val expected = + """ + |--$boundary + |Content-Disposition: form-data; name="field" + |Content-Type: text/plain + | + |repeatable + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + assertThat(output1.toString("UTF-8")).isEqualTo(expected) + assertThat(output2.toString("UTF-8")).isEqualTo(expected) + } + + @Test + fun multipartFormData_serializesByteArrayInputStream() { + // ByteArrayInputStream is specifically handled as repeatable with known content length. + val inputStream = "byte array stream".byteInputStream() + val body = + multipartFormData( + jsonMapper(), + mapOf( + "data" to + MultipartField.builder() + .value(inputStream) + .contentType("application/octet-stream") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="data" + |Content-Type: application/octet-stream + | + |byte array stream + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesInputStreamWithFilename() { + // Use `.buffered()` to get a non-ByteArrayInputStream, which hits the non-repeatable code + // path. + val inputStream = "file data".byteInputStream().buffered() + val body = + multipartFormData( + jsonMapper(), + mapOf( + "upload" to + MultipartField.builder() + .value(inputStream) + .filename("upload.bin") + .contentType("application/octet-stream") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isFalse() + assertThat(body.contentLength()).isEqualTo(-1L) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="upload"; filename="upload.bin" + |Content-Type: application/octet-stream + | + |file data + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesNestedArrayInObject() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "data" to + MultipartField.builder>>() + .value(mapOf("tags" to listOf("a", "b"))) + .contentType("text/plain") + .build() + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="data[tags]" + |Content-Type: text/plain + | + |a,b + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_contentLengthIsUnknownWhenInputStreamPresent() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "text" to + MultipartField.builder() + .value("hello") + .contentType("text/plain") + .build(), + "stream" to + MultipartField.builder() + // Use `.buffered()` to get a non-ByteArrayInputStream, which hits the + // non-repeatable code path. + .value("data".byteInputStream().buffered()) + .contentType("application/octet-stream") + .build(), + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isFalse() + assertThat(body.contentLength()).isEqualTo(-1L) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="text" + |Content-Type: text/plain + | + |hello + |--$boundary + |Content-Disposition: form-data; name="stream" + |Content-Type: application/octet-stream + | + |data + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesEmptyArray() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "required" to + MultipartField.builder() + .value("present") + .contentType("text/plain") + .build(), + "items" to + MultipartField.builder>() + .value(emptyList()) + .contentType("text/plain") + .build(), + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="required" + |Content-Type: text/plain + | + |present + |--$boundary + |Content-Disposition: form-data; name="items" + |Content-Type: text/plain + | + | + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + @Test + fun multipartFormData_serializesEmptyObject() { + val body = + multipartFormData( + jsonMapper(), + mapOf( + "required" to + MultipartField.builder() + .value("present") + .contentType("text/plain") + .build(), + "meta" to + MultipartField.builder>() + .value(emptyMap()) + .contentType("text/plain") + .build(), + ), + ) + + val output = ByteArrayOutputStream() + body.writeTo(output) + + assertThat(body.repeatable()).isTrue() + assertThat(body.contentLength()).isEqualTo(output.size().toLong()) + val boundary = boundary(body) + assertThat(output.toString("UTF-8")) + .isEqualTo( + """ + |--$boundary + |Content-Disposition: form-data; name="required" + |Content-Type: text/plain + | + |present + |--$boundary-- + | + """ + .trimMargin() + .replace("\n", "\r\n") + ) + } + + private fun boundary(body: HttpRequestBody): String = + body.contentType()!!.substringAfter("multipart/form-data; boundary=") +} diff --git a/courier-java-core/src/test/kotlin/com/courier/core/http/RetryingHttpClientTest.kt b/courier-java-core/src/test/kotlin/com/courier/core/http/RetryingHttpClientTest.kt index 7a3288fc..e465e674 100644 --- a/courier-java-core/src/test/kotlin/com/courier/core/http/RetryingHttpClientTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/core/http/RetryingHttpClientTest.kt @@ -1,10 +1,21 @@ +// File generated from our OpenAPI spec by Stainless. + package com.courier.core.http import com.courier.client.okhttp.OkHttpClient import com.courier.core.RequestOptions import com.courier.core.Sleeper import com.courier.errors.CourierRetryableException -import com.github.tomakehurst.wiremock.client.WireMock.* +import com.github.tomakehurst.wiremock.client.WireMock.equalTo +import com.github.tomakehurst.wiremock.client.WireMock.matching +import com.github.tomakehurst.wiremock.client.WireMock.ok +import com.github.tomakehurst.wiremock.client.WireMock.post +import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor +import com.github.tomakehurst.wiremock.client.WireMock.resetAllScenarios +import com.github.tomakehurst.wiremock.client.WireMock.serviceUnavailable +import com.github.tomakehurst.wiremock.client.WireMock.stubFor +import com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo +import com.github.tomakehurst.wiremock.client.WireMock.verify import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo import com.github.tomakehurst.wiremock.junit5.WireMockTest import com.github.tomakehurst.wiremock.stubbing.Scenario diff --git a/courier-java-core/src/test/kotlin/com/courier/models/ElementalContentTest.kt b/courier-java-core/src/test/kotlin/com/courier/models/ElementalContentTest.kt index a765f80b..23b91a30 100644 --- a/courier-java-core/src/test/kotlin/com/courier/models/ElementalContentTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/models/ElementalContentTest.kt @@ -23,7 +23,6 @@ internal class ElementalContentTest { .build() ) .version("version") - .brand("brand") .build() assertThat(elementalContent.elements()) @@ -39,7 +38,6 @@ internal class ElementalContentTest { ) ) assertThat(elementalContent.version()).isEqualTo("version") - assertThat(elementalContent.brand()).contains("brand") } @Test @@ -57,7 +55,6 @@ internal class ElementalContentTest { .build() ) .version("version") - .brand("brand") .build() val roundtrippedElementalContent = diff --git a/courier-java-core/src/test/kotlin/com/courier/models/tenants/PutTenantTemplateRequestTest.kt b/courier-java-core/src/test/kotlin/com/courier/models/tenants/PutTenantTemplateRequestTest.kt index 622c096b..e3120505 100644 --- a/courier-java-core/src/test/kotlin/com/courier/models/tenants/PutTenantTemplateRequestTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/models/tenants/PutTenantTemplateRequestTest.kt @@ -31,7 +31,6 @@ internal class PutTenantTemplateRequestTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( @@ -113,7 +112,6 @@ internal class PutTenantTemplateRequestTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( @@ -199,7 +197,6 @@ internal class PutTenantTemplateRequestTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( diff --git a/courier-java-core/src/test/kotlin/com/courier/models/tenants/TenantTemplateInputTest.kt b/courier-java-core/src/test/kotlin/com/courier/models/tenants/TenantTemplateInputTest.kt index 2d4ec449..d649872b 100644 --- a/courier-java-core/src/test/kotlin/com/courier/models/tenants/TenantTemplateInputTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/models/tenants/TenantTemplateInputTest.kt @@ -29,7 +29,6 @@ internal class TenantTemplateInputTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( @@ -106,7 +105,6 @@ internal class TenantTemplateInputTest { .build() ) .version("version") - .brand("brand") .build() ) assertThat(tenantTemplateInput.channels()) @@ -190,7 +188,6 @@ internal class TenantTemplateInputTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( diff --git a/courier-java-core/src/test/kotlin/com/courier/models/tenants/templates/TemplateReplaceParamsTest.kt b/courier-java-core/src/test/kotlin/com/courier/models/tenants/templates/TemplateReplaceParamsTest.kt index 63c580af..67cf9e87 100644 --- a/courier-java-core/src/test/kotlin/com/courier/models/tenants/templates/TemplateReplaceParamsTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/models/tenants/templates/TemplateReplaceParamsTest.kt @@ -34,7 +34,6 @@ internal class TemplateReplaceParamsTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( @@ -154,7 +153,6 @@ internal class TemplateReplaceParamsTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( @@ -243,7 +241,6 @@ internal class TemplateReplaceParamsTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/ServiceParamsTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/ServiceParamsTest.kt index 1563de64..56b92d4a 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/ServiceParamsTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/ServiceParamsTest.kt @@ -40,7 +40,7 @@ internal class ServiceParamsTest { .build() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun message() { val sendService = client.send() diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/AudienceServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/AudienceServiceAsyncTest.kt index 05dc648c..e2c06c07 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/AudienceServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/AudienceServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.AudienceFilterConfig import com.courier.models.FilterConfig @@ -11,19 +10,13 @@ import com.courier.models.audiences.AudienceListParams import com.courier.models.audiences.AudienceUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AudienceServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val audienceServiceAsync = client.audiences() val audienceFuture = audienceServiceAsync.retrieve("audience_id") @@ -32,14 +25,10 @@ internal class AudienceServiceAsyncTest { audience.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val audienceServiceAsync = client.audiences() val audienceFuture = @@ -68,14 +57,10 @@ internal class AudienceServiceAsyncTest { audience.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val audienceServiceAsync = client.audiences() val audiencesFuture = @@ -85,14 +70,10 @@ internal class AudienceServiceAsyncTest { audiences.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val audienceServiceAsync = client.audiences() val future = audienceServiceAsync.delete("audience_id") @@ -100,14 +81,10 @@ internal class AudienceServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listMembers() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val audienceServiceAsync = client.audiences() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/AuditEventServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/AuditEventServiceAsyncTest.kt index befe3d7d..748606db 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/AuditEventServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/AuditEventServiceAsyncTest.kt @@ -2,24 +2,17 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.auditevents.AuditEventListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AuditEventServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val auditEventServiceAsync = client.auditEvents() val auditEventFuture = auditEventServiceAsync.retrieve("audit-event-id") @@ -28,14 +21,10 @@ internal class AuditEventServiceAsyncTest { auditEvent.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val auditEventServiceAsync = client.auditEvents() val auditEventsFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/AuthServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/AuthServiceAsyncTest.kt index c7b83a67..8a633f9e 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/AuthServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/AuthServiceAsyncTest.kt @@ -2,24 +2,17 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.auth.AuthIssueTokenParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AuthServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun issueToken() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val authServiceAsync = client.auth() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/AutomationServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/AutomationServiceAsyncTest.kt index 45c2af39..a114dbf6 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/AutomationServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/AutomationServiceAsyncTest.kt @@ -2,24 +2,17 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.automations.AutomationListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AutomationServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val automationServiceAsync = client.automations() val automationTemplateListResponseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/BrandServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/BrandServiceAsyncTest.kt index 839a2493..ce09ae22 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/BrandServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/BrandServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.brands.BrandColors import com.courier.models.brands.BrandCreateParams @@ -22,19 +21,13 @@ import com.courier.models.brands.Logo import com.courier.models.brands.WidgetBackground import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class BrandServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun create() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val brandServiceAsync = client.brands() val brandFuture = @@ -134,14 +127,10 @@ internal class BrandServiceAsyncTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val brandServiceAsync = client.brands() val brandFuture = brandServiceAsync.retrieve("brand_id") @@ -150,14 +139,10 @@ internal class BrandServiceAsyncTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val brandServiceAsync = client.brands() val brandFuture = @@ -257,14 +242,10 @@ internal class BrandServiceAsyncTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val brandServiceAsync = client.brands() val brandsFuture = @@ -274,14 +255,10 @@ internal class BrandServiceAsyncTest { brands.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val brandServiceAsync = client.brands() val future = brandServiceAsync.delete("brand_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/BulkServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/BulkServiceAsyncTest.kt index 753e731f..6e2efb75 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/BulkServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/BulkServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.ElementalContentSugar @@ -16,19 +15,13 @@ import com.courier.models.bulk.InboundBulkMessage import com.courier.models.bulk.InboundBulkMessageUser import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class BulkServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addUsers() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val bulkServiceAsync = client.bulk() val future = @@ -178,14 +171,10 @@ internal class BulkServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun createJob() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val bulkServiceAsync = client.bulk() val responseFuture = @@ -226,14 +215,10 @@ internal class BulkServiceAsyncTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listUsers() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val bulkServiceAsync = client.bulk() val responseFuture = @@ -245,14 +230,10 @@ internal class BulkServiceAsyncTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveJob() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val bulkServiceAsync = client.bulk() val responseFuture = bulkServiceAsync.retrieveJob("job_id") @@ -261,14 +242,10 @@ internal class BulkServiceAsyncTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun runJob() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val bulkServiceAsync = client.bulk() val future = bulkServiceAsync.runJob("job_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/InboundServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/InboundServiceAsyncTest.kt index 1d9d8b9d..a77b3a56 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/InboundServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/InboundServiceAsyncTest.kt @@ -2,25 +2,18 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.inbound.InboundTrackEventParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class InboundServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun trackEvent() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val inboundServiceAsync = client.inbound() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/ListServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/ListServiceAsyncTest.kt index b0658fb4..80a338c5 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/ListServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/ListServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -11,19 +10,13 @@ import com.courier.models.lists.ListRestoreParams import com.courier.models.lists.ListUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ListServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.lists() val subscriptionListFuture = listServiceAsync.retrieve("list_id") @@ -32,14 +25,10 @@ internal class ListServiceAsyncTest { subscriptionList.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.lists() val future = @@ -99,14 +88,10 @@ internal class ListServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.lists() val listsFuture = @@ -118,14 +103,10 @@ internal class ListServiceAsyncTest { lists.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.lists() val future = listServiceAsync.delete("list_id") @@ -133,14 +114,10 @@ internal class ListServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun restore() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.lists() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/MessageServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/MessageServiceAsyncTest.kt index abd21652..25c1b1bf 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/MessageServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/MessageServiceAsyncTest.kt @@ -2,25 +2,18 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.messages.MessageHistoryParams import com.courier.models.messages.MessageListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class MessageServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val messageServiceAsync = client.messages() val messageFuture = messageServiceAsync.retrieve("message_id") @@ -29,14 +22,10 @@ internal class MessageServiceAsyncTest { message.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val messageServiceAsync = client.messages() val messagesFuture = @@ -63,14 +52,10 @@ internal class MessageServiceAsyncTest { messages.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun cancel() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val messageServiceAsync = client.messages() val messageDetailsFuture = messageServiceAsync.cancel("message_id") @@ -79,14 +64,10 @@ internal class MessageServiceAsyncTest { messageDetails.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun content() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val messageServiceAsync = client.messages() val responseFuture = messageServiceAsync.content("message_id") @@ -95,14 +76,10 @@ internal class MessageServiceAsyncTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun history() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val messageServiceAsync = client.messages() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/NotificationServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/NotificationServiceAsyncTest.kt index 38052a67..e26c7a58 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/NotificationServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/NotificationServiceAsyncTest.kt @@ -2,24 +2,17 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.notifications.NotificationListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class NotificationServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val notificationServiceAsync = client.notifications() val notificationsFuture = @@ -31,14 +24,10 @@ internal class NotificationServiceAsyncTest { notifications.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveContent() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val notificationServiceAsync = client.notifications() val notificationGetContentFuture = notificationServiceAsync.retrieveContent("id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/ProfileServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/ProfileServiceAsyncTest.kt index 884ea6ff..e626346f 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/ProfileServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/ProfileServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.profiles.ProfileCreateParams @@ -10,19 +9,13 @@ import com.courier.models.profiles.ProfileReplaceParams import com.courier.models.profiles.ProfileUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ProfileServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun create() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val profileServiceAsync = client.profiles() val profileFuture = @@ -41,14 +34,10 @@ internal class ProfileServiceAsyncTest { profile.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val profileServiceAsync = client.profiles() val profileFuture = profileServiceAsync.retrieve("user_id") @@ -57,14 +46,10 @@ internal class ProfileServiceAsyncTest { profile.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val profileServiceAsync = client.profiles() val future = @@ -84,14 +69,10 @@ internal class ProfileServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val profileServiceAsync = client.profiles() val future = profileServiceAsync.delete("user_id") @@ -99,14 +80,10 @@ internal class ProfileServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun replace() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val profileServiceAsync = client.profiles() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/RequestServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/RequestServiceAsyncTest.kt index 100864e5..3644371b 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/RequestServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/RequestServiceAsyncTest.kt @@ -2,23 +2,16 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class RequestServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun archive() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val requestServiceAsync = client.requests() val future = requestServiceAsync.archive("request_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/SendServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/SendServiceAsyncTest.kt index ed6f21d6..fd2c9776 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/SendServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/SendServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.ElementalContentSugar @@ -12,19 +11,13 @@ import com.courier.models.Utm import com.courier.models.send.SendMessageParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class SendServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun message() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val sendServiceAsync = client.send() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/TenantServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/TenantServiceAsyncTest.kt index 11ef7e51..6f0038e9 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/TenantServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/TenantServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.ChannelClassification @@ -13,19 +12,13 @@ import com.courier.models.tenants.TenantListUsersParams import com.courier.models.tenants.TenantUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TenantServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.tenants() val tenantFuture = tenantServiceAsync.retrieve("tenant_id") @@ -34,14 +27,10 @@ internal class TenantServiceAsyncTest { tenant.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.tenants() val tenantFuture = @@ -80,14 +69,10 @@ internal class TenantServiceAsyncTest { tenant.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.tenants() val tenantsFuture = @@ -103,14 +88,10 @@ internal class TenantServiceAsyncTest { tenants.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.tenants() val future = tenantServiceAsync.delete("tenant_id") @@ -118,14 +99,10 @@ internal class TenantServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listUsers() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.tenants() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/TranslationServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/TranslationServiceAsyncTest.kt index 53bbc88b..2e59f2ca 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/TranslationServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/TranslationServiceAsyncTest.kt @@ -2,25 +2,18 @@ package com.courier.services.async -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.translations.TranslationRetrieveParams import com.courier.models.translations.TranslationUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TranslationServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val translationServiceAsync = client.translations() val translationFuture = @@ -31,14 +24,10 @@ internal class TranslationServiceAsyncTest { val translation = translationFuture.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val translationServiceAsync = client.translations() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/automations/InvokeServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/automations/InvokeServiceAsyncTest.kt index 7d8d4a55..56472f96 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/automations/InvokeServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/automations/InvokeServiceAsyncTest.kt @@ -2,26 +2,19 @@ package com.courier.services.async.automations -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.automations.invoke.InvokeInvokeAdHocParams import com.courier.models.automations.invoke.InvokeInvokeByTemplateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class InvokeServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun invokeAdHoc() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val invokeServiceAsync = client.automations().invoke() val automationInvokeResponseFuture = @@ -90,14 +83,10 @@ internal class InvokeServiceAsyncTest { automationInvokeResponse.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun invokeByTemplate() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val invokeServiceAsync = client.automations().invoke() val automationInvokeResponseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/lists/SubscriptionServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/lists/SubscriptionServiceAsyncTest.kt index d1bf1e71..b5fc41f6 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/lists/SubscriptionServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/lists/SubscriptionServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.lists -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -14,19 +13,13 @@ import com.courier.models.lists.subscriptions.SubscriptionSubscribeUserParams import com.courier.models.lists.subscriptions.SubscriptionUnsubscribeUserParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class SubscriptionServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val subscriptionServiceAsync = client.lists().subscriptions() val subscriptionsFuture = @@ -38,14 +31,10 @@ internal class SubscriptionServiceAsyncTest { subscriptions.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun add() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val subscriptionServiceAsync = client.lists().subscriptions() val future = @@ -113,14 +102,10 @@ internal class SubscriptionServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribe() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val subscriptionServiceAsync = client.lists().subscriptions() val future = @@ -188,14 +173,10 @@ internal class SubscriptionServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribeUser() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val subscriptionServiceAsync = client.lists().subscriptions() val future = @@ -255,14 +236,10 @@ internal class SubscriptionServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun unsubscribeUser() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val subscriptionServiceAsync = client.lists().subscriptions() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/CheckServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/CheckServiceAsyncTest.kt index cff1d905..0f22785d 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/CheckServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/CheckServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.notifications -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.notifications.BaseCheck import com.courier.models.notifications.checks.CheckDeleteParams @@ -10,19 +9,13 @@ import com.courier.models.notifications.checks.CheckListParams import com.courier.models.notifications.checks.CheckUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class CheckServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val checkServiceAsync = client.notifications().checks() val checkFuture = @@ -44,14 +37,10 @@ internal class CheckServiceAsyncTest { check.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val checkServiceAsync = client.notifications().checks() val checksFuture = @@ -63,14 +52,10 @@ internal class CheckServiceAsyncTest { checks.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val checkServiceAsync = client.notifications().checks() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/DraftServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/DraftServiceAsyncTest.kt index 7664c364..25a5f3ce 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/DraftServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/notifications/DraftServiceAsyncTest.kt @@ -2,23 +2,16 @@ package com.courier.services.async.notifications -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class DraftServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveContent() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val draftServiceAsync = client.notifications().draft() val notificationGetContentFuture = draftServiceAsync.retrieveContent("id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/profiles/ListServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/profiles/ListServiceAsyncTest.kt index 27649da9..e4f24d3a 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/profiles/ListServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/profiles/ListServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.profiles -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -11,19 +10,13 @@ import com.courier.models.profiles.lists.ListRetrieveParams import com.courier.models.profiles.lists.ListSubscribeParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ListServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.profiles().lists() val listFuture = @@ -35,14 +28,10 @@ internal class ListServiceAsyncTest { list.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.profiles().lists() val listFuture = listServiceAsync.delete("user_id") @@ -51,14 +40,10 @@ internal class ListServiceAsyncTest { list.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribe() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val listServiceAsync = client.profiles().lists() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/TemplateServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/TemplateServiceAsyncTest.kt index 624ac794..4350ae7b 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/TemplateServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/TemplateServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.tenants -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.ElementalContent @@ -17,19 +16,13 @@ import com.courier.models.tenants.templates.TemplateReplaceParams import com.courier.models.tenants.templates.TemplateRetrieveParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TemplateServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val templateServiceAsync = client.tenants().templates() val baseTemplateTenantAssociationFuture = @@ -44,14 +37,10 @@ internal class TemplateServiceAsyncTest { baseTemplateTenantAssociation.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val templateServiceAsync = client.tenants().templates() val templatesFuture = @@ -67,14 +56,10 @@ internal class TemplateServiceAsyncTest { templates.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun publish() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val templateServiceAsync = client.tenants().templates() val postTenantTemplatePublishResponseFuture = @@ -92,14 +77,10 @@ internal class TemplateServiceAsyncTest { postTenantTemplatePublishResponse.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun replace() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val templateServiceAsync = client.tenants().templates() val putTenantTemplateResponseFuture = @@ -123,7 +104,6 @@ internal class TemplateServiceAsyncTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/preferences/ItemServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/preferences/ItemServiceAsyncTest.kt index c06b270f..e9afbcc5 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/preferences/ItemServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/preferences/ItemServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.tenants.preferences -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.ChannelClassification import com.courier.models.tenants.SubscriptionTopicNew @@ -10,19 +9,13 @@ import com.courier.models.tenants.preferences.items.ItemDeleteParams import com.courier.models.tenants.preferences.items.ItemUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ItemServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val itemServiceAsync = client.tenants().preferences().items() val future = @@ -43,14 +36,10 @@ internal class ItemServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val itemServiceAsync = client.tenants().preferences().items() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/templates/VersionServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/templates/VersionServiceAsyncTest.kt index b0b24a8a..41678ca6 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/templates/VersionServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/tenants/templates/VersionServiceAsyncTest.kt @@ -2,24 +2,17 @@ package com.courier.services.async.tenants.templates -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.tenants.templates.versions.VersionRetrieveParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class VersionServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val versionServiceAsync = client.tenants().templates().versions() val baseTemplateTenantAssociationFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/users/PreferenceServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/users/PreferenceServiceAsyncTest.kt index cde02519..f881d079 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/users/PreferenceServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/users/PreferenceServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.models.ChannelClassification import com.courier.models.PreferenceStatus @@ -11,19 +10,13 @@ import com.courier.models.users.preferences.PreferenceRetrieveTopicParams import com.courier.models.users.preferences.PreferenceUpdateOrCreateTopicParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class PreferenceServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val preferenceServiceAsync = client.users().preferences() val preferenceFuture = @@ -35,14 +28,10 @@ internal class PreferenceServiceAsyncTest { preference.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveTopic() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val preferenceServiceAsync = client.users().preferences() val responseFuture = @@ -58,14 +47,10 @@ internal class PreferenceServiceAsyncTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun updateOrCreateTopic() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val preferenceServiceAsync = client.users().preferences() val responseFuture = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/users/TenantServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/users/TenantServiceAsyncTest.kt index 33bd2644..b1ceecb5 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/users/TenantServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/users/TenantServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.tenants.TenantAssociation @@ -12,19 +11,13 @@ import com.courier.models.users.tenants.TenantListParams import com.courier.models.users.tenants.TenantRemoveSingleParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TenantServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.users().tenants() val tenantsFuture = @@ -36,14 +29,10 @@ internal class TenantServiceAsyncTest { tenants.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addMultiple() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.users().tenants() val future = @@ -68,14 +57,10 @@ internal class TenantServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addSingle() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.users().tenants() val future = @@ -94,14 +79,10 @@ internal class TenantServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun removeAll() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.users().tenants() val future = tenantServiceAsync.removeAll("user_id") @@ -109,14 +90,10 @@ internal class TenantServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun removeSingle() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tenantServiceAsync = client.users().tenants() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/async/users/TokenServiceAsyncTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/async/users/TokenServiceAsyncTest.kt index da0be599..f496fe54 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/async/users/TokenServiceAsyncTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/async/users/TokenServiceAsyncTest.kt @@ -2,7 +2,6 @@ package com.courier.services.async.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClientAsync import com.courier.core.JsonValue import com.courier.models.users.tokens.TokenAddSingleParams @@ -12,19 +11,13 @@ import com.courier.models.users.tokens.TokenUpdateParams import com.courier.models.users.tokens.UserToken import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TokenServiceAsyncTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val tokenFuture = @@ -36,14 +29,10 @@ internal class TokenServiceAsyncTest { token.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val future = @@ -64,14 +53,10 @@ internal class TokenServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val tokensFuture = tokenServiceAsync.list("user_id") @@ -80,14 +65,10 @@ internal class TokenServiceAsyncTest { tokens.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val future = @@ -98,14 +79,10 @@ internal class TokenServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addMultiple() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val future = tokenServiceAsync.addMultiple("user_id") @@ -113,14 +90,10 @@ internal class TokenServiceAsyncTest { val response = future.get() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addSingle() { - val client = - CourierOkHttpClientAsync.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClientAsync.builder().apiKey("My API Key").build() val tokenServiceAsync = client.users().tokens() val future = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AudienceServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AudienceServiceTest.kt index 3fc654a6..8654c663 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AudienceServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AudienceServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.AudienceFilterConfig import com.courier.models.FilterConfig @@ -11,19 +10,13 @@ import com.courier.models.audiences.AudienceListParams import com.courier.models.audiences.AudienceUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AudienceServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val audienceService = client.audiences() val audience = audienceService.retrieve("audience_id") @@ -31,14 +24,10 @@ internal class AudienceServiceTest { audience.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val audienceService = client.audiences() val audience = @@ -66,14 +55,10 @@ internal class AudienceServiceTest { audience.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val audienceService = client.audiences() val audiences = audienceService.list(AudienceListParams.builder().cursor("cursor").build()) @@ -81,27 +66,19 @@ internal class AudienceServiceTest { audiences.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val audienceService = client.audiences() audienceService.delete("audience_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listMembers() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val audienceService = client.audiences() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuditEventServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuditEventServiceTest.kt index 1c83ba39..30ed4385 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuditEventServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuditEventServiceTest.kt @@ -2,24 +2,17 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.auditevents.AuditEventListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AuditEventServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val auditEventService = client.auditEvents() val auditEvent = auditEventService.retrieve("audit-event-id") @@ -27,14 +20,10 @@ internal class AuditEventServiceTest { auditEvent.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val auditEventService = client.auditEvents() val auditEvents = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuthServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuthServiceTest.kt index c213411f..70d4840b 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuthServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AuthServiceTest.kt @@ -2,24 +2,17 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.auth.AuthIssueTokenParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AuthServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun issueToken() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val authService = client.auth() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AutomationServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AutomationServiceTest.kt index 0ebd032d..4948d903 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/AutomationServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/AutomationServiceTest.kt @@ -2,24 +2,17 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.automations.AutomationListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class AutomationServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val automationService = client.automations() val automationTemplateListResponse = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/BrandServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/BrandServiceTest.kt index e4de7e96..e0637175 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/BrandServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/BrandServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.brands.BrandColors import com.courier.models.brands.BrandCreateParams @@ -22,19 +21,13 @@ import com.courier.models.brands.Logo import com.courier.models.brands.WidgetBackground import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class BrandServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun create() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val brandService = client.brands() val brand = @@ -133,14 +126,10 @@ internal class BrandServiceTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val brandService = client.brands() val brand = brandService.retrieve("brand_id") @@ -148,14 +137,10 @@ internal class BrandServiceTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val brandService = client.brands() val brand = @@ -254,14 +239,10 @@ internal class BrandServiceTest { brand.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val brandService = client.brands() val brands = brandService.list(BrandListParams.builder().cursor("cursor").build()) @@ -269,14 +250,10 @@ internal class BrandServiceTest { brands.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val brandService = client.brands() brandService.delete("brand_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/BulkServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/BulkServiceTest.kt index 5b280605..93ecfc69 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/BulkServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/BulkServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.ElementalContentSugar @@ -16,19 +15,13 @@ import com.courier.models.bulk.InboundBulkMessage import com.courier.models.bulk.InboundBulkMessageUser import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class BulkServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addUsers() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val bulkService = client.bulk() bulkService.addUsers( @@ -175,14 +168,10 @@ internal class BulkServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun createJob() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val bulkService = client.bulk() val response = @@ -222,14 +211,10 @@ internal class BulkServiceTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listUsers() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val bulkService = client.bulk() val response = @@ -240,14 +225,10 @@ internal class BulkServiceTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveJob() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val bulkService = client.bulk() val response = bulkService.retrieveJob("job_id") @@ -255,14 +236,10 @@ internal class BulkServiceTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun runJob() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val bulkService = client.bulk() bulkService.runJob("job_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/InboundServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/InboundServiceTest.kt index 9a97f646..cadadf2f 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/InboundServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/InboundServiceTest.kt @@ -2,25 +2,18 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.inbound.InboundTrackEventParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class InboundServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun trackEvent() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val inboundService = client.inbound() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/ListServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/ListServiceTest.kt index 85b1240f..58a115c4 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/ListServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/ListServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -11,19 +10,13 @@ import com.courier.models.lists.ListRestoreParams import com.courier.models.lists.ListUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ListServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.lists() val subscriptionList = listService.retrieve("list_id") @@ -31,14 +24,10 @@ internal class ListServiceTest { subscriptionList.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.lists() listService.update( @@ -89,14 +78,10 @@ internal class ListServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.lists() val lists = @@ -105,27 +90,19 @@ internal class ListServiceTest { lists.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.lists() listService.delete("list_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun restore() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.lists() listService.restore( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/MessageServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/MessageServiceTest.kt index b5204203..0b288d44 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/MessageServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/MessageServiceTest.kt @@ -2,25 +2,18 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.messages.MessageHistoryParams import com.courier.models.messages.MessageListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class MessageServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val messageService = client.messages() val message = messageService.retrieve("message_id") @@ -28,14 +21,10 @@ internal class MessageServiceTest { message.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val messageService = client.messages() val messages = @@ -61,14 +50,10 @@ internal class MessageServiceTest { messages.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun cancel() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val messageService = client.messages() val messageDetails = messageService.cancel("message_id") @@ -76,14 +61,10 @@ internal class MessageServiceTest { messageDetails.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun content() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val messageService = client.messages() val response = messageService.content("message_id") @@ -91,14 +72,10 @@ internal class MessageServiceTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun history() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val messageService = client.messages() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/NotificationServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/NotificationServiceTest.kt index 2230aa7c..6be0d0ea 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/NotificationServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/NotificationServiceTest.kt @@ -2,24 +2,17 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.notifications.NotificationListParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class NotificationServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val notificationService = client.notifications() val notifications = @@ -30,14 +23,10 @@ internal class NotificationServiceTest { notifications.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveContent() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val notificationService = client.notifications() val notificationGetContent = notificationService.retrieveContent("id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/ProfileServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/ProfileServiceTest.kt index bf03aa24..a07319c9 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/ProfileServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/ProfileServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.profiles.ProfileCreateParams @@ -10,19 +9,13 @@ import com.courier.models.profiles.ProfileReplaceParams import com.courier.models.profiles.ProfileUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ProfileServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun create() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val profileService = client.profiles() val profile = @@ -40,14 +33,10 @@ internal class ProfileServiceTest { profile.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val profileService = client.profiles() val profile = profileService.retrieve("user_id") @@ -55,14 +44,10 @@ internal class ProfileServiceTest { profile.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val profileService = client.profiles() profileService.update( @@ -75,27 +60,19 @@ internal class ProfileServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val profileService = client.profiles() profileService.delete("user_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun replace() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val profileService = client.profiles() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/RequestServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/RequestServiceTest.kt index de1219e0..388c9855 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/RequestServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/RequestServiceTest.kt @@ -2,23 +2,16 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class RequestServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun archive() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val requestService = client.requests() requestService.archive("request_id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/SendServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/SendServiceTest.kt index dc2cc9d7..6885c587 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/SendServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/SendServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.ElementalContentSugar @@ -12,19 +11,13 @@ import com.courier.models.Utm import com.courier.models.send.SendMessageParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class SendServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun message() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val sendService = client.send() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/TenantServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/TenantServiceTest.kt index ed13035e..86605e98 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/TenantServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/TenantServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.ChannelClassification @@ -13,19 +12,13 @@ import com.courier.models.tenants.TenantListUsersParams import com.courier.models.tenants.TenantUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TenantServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.tenants() val tenant = tenantService.retrieve("tenant_id") @@ -33,14 +26,10 @@ internal class TenantServiceTest { tenant.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.tenants() val tenant = @@ -78,14 +67,10 @@ internal class TenantServiceTest { tenant.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.tenants() val tenants = @@ -100,27 +85,19 @@ internal class TenantServiceTest { tenants.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.tenants() tenantService.delete("tenant_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun listUsers() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.tenants() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/TranslationServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/TranslationServiceTest.kt index 1eb7f569..d14b4d41 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/TranslationServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/TranslationServiceTest.kt @@ -2,25 +2,18 @@ package com.courier.services.blocking -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.translations.TranslationRetrieveParams import com.courier.models.translations.TranslationUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TranslationServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val translationService = client.translations() translationService.retrieve( @@ -28,14 +21,10 @@ internal class TranslationServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val translationService = client.translations() translationService.update( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/automations/InvokeServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/automations/InvokeServiceTest.kt index c46a2368..125ed88b 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/automations/InvokeServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/automations/InvokeServiceTest.kt @@ -2,26 +2,19 @@ package com.courier.services.blocking.automations -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.automations.invoke.InvokeInvokeAdHocParams import com.courier.models.automations.invoke.InvokeInvokeByTemplateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class InvokeServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun invokeAdHoc() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val invokeService = client.automations().invoke() val automationInvokeResponse = @@ -89,14 +82,10 @@ internal class InvokeServiceTest { automationInvokeResponse.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun invokeByTemplate() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val invokeService = client.automations().invoke() val automationInvokeResponse = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/lists/SubscriptionServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/lists/SubscriptionServiceTest.kt index 18370ece..a17df3c0 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/lists/SubscriptionServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/lists/SubscriptionServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.lists -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -14,19 +13,13 @@ import com.courier.models.lists.subscriptions.SubscriptionSubscribeUserParams import com.courier.models.lists.subscriptions.SubscriptionUnsubscribeUserParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class SubscriptionServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val subscriptionService = client.lists().subscriptions() val subscriptions = @@ -37,14 +30,10 @@ internal class SubscriptionServiceTest { subscriptions.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun add() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val subscriptionService = client.lists().subscriptions() subscriptionService.add( @@ -109,14 +98,10 @@ internal class SubscriptionServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribe() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val subscriptionService = client.lists().subscriptions() subscriptionService.subscribe( @@ -181,14 +166,10 @@ internal class SubscriptionServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribeUser() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val subscriptionService = client.lists().subscriptions() subscriptionService.subscribeUser( @@ -239,14 +220,10 @@ internal class SubscriptionServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun unsubscribeUser() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val subscriptionService = client.lists().subscriptions() subscriptionService.unsubscribeUser( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/CheckServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/CheckServiceTest.kt index ae5a470e..8775f376 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/CheckServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/CheckServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.notifications -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.notifications.BaseCheck import com.courier.models.notifications.checks.CheckDeleteParams @@ -10,19 +9,13 @@ import com.courier.models.notifications.checks.CheckListParams import com.courier.models.notifications.checks.CheckUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class CheckServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val checkService = client.notifications().checks() val check = @@ -43,14 +36,10 @@ internal class CheckServiceTest { check.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val checkService = client.notifications().checks() val checks = @@ -61,14 +50,10 @@ internal class CheckServiceTest { checks.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val checkService = client.notifications().checks() checkService.delete( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/DraftServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/DraftServiceTest.kt index 5414ea14..60df85b8 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/DraftServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/notifications/DraftServiceTest.kt @@ -2,23 +2,16 @@ package com.courier.services.blocking.notifications -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class DraftServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveContent() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val draftService = client.notifications().draft() val notificationGetContent = draftService.retrieveContent("id") diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/profiles/ListServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/profiles/ListServiceTest.kt index c45b0b86..f1261d7e 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/profiles/ListServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/profiles/ListServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.profiles -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.RecipientPreferences @@ -11,19 +10,13 @@ import com.courier.models.profiles.lists.ListRetrieveParams import com.courier.models.profiles.lists.ListSubscribeParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ListServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.profiles().lists() val list = @@ -34,14 +27,10 @@ internal class ListServiceTest { list.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.profiles().lists() val list = listService.delete("user_id") @@ -49,14 +38,10 @@ internal class ListServiceTest { list.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun subscribe() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val listService = client.profiles().lists() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/TemplateServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/TemplateServiceTest.kt index 1c9f6df7..04d972dc 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/TemplateServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/TemplateServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.tenants -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.ElementalContent @@ -17,19 +16,13 @@ import com.courier.models.tenants.templates.TemplateReplaceParams import com.courier.models.tenants.templates.TemplateRetrieveParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TemplateServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val templateService = client.tenants().templates() val baseTemplateTenantAssociation = @@ -43,14 +36,10 @@ internal class TemplateServiceTest { baseTemplateTenantAssociation.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val templateService = client.tenants().templates() val templates = @@ -65,14 +54,10 @@ internal class TemplateServiceTest { templates.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun publish() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val templateService = client.tenants().templates() val postTenantTemplatePublishResponse = @@ -89,14 +74,10 @@ internal class TemplateServiceTest { postTenantTemplatePublishResponse.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun replace() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val templateService = client.tenants().templates() val putTenantTemplateResponse = @@ -120,7 +101,6 @@ internal class TemplateServiceTest { .build() ) .version("version") - .brand("brand") .build() ) .channels( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/preferences/ItemServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/preferences/ItemServiceTest.kt index 34090ea3..e41a0e28 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/preferences/ItemServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/preferences/ItemServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.tenants.preferences -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.ChannelClassification import com.courier.models.tenants.SubscriptionTopicNew @@ -10,19 +9,13 @@ import com.courier.models.tenants.preferences.items.ItemDeleteParams import com.courier.models.tenants.preferences.items.ItemUpdateParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class ItemServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val itemService = client.tenants().preferences().items() itemService.update( @@ -40,14 +33,10 @@ internal class ItemServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val itemService = client.tenants().preferences().items() itemService.delete( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/templates/VersionServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/templates/VersionServiceTest.kt index a231cee9..2019f3b5 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/templates/VersionServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/tenants/templates/VersionServiceTest.kt @@ -2,24 +2,17 @@ package com.courier.services.blocking.tenants.templates -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.tenants.templates.versions.VersionRetrieveParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class VersionServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val versionService = client.tenants().templates().versions() val baseTemplateTenantAssociation = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/PreferenceServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/PreferenceServiceTest.kt index 828a286a..3e3b56a0 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/PreferenceServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/PreferenceServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.models.ChannelClassification import com.courier.models.PreferenceStatus @@ -11,19 +10,13 @@ import com.courier.models.users.preferences.PreferenceRetrieveTopicParams import com.courier.models.users.preferences.PreferenceUpdateOrCreateTopicParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class PreferenceServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val preferenceService = client.users().preferences() val preference = @@ -34,14 +27,10 @@ internal class PreferenceServiceTest { preference.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieveTopic() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val preferenceService = client.users().preferences() val response = @@ -56,14 +45,10 @@ internal class PreferenceServiceTest { response.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun updateOrCreateTopic() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val preferenceService = client.users().preferences() val response = diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TenantServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TenantServiceTest.kt index 1451dc0a..1027d66c 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TenantServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TenantServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.tenants.TenantAssociation @@ -12,19 +11,13 @@ import com.courier.models.users.tenants.TenantListParams import com.courier.models.users.tenants.TenantRemoveSingleParams import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TenantServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.users().tenants() val tenants = @@ -35,14 +28,10 @@ internal class TenantServiceTest { tenants.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addMultiple() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.users().tenants() tenantService.addMultiple( @@ -64,14 +53,10 @@ internal class TenantServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addSingle() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.users().tenants() tenantService.addSingle( @@ -87,27 +72,19 @@ internal class TenantServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun removeAll() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.users().tenants() tenantService.removeAll("user_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun removeSingle() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tenantService = client.users().tenants() tenantService.removeSingle( diff --git a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TokenServiceTest.kt b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TokenServiceTest.kt index 65889142..c03677b6 100644 --- a/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TokenServiceTest.kt +++ b/courier-java-core/src/test/kotlin/com/courier/services/blocking/users/TokenServiceTest.kt @@ -2,7 +2,6 @@ package com.courier.services.blocking.users -import com.courier.TestServerExtension import com.courier.client.okhttp.CourierOkHttpClient import com.courier.core.JsonValue import com.courier.models.users.tokens.TokenAddSingleParams @@ -12,19 +11,13 @@ import com.courier.models.users.tokens.TokenUpdateParams import com.courier.models.users.tokens.UserToken import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -@ExtendWith(TestServerExtension::class) internal class TokenServiceTest { - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun retrieve() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() val token = @@ -35,14 +28,10 @@ internal class TokenServiceTest { token.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun update() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() tokenService.update( @@ -56,14 +45,10 @@ internal class TokenServiceTest { ) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun list() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() val tokens = tokenService.list("user_id") @@ -71,40 +56,28 @@ internal class TokenServiceTest { tokens.validate() } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun delete() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() tokenService.delete(TokenDeleteParams.builder().userId("user_id").token("token").build()) } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addMultiple() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() tokenService.addMultiple("user_id") } - @Disabled("Prism tests are disabled") + @Disabled("Mock server tests are disabled") @Test fun addSingle() { - val client = - CourierOkHttpClient.builder() - .baseUrl(TestServerExtension.BASE_URL) - .apiKey("My API Key") - .build() + val client = CourierOkHttpClient.builder().apiKey("My API Key").build() val tokenService = client.users().tokens() tokenService.addSingle( diff --git a/scripts/mock b/scripts/mock deleted file mode 100755 index 0b28f6ea..00000000 --- a/scripts/mock +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cd "$(dirname "$0")/.." - -if [[ -n "$1" && "$1" != '--'* ]]; then - URL="$1" - shift -else - URL="$(grep 'openapi_spec_url' .stats.yml | cut -d' ' -f2)" -fi - -# Check if the URL is empty -if [ -z "$URL" ]; then - echo "Error: No OpenAPI spec path/url provided or found in .stats.yml" - exit 1 -fi - -echo "==> Starting mock server with URL ${URL}" - -# Run prism mock on the given spec -if [ "$1" == "--daemon" ]; then - npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL" &> .prism.log & - - # Wait for server to come online - echo -n "Waiting for server" - while ! grep -q "✖ fatal\|Prism is listening" ".prism.log" ; do - echo -n "." - sleep 0.1 - done - - if grep -q "✖ fatal" ".prism.log"; then - cat .prism.log - exit 1 - fi - - echo -else - npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL" -fi diff --git a/scripts/test b/scripts/test index 047bc1db..904aea60 100755 --- a/scripts/test +++ b/scripts/test @@ -4,53 +4,7 @@ set -e cd "$(dirname "$0")/.." -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[0;33m' -NC='\033[0m' # No Color -function prism_is_running() { - curl --silent "http://localhost:4010" >/dev/null 2>&1 -} - -kill_server_on_port() { - pids=$(lsof -t -i tcp:"$1" || echo "") - if [ "$pids" != "" ]; then - kill "$pids" - echo "Stopped $pids." - fi -} - -function is_overriding_api_base_url() { - [ -n "$TEST_API_BASE_URL" ] -} - -if ! is_overriding_api_base_url && ! prism_is_running ; then - # When we exit this script, make sure to kill the background mock server process - trap 'kill_server_on_port 4010' EXIT - - # Start the dev server - ./scripts/mock --daemon -fi - -if is_overriding_api_base_url ; then - echo -e "${GREEN}✔ Running tests against ${TEST_API_BASE_URL}${NC}" - echo -elif ! prism_is_running ; then - echo -e "${RED}ERROR:${NC} The test suite will not run without a mock Prism server" - echo -e "running against your OpenAPI spec." - echo - echo -e "To run the server, pass in the path or url of your OpenAPI" - echo -e "spec to the prism command:" - echo - echo -e " \$ ${YELLOW}npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock path/to/your.openapi.yml${NC}" - echo - - exit 1 -else - echo -e "${GREEN}✔ Mock prism server is running with your OpenAPI spec${NC}" - echo -fi echo "==> Running tests" ./gradlew test "$@"