Skip to content

Commit

Permalink
Clean up (more) assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuxiqian
yuxiqian committed Jun 12, 2024
1 parent 2d132d9 commit 197deba
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 25 deletions.
4 changes: 1 addition & 3 deletions ...ka/src/test/java/org/apache/flink/cdc/connectors/kafka/sink/KafkaDataSinkFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThatThrownBy;

/** Tests for {@link KafkaDataSinkFactory}. */
public class KafkaDataSinkFactoryTest {

Expand Down Expand Up @@ -61,7 +59,7 @@ public void testUnsupportedOption() {
.put("unsupported_key", "unsupported_value")
.build());

assertThatThrownBy(
Assertions.assertThatThrownBy(
() ->
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
Expand Down
20 changes: 9 additions & 11 deletions .../src/test/java/org/apache/flink/cdc/connectors/paimon/sink/PaimonDataSinkFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;

import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

Expand All @@ -38,8 +38,6 @@
import java.util.UUID;
import java.util.stream.Collectors;

import static org.assertj.core.api.Assertions.assertThatThrownBy;

/** Tests for {@link PaimonDataSinkFactory}. */
public class PaimonDataSinkFactoryTest {

Expand All @@ -49,7 +47,7 @@ public class PaimonDataSinkFactoryTest {
public void testCreateDataSink() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("paimon", DataSinkFactory.class);
Assertions.assertInstanceOf(PaimonDataSinkFactory.class, sinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(PaimonDataSinkFactory.class);

Configuration conf =
Configuration.fromMap(
Expand All @@ -66,14 +64,14 @@ public void testCreateDataSink() {
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
conf, conf, Thread.currentThread().getContextClassLoader()));
Assertions.assertInstanceOf(PaimonDataSink.class, dataSink);
Assertions.assertThat(dataSink).isInstanceOf(PaimonDataSink.class);
}

@Test
public void testLackRequireOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("paimon", DataSinkFactory.class);
Assertions.assertInstanceOf(PaimonDataSinkFactory.class, sinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(PaimonDataSinkFactory.class);

Map<String, String> options = new HashMap<>();
options.put(PaimonDataSinkOptions.METASTORE.key(), "filesystem");
Expand All @@ -90,7 +88,7 @@ public void testLackRequireOption() {
remainingOptions.remove(requireKey);
Configuration conf = Configuration.fromMap(remainingOptions);

assertThatThrownBy(
Assertions.assertThatThrownBy(
() ->
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
Expand All @@ -112,7 +110,7 @@ public void testLackRequireOption() {
public void testUnsupportedOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("paimon", DataSinkFactory.class);
Assertions.assertInstanceOf(PaimonDataSinkFactory.class, sinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(PaimonDataSinkFactory.class);

Configuration conf =
Configuration.fromMap(
Expand All @@ -127,7 +125,7 @@ public void testUnsupportedOption() {
.put("unsupported_key", "unsupported_value")
.build());

assertThatThrownBy(
Assertions.assertThatThrownBy(
() ->
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
Expand All @@ -145,7 +143,7 @@ public void testUnsupportedOption() {
public void testPrefixRequireOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("paimon", DataSinkFactory.class);
Assertions.assertInstanceOf(PaimonDataSinkFactory.class, sinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(PaimonDataSinkFactory.class);
Configuration conf =
Configuration.fromMap(
ImmutableMap.<String, String>builder()
Expand All @@ -164,6 +162,6 @@ public void testPrefixRequireOption() {
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
conf, conf, Thread.currentThread().getContextClassLoader()));
Assertions.assertInstanceOf(PaimonDataSink.class, dataSink);
Assertions.assertThat(dataSink).isInstanceOf(PaimonDataSink.class);
}
}
20 changes: 9 additions & 11 deletions ...est/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,22 @@

import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;

import org.assertj.core.api.Assertions;
import org.junit.Test;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertTrue;

/** Tests for {@link org.apache.flink.cdc.connectors.starrocks.sink.StarRocksDataSinkFactory}. */
public class StarRocksDataSinkFactoryTest {

@Test
public void testCreateDataSink() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("starrocks", DataSinkFactory.class);
assertTrue(sinkFactory instanceof StarRocksDataSinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(StarRocksDataSinkFactory.class);

Configuration conf =
Configuration.fromMap(
Expand All @@ -58,14 +56,14 @@ public void testCreateDataSink() {
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
conf, conf, Thread.currentThread().getContextClassLoader()));
assertTrue(dataSink instanceof StarRocksDataSink);
Assertions.assertThat(dataSink).isInstanceOf(StarRocksDataSink.class);
}

@Test
public void testLackRequireOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("starrocks", DataSinkFactory.class);
assertTrue(sinkFactory instanceof StarRocksDataSinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(StarRocksDataSinkFactory.class);

Map<String, String> options = new HashMap<>();
options.put("jdbc-url", "jdbc:mysql://127.0.0.1:9030");
Expand All @@ -82,7 +80,7 @@ public void testLackRequireOption() {
remainingOptions.remove(requireKey);
Configuration conf = Configuration.fromMap(remainingOptions);

assertThatThrownBy(
Assertions.assertThatThrownBy(
() ->
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
Expand All @@ -104,7 +102,7 @@ public void testLackRequireOption() {
public void testUnsupportedOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("starrocks", DataSinkFactory.class);
assertTrue(sinkFactory instanceof StarRocksDataSinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(StarRocksDataSinkFactory.class);

Configuration conf =
Configuration.fromMap(
Expand All @@ -116,7 +114,7 @@ public void testUnsupportedOption() {
.put("unsupported_key", "unsupported_value")
.build());

assertThatThrownBy(
Assertions.assertThatThrownBy(
() ->
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
Expand All @@ -134,7 +132,7 @@ public void testUnsupportedOption() {
public void testPrefixRequireOption() {
DataSinkFactory sinkFactory =
FactoryDiscoveryUtils.getFactoryByIdentifier("starrocks", DataSinkFactory.class);
assertTrue(sinkFactory instanceof StarRocksDataSinkFactory);
Assertions.assertThat(sinkFactory).isInstanceOf(StarRocksDataSinkFactory.class);

Configuration conf =
Configuration.fromMap(
Expand All @@ -150,6 +148,6 @@ public void testPrefixRequireOption() {
sinkFactory.createDataSink(
new FactoryHelper.DefaultContext(
conf, conf, Thread.currentThread().getContextClassLoader()));
assertTrue(dataSink instanceof StarRocksDataSink);
Assertions.assertThat(dataSink).isInstanceOf(StarRocksDataSink.class);
}
}

0 comments on commit 197deba

Please sign in to comment.