From 1275d1b6930db89f53382ec3cb43e067ef83ee96 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 23 Apr 2024 01:57:57 +0400 Subject: [PATCH] test(bindings): Anypoint MQ common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/168 --- .../channel}/AnypointMQChannelBindingTest.kt | 4 +-- .../message}/AnypointMQMessageBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../AnypointMQChannelBindingTest.kt | 28 --------------- .../AnypointMQMessageBindingTest.kt | 35 ------------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- 13 files changed, 11 insertions(+), 77 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/anypointmq => bindings/anypointmq/v0/_0_1/channel}/AnypointMQChannelBindingTest.kt (79%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/anypointmq => bindings/anypointmq/v0/_0_1/message}/AnypointMQMessageBindingTest.kt (91%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt similarity index 79% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt index 40fc730c..95888eec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.channel.anypointmq +package com.asyncapi.bindings.anypointmq.v0._0_1.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt similarity index 91% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt index 4fc41561..67661143 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.binding.message.anypointmq +package com.asyncapi.bindings.anypointmq.v0._0_1.message import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding class AnypointMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 9e170796..82efdd21 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding -import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 5e6db7be..f248d7fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 17563458..f858c3d4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 43e03465..3bd26f2b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest -import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 9b190e43..d491ed96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 6f9a42fe..d33142ce 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt deleted file mode 100644 index b19a37d6..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.asyncapi.v2.binding.channel.anypointmq - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class AnypointMQChannelBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json" - - override fun build(): AnypointMQChannelBinding { - return AnypointMQChannelBinding.builder() - .destination("user-signup-exchg") - .destinationType(AnypointMQChannelDestinationType.EXCHANGE) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt deleted file mode 100644 index 1967465c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.asyncapi.v2.binding.message.anypointmq - -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -class AnypointMQMessageBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json" - - override fun build(): AnypointMQMessageBinding { - return AnypointMQMessageBinding.builder() - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "correlationId", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Correlation ID set by application") - .build() - ) - )) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 1e22923b..ae76f255 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithMultiFormatSche import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest -import com.asyncapi.v3.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v3.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 4fb3ca67..161ef906 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 79fc7b5e..6a7be0bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest