Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix tests for updated Schema Registry client internals #9982

Merged
merged 1 commit into from Jun 23, 2023
Merged

chore: fix tests for updated Schema Registry client internals #9982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 4 additions & 11 deletions .../src/test/java/io/confluent/ksql/rest/server/resources/streaming/RecordFormatterTest.java
View file
Open in desktop
Expand Up @@ -28,17 +28,16 @@
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.protobuf.Message;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.confluent.connect.protobuf.ProtobufData;
import io.confluent.kafka.schemaregistry.avro.AvroSchema;
import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
import io.confluent.kafka.schemaregistry.json.JsonSchema;
import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
Expand Down Expand Up @@ -1228,9 +1227,7 @@ private static Serializer<Object> avroSerializer() {
final Map<String, String> props = new HashMap<>();
props.put("schema.registry.url", "localhost:9092");

final SchemaRegistryClient schemaRegistryClient = mock(SchemaRegistryClient.class);
when(schemaRegistryClient.ticker()).thenReturn(Ticker.systemTicker());
return new KafkaAvroSerializer(schemaRegistryClient, props);
return new KafkaAvroSerializer(new MockSchemaRegistryClient(), props);
}

private static Message protobufRecord() {
Expand All @@ -1250,18 +1247,14 @@ private static Serializer<Message> protobufSerializer() {
final Map<String, String> props = new HashMap<>();
props.put("schema.registry.url", "localhost:9092");

final SchemaRegistryClient schemaRegistryClient = mock(SchemaRegistryClient.class);
when(schemaRegistryClient.ticker()).thenReturn(Ticker.systemTicker());
return new KafkaProtobufSerializer<>(schemaRegistryClient, props);
return new KafkaProtobufSerializer<>(new MockSchemaRegistryClient(), props);
}

private static Serializer<Object> jsonSrSerializer() {
final Map<String, String> props = new HashMap<>();
props.put("schema.registry.url", "localhost:9092");

final SchemaRegistryClient schemaRegistryClient = mock(SchemaRegistryClient.class);
when(schemaRegistryClient.ticker()).thenReturn(Ticker.systemTicker());
return new KafkaJsonSchemaSerializer<>(schemaRegistryClient, props);
return new KafkaJsonSchemaSerializer<>(new MockSchemaRegistryClient(), props);
}
}

Expand Down
9 changes: 3 additions & 6 deletions ksqldb-serde/src/test/java/io/confluent/ksql/serde/json/KsqlJsonSchemaDeserializerTest.java
View file
Open in desktop
Expand Up @@ -3,14 +3,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.confluent.kafka.schemaregistry.ParsedSchema;
import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
import io.confluent.ksql.serde.connect.ConnectKsqlSchemaTranslator;
import io.confluent.ksql.util.KsqlConfig;
Expand Down Expand Up @@ -85,8 +82,8 @@ public class KsqlJsonSchemaDeserializerTest {
public void before() throws Exception {
schema = (new JsonSchemaTranslator()).fromConnectSchema(ORDER_SCHEMA.schema());

schemaRegistryClient = mock(SchemaRegistryClient.class);
when(schemaRegistryClient.getSchemaBySubjectAndId(anyString(), anyInt())).thenReturn(schema);
schemaRegistryClient = new MockSchemaRegistryClient();
schemaRegistryClient.register(SOME_TOPIC, schema);

final KsqlJsonSerdeFactory jsonSerdeFactory =
new KsqlJsonSerdeFactory(new JsonSchemaProperties(ImmutableMap.of()));
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -143,7 +143,7 @@
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<apache.io.version>2.7</apache.io.version>
<io.confluent.ksql.version>7.6.0-0</io.confluent.ksql.version>
<io.confluent.schema-registry.version>7.6.0-0</io.confluent.schema-registry.version>
<io.confluent.schema-registry.version>7.6.0-26</io.confluent.schema-registry.version>
<netty-tcnative-version>2.0.54.Final</netty-tcnative-version>
<!-- We normally get this from common, but Vertx is built against this -->
<!-- Note: `netty` depends on `tcnative` and if we bump `netty`
Expand Down