alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-5779 Migrated debezium-connector-mysql to AssertJ

Browse Source
This commit is contained in:
jcechace 2022-11-01 16:56:45 +01:00 committed by Jiri Pechanec
parent ee6d3ea6d6
commit 740715e2ee
54 changed files with 116 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debezium-connector-mysql/pom.xml
View File

@ -92,8 +92,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/BinlogReaderBufferIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.Connection;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/GtidSetTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.Collection;

8
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/IncrementalSnapshotIT.java
View File

@ -6,6 +6,7 @@
package io.debezium.connector.mysql;
import static org.assertj.core.api.Assertions.entry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -23,8 +24,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.fest.assertions.MapAssert;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -297,7 +297,7 @@ record -> {
LocalDate dt = dateTime.toLocalDate();
LocalDate d = LocalDate.parse(String.format("%s-05-01", 2000 + i));
LocalTime t = LocalTime.parse(String.format("0%s:00:00", i));
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, List.of(dt, d, t)));
Assertions.assertThat(dbChanges).contains(entry(i + 1, List.of(dt, d, t)));
}
}
@ -332,7 +332,7 @@ record -> {
},
DATABASE.topicForTable("a_date"),
null);
Assertions.assertThat(dbChanges).includes(MapAssert.entry(1, Arrays.asList(0, null)));
Assertions.assertThat(dbChanges).contains(entry(1, Arrays.asList(0, null)));
assertFalse(logInterceptor.containsWarnMessage("Invalid length when read MySQL DATE value. BIN_LEN_DATE is 0."));
}
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MetadataIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MultiTableStatementIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlAntlrDdlParserTest.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
@ -28,7 +28,7 @@
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlBinaryModeIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import java.nio.ByteBuffer;

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorIT.java
View File

@ -8,7 +8,7 @@
import static io.debezium.connector.mysql.MySqlConnectorConfig.isBuiltInDatabase;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static junit.framework.TestCase.assertEquals;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.nio.file.Path;
@ -30,7 +30,7 @@
import org.apache.kafka.connect.errors.DataException;
import org.apache.kafka.connect.header.Header;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorJsonIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.nio.file.Path;

12
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorRegressionIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -28,7 +28,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.kafka.connect.data.Struct;
import org.fest.assertions.Delta;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -288,7 +288,7 @@ else if (record.topic().endsWith("dbz_147_decimalvalues")) {
Object decimalValue = after.get("decimal_value");
assertThat(decimalValue).isInstanceOf(BigDecimal.class);
BigDecimal bigValue = (BigDecimal) decimalValue;
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Delta.delta(0.01));
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Assertions.offset(0.01));
}
else if (record.topic().endsWith("dbz_342_timetest")) {
Struct after = value.getStruct(Envelope.FieldName.AFTER);
@ -565,7 +565,7 @@ else if (record.topic().endsWith("dbz_147_decimalvalues")) {
Object decimalValue = after.get("decimal_value");
assertThat(decimalValue).isInstanceOf(BigDecimal.class);
BigDecimal bigValue = (BigDecimal) decimalValue;
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Delta.delta(0.01));
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Assertions.offset(0.01));
}
});
}
@ -744,7 +744,7 @@ else if (record.topic().endsWith("dbz_147_decimalvalues")) {
Object decimalValue = after.get("decimal_value");
assertThat(decimalValue).isInstanceOf(BigDecimal.class);
BigDecimal bigValue = (BigDecimal) decimalValue;
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Delta.delta(0.01));
assertThat(bigValue.doubleValue()).isEqualTo(12345.67, Assertions.offset(0.01));
}
else if (record.topic().endsWith("dbz_195_numvalues")) {
Struct after = value.getStruct(Envelope.FieldName.AFTER);
@ -960,7 +960,7 @@ public void shouldConsumeAllEventsFromDecimalTableInDatabaseUsingBinlogAndNoSnap
Object decimalValue = after.get("decimal_value");
assertThat(decimalValue).isInstanceOf(Double.class);
Double doubleValue = (Double) decimalValue;
assertThat(doubleValue).isEqualTo(12345.67, Delta.delta(0.01));
assertThat(doubleValue).isEqualTo(12345.67, Assertions.offset(0.01));
}
});
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDatabaseSchemaTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.time.Instant;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDateTimeInKeyIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.Connection;

12
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalColumnIT.java
View File

@ -5,8 +5,8 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import java.nio.file.Path;
import java.sql.SQLException;
@ -92,7 +92,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating1SchemaParameters).includes(
assertThat(rating1SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "10"));
Map<String, String> rating2SchemaParameters = insert.valueSchema()
@ -102,7 +102,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating2SchemaParameters).includes(
assertThat(rating2SchemaParameters).contains(
entry("scale", "4"), entry(PRECISION_PARAMETER_KEY, "8"));
Map<String, String> rating3SchemaParameters = insert.valueSchema()
@ -112,7 +112,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating3SchemaParameters).includes(
assertThat(rating3SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "7"));
Map<String, String> rating4SchemaParameters = insert.valueSchema()
@ -122,7 +122,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating4SchemaParameters).includes(
assertThat(rating4SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "6"));
}
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDefaultValueTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.time.Instant;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlEnumColumnIT.java
View File

@ -8,7 +8,7 @@
import static io.debezium.data.Enum.LOGICAL_NAME;
import static io.debezium.data.Enum.VALUES_FIELD;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.util.Map;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFixedLengthBinaryColumnIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.ByteBuffer;
import java.nio.file.Path;

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFloatIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;
@ -14,7 +14,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

12
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlGeometryIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;
@ -14,7 +14,7 @@
import javax.xml.bind.DatatypeConverter;
import org.apache.kafka.connect.data.Struct;
import org.fest.assertions.Delta;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@ -235,8 +235,8 @@ public int geometryPointTableRecords() {
@Override
public void geometryAssertPoints(Double expectedX, Double expectedY, Double actualX,
Double actualY) {
assertThat(actualX).isEqualTo(expectedX, Delta.delta(0.01));
assertThat(actualY).isEqualTo(expectedY, Delta.delta(0.01));
assertThat(actualX).isEqualTo(expectedX, Assertions.offset(0.01));
assertThat(actualY).isEqualTo(expectedY, Assertions.offset(0.01));
}
};
}
@ -262,8 +262,8 @@ public int geometryPointTableRecords() {
@Override
public void geometryAssertPoints(Double expectedX, Double expectedY, Double actualX,
Double actualY) {
assertThat(actualX).isEqualTo(expectedY, Delta.delta(0.01));
assertThat(actualY).isEqualTo(expectedX, Delta.delta(0.01));
assertThat(actualX).isEqualTo(expectedY, Assertions.offset(0.01));
assertThat(actualY).isEqualTo(expectedX, Assertions.offset(0.01));
}
};
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.lang.management.ManagementFactory;
import java.nio.file.Path;

12
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlNumericColumnIT.java
View File

@ -5,8 +5,8 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import java.nio.file.Path;
import java.sql.SQLException;
@ -92,7 +92,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating1SchemaParameters).includes(
assertThat(rating1SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "10"));
Map<String, String> rating2SchemaParameters = insert.valueSchema()
@ -102,7 +102,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating2SchemaParameters).includes(
assertThat(rating2SchemaParameters).contains(
entry("scale", "4"), entry(PRECISION_PARAMETER_KEY, "8"));
Map<String, String> rating3SchemaParameters = insert.valueSchema()
@ -112,7 +112,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating3SchemaParameters).includes(
assertThat(rating3SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "7"));
Map<String, String> rating4SchemaParameters = insert.valueSchema()
@ -122,7 +122,7 @@ public void shouldSetPrecisionSchemaParameter() throws SQLException, Interrupted
.schema()
.parameters();
assertThat(rating4SchemaParameters).includes(
assertThat(rating4SchemaParameters).contains(
entry("scale", "0"), entry(PRECISION_PARAMETER_KEY, "6"));
}
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlParserIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlRestartIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaHistoryIT.java
View File

@ -11,7 +11,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaMigrationIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaNameAdjustmentModeIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;
@ -13,7 +13,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

24
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSourceTypeInSchemaIT.java
View File

@ -5,8 +5,8 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import java.nio.file.Path;
import java.sql.SQLException;
@ -106,7 +106,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(c1SchemaParameters).includes(entry(TYPE_NAME_PARAMETER_KEY, "INT"));
assertThat(c1SchemaParameters).contains(entry(TYPE_NAME_PARAMETER_KEY, "INT"));
// fixed width, name but no length info
Map<String, String> c2SchemaParameters = before
@ -115,7 +115,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(c2SchemaParameters).includes(entry(TYPE_NAME_PARAMETER_KEY, "MEDIUMINT"));
assertThat(c2SchemaParameters).contains(entry(TYPE_NAME_PARAMETER_KEY, "MEDIUMINT"));
// variable width, name and length info
Map<String, String> c3aSchemaParameters = before
@ -124,7 +124,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(c3aSchemaParameters).includes(
assertThat(c3aSchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "NUMERIC"), entry(TYPE_LENGTH_PARAMETER_KEY, "5"), entry(TYPE_SCALE_PARAMETER_KEY, "2"));
// variable width, name and length info
@ -134,7 +134,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(c3bSchemaParameters).includes(
assertThat(c3bSchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "VARCHAR"), entry(TYPE_LENGTH_PARAMETER_KEY, "128"));
// float info
@ -144,7 +144,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(f1SchemaParameters).includes(
assertThat(f1SchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "FLOAT"), entry(TYPE_LENGTH_PARAMETER_KEY, "10"));
Map<String, String> f2SchemaParameters = before
@ -153,7 +153,7 @@ public void shouldPropagateSourceTypeAsSchemaParameter() throws SQLException, In
.schema()
.parameters();
assertThat(f2SchemaParameters).includes(
assertThat(f2SchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "FLOAT"), entry(TYPE_LENGTH_PARAMETER_KEY, "8"), entry(TYPE_SCALE_PARAMETER_KEY, "4"));
}
@ -222,7 +222,7 @@ public void shouldPropagateSourceTypeByDatatype() throws SQLException, Interrupt
.schema()
.parameters();
assertThat(c3aSchemaParameters).excludes(entry(TYPE_NAME_PARAMETER_KEY, "NUMERIC"));
assertThat(c3aSchemaParameters).doesNotContain(entry(TYPE_NAME_PARAMETER_KEY, "NUMERIC"));
// variable width, name and length info
Map<String, String> c3bSchemaParameters = before
@ -231,7 +231,7 @@ public void shouldPropagateSourceTypeByDatatype() throws SQLException, Interrupt
.schema()
.parameters();
assertThat(c3bSchemaParameters).includes(
assertThat(c3bSchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "VARCHAR"), entry(TYPE_LENGTH_PARAMETER_KEY, "128"));
// float info
@ -241,7 +241,7 @@ public void shouldPropagateSourceTypeByDatatype() throws SQLException, Interrupt
.schema()
.parameters();
assertThat(f1SchemaParameters).includes(
assertThat(f1SchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "FLOAT"), entry(TYPE_LENGTH_PARAMETER_KEY, "10"));
Map<String, String> f2SchemaParameters = before
@ -250,7 +250,7 @@ public void shouldPropagateSourceTypeByDatatype() throws SQLException, Interrupt
.schema()
.parameters();
assertThat(f2SchemaParameters).includes(
assertThat(f2SchemaParameters).contains(
entry(TYPE_NAME_PARAMETER_KEY, "FLOAT"), entry(TYPE_LENGTH_PARAMETER_KEY, "8"), entry(TYPE_SCALE_PARAMETER_KEY, "4"));
}
}

8
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableAndColumnCommentIT.java
View File

@ -5,8 +5,8 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import java.nio.file.Path;
import java.sql.Connection;
@ -123,7 +123,7 @@ public void shouldParseComment() throws SQLException, InterruptedException {
.field("name")
.schema()
.parameters();
assertThat(nameSchemaParameters).includes(entry(COLUMN_COMMENT_PARAMETER_KEY, "this is name column"));
assertThat(nameSchemaParameters).contains(entry(COLUMN_COMMENT_PARAMETER_KEY, "this is name column"));
// Bigint info
Map<String, String> valueSchemaParameters = before
@ -131,7 +131,7 @@ public void shouldParseComment() throws SQLException, InterruptedException {
.field("value")
.schema()
.parameters();
assertThat(valueSchemaParameters).includes(entry(COLUMN_COMMENT_PARAMETER_KEY, "the value is bigint type"));
assertThat(valueSchemaParameters).contains(entry(COLUMN_COMMENT_PARAMETER_KEY, "the value is bigint type"));
// Add a column with comment
try (final Connection conn = MySqlTestConnection.forTestDatabase(DATABASE.getDatabaseName()).connection()) {

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableMaintenanceStatementsIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTimestampColumnIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTinyIntIT.java
View File

@ -11,7 +11,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyTest.java
View File

@ -9,7 +9,7 @@
import static io.debezium.schema.AbstractTopicNamingStrategy.TOPIC_DELIMITER;
import static io.debezium.schema.AbstractTopicNamingStrategy.TOPIC_HEARTBEAT_PREFIX;
import static io.debezium.schema.AbstractTopicNamingStrategy.TOPIC_TRANSACTION;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.Properties;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlUnsignedIntegerIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlValueConvertersTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import java.math.BigDecimal;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlYearIT.java
View File

@ -11,7 +11,7 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultDatabaseCharsetIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultGeneratedValueIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueAllZeroTimeIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.util.Collections;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.nio.file.Path;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlNonUtfDatabaseCharsetIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/ReadBinLogIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.io.IOException;

15
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/ReadOnlyIncrementalSnapshotIT.java
View File

@ -5,6 +5,8 @@
*/
package io.debezium.connector.mysql;
import static org.assertj.core.api.Assertions.entry;
import java.io.File;
import java.sql.SQLException;
import java.time.Duration;
@ -22,9 +24,8 @@
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.SourceRecord;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.fest.assertions.Assertions;
import org.fest.assertions.MapAssert;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@ -152,7 +153,7 @@ public void emptyHighWatermark() throws Exception {
final int expectedRecordCount = ROW_COUNT;
final Map<Integer, Integer> dbChanges = consumeMixedWithIncrementalSnapshot(expectedRecordCount);
for (int i = 0; i < expectedRecordCount; i++) {
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, i));
Assertions.assertThat(dbChanges).contains(entry(i + 1, i));
}
}
@ -187,7 +188,7 @@ public void filteredEvents() throws Exception {
final int expectedRecordCount = ROW_COUNT;
final Map<Integer, Integer> dbChanges = consumeMixedWithIncrementalSnapshot(expectedRecordCount);
for (int i = 0; i < expectedRecordCount; i++) {
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, i));
Assertions.assertThat(dbChanges).contains(entry(i + 1, i));
}
}
finally {
@ -213,7 +214,7 @@ record -> ((Struct) record.value()).getStruct("after").getInt32(valueFieldName()
DATABASE.topicForTable("a4"),
null);
for (int i = 0; i < expectedRecordCount; i++) {
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, i));
Assertions.assertThat(dbChanges).contains(entry(i + 1, i));
}
}
@ -235,7 +236,7 @@ record -> ((Struct) record.value()).getStruct("after").getInt32(valueFieldName()
DATABASE.topicForTable("a42"),
null);
for (int i = 0; i < expectedRecordCount; i++) {
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, i));
Assertions.assertThat(dbChanges).contains(entry(i + 1, i));
}
}
@ -320,7 +321,7 @@ public void testPauseDuringSnapshotKafkaSignal() throws Exception {
dbChanges = consumeMixedWithIncrementalSnapshot(ROW_COUNT - beforeResume);
for (int i = beforeResume + 1; i < ROW_COUNT; i++) {
Assertions.assertThat(dbChanges).includes(MapAssert.entry(i + 1, i));
Assertions.assertThat(dbChanges).contains(entry(i + 1, i));
}
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SnapshotSourceIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertArrayEquals;
import java.nio.file.Path;

26
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SourceInfoTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.Collections;
@ -17,7 +17,7 @@
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.apache.kafka.connect.data.Struct;
import org.fest.assertions.GenericAssert;
import org.assertj.core.api.AbstractAssert;
import org.junit.Before;
import org.junit.Test;
@ -720,9 +720,9 @@ protected PositionAssert assertPositionWithoutGtids(String filename, int positio
return assertThatDocument(positionWithoutGtids(filename, position, event, row, snapshot));
}
protected static class PositionAssert extends GenericAssert<PositionAssert, Document> {
protected static class PositionAssert extends AbstractAssert<PositionAssert, Document> {
public PositionAssert(Document position) {
super(PositionAssert.class, position);
super(position, PositionAssert.class);
}
public PositionAssert isAt(Document otherPosition) {
@ -734,8 +734,8 @@ public PositionAssert isAt(Document otherPosition, Predicate<String> gtidFilter)
if (comparator.isPositionAtOrBefore(actual, otherPosition)) {
return this;
}
failIfCustomMessageIsSet();
throw failure(actual + " should be consider same position as " + otherPosition);
failWithMessage(actual + " should be consider same position as " + otherPosition);
return this;
}
public PositionAssert isBefore(Document otherPosition) {
@ -752,11 +752,10 @@ public PositionAssert isAtOrBefore(Document otherPosition) {
public PositionAssert isAtOrBefore(Document otherPosition, Predicate<String> gtidFilter) {
final MySqlHistoryRecordComparator comparator = new MySqlHistoryRecordComparator(gtidFilter);
if (comparator.isPositionAtOrBefore(actual, otherPosition)) {
return this;
if (!comparator.isPositionAtOrBefore(actual, otherPosition)) {
failWithMessage(actual + " should be consider same position as or before " + otherPosition);
}
failIfCustomMessageIsSet();
throw failure(actual + " should be consider same position as or before " + otherPosition);
return this;
}
public PositionAssert isAfter(Document otherPosition) {
@ -765,11 +764,10 @@ public PositionAssert isAfter(Document otherPosition) {
public PositionAssert isAfter(Document otherPosition, Predicate<String> gtidFilter) {
final MySqlHistoryRecordComparator comparator = new MySqlHistoryRecordComparator(gtidFilter);
if (!comparator.isPositionAtOrBefore(actual, otherPosition)) {
return this;
if (comparator.isPositionAtOrBefore(actual, otherPosition)) {
failWithMessage(actual + " should be consider after " + otherPosition);
}
failIfCustomMessageIsSet();
throw failure(actual + " should be consider after " + otherPosition);
return this;
}
}
}

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/StreamingSourceIT.java
View File

@ -7,7 +7,7 @@
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static io.debezium.junit.EqualityCheck.LESS_THAN_OR_EQUAL;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TopicNameSanitizationIT.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionMetadataIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;

2
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionPayloadIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.nio.file.Path;

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/zzz/ZZZGtidSetIT.java
View File

@ -6,7 +6,7 @@
package io.debezium.connector.mysql.zzz;
import static io.debezium.junit.EqualityCheck.LESS_THAN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.sql.SQLException;
@ -16,8 +16,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.fest.assertions.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
debezium-connector-mysql/src/test/java/io/debezium/relational/history/AbstractSchemaHistoryTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.relational.history;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.util.Map;

4
debezium-connector-mysql/src/test/java/io/debezium/relational/history/KafkaSchemaHistoryTest.java
View File

@ -5,7 +5,7 @@
*/
package io.debezium.relational.history;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@ -20,7 +20,7 @@
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.config.ConfigValue;
import org.apache.kafka.common.serialization.StringSerializer;
import org.fest.assertions.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;