Skip to content

Commit e1eaed2

Browse files
mkhokh-33mkhokh-33
authored
fix tests (#15133)
* fix tests * fix redshift test
1 parent 5e9759b commit e1eaed2

File tree

8 files changed

+85
-17
lines changed

8 files changed

+85
-17
lines changed

‎airbyte-integrations/bases/debezium-v1-4-2/src/testFixtures/java/io/airbyte/integrations/debezium/CdcSourceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public abstract class CdcSourceTest {
6565
CatalogHelpers.createAirbyteStream(
6666
MODELS_STREAM_NAME,
6767
MODELS_SCHEMA,
68-
Field.of(COL_ID, JsonSchemaType.NUMBER),
69-
Field.of(COL_MAKE_ID, JsonSchemaType.NUMBER),
68+
Field.of(COL_ID, JsonSchemaType.INTEGER),
69+
Field.of(COL_MAKE_ID, JsonSchemaType.INTEGER),
7070
Field.of(COL_MODEL, JsonSchemaType.STRING))
7171
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
7272
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ID)))));
@@ -582,8 +582,8 @@ protected AirbyteCatalog expectedCatalogForDiscover() {
582582
final AirbyteStream streamWithoutPK = CatalogHelpers.createAirbyteStream(
583583
MODELS_STREAM_NAME + "_2",
584584
MODELS_SCHEMA,
585-
Field.of(COL_ID, JsonSchemaType.NUMBER),
586-
Field.of(COL_MAKE_ID, JsonSchemaType.NUMBER),
585+
Field.of(COL_ID, JsonSchemaType.INTEGER),
586+
Field.of(COL_MAKE_ID, JsonSchemaType.INTEGER),
587587
Field.of(COL_MODEL, JsonSchemaType.STRING));
588588
streamWithoutPK.setSourceDefinedPrimaryKey(Collections.emptyList());
589589
streamWithoutPK.setSupportedSyncModes(List.of(SyncMode.FULL_REFRESH));
@@ -592,8 +592,8 @@ protected AirbyteCatalog expectedCatalogForDiscover() {
592592
final AirbyteStream randomStream = CatalogHelpers.createAirbyteStream(
593593
MODELS_STREAM_NAME + "_random",
594594
MODELS_SCHEMA + "_random",
595-
Field.of(COL_ID + "_random", JsonSchemaType.NUMBER),
596-
Field.of(COL_MAKE_ID + "_random", JsonSchemaType.NUMBER),
595+
Field.of(COL_ID + "_random", JsonSchemaType.INTEGER),
596+
Field.of(COL_MAKE_ID + "_random", JsonSchemaType.INTEGER),
597597
Field.of(COL_MODEL + "_random", JsonSchemaType.STRING))
598598
.withSourceDefinedCursor(true)
599599
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))

‎airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbJdbcSourceAcceptanceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,18 @@ protected AirbyteCatalog getCatalog(final String defaultNamespace) {
136136
CatalogHelpers.createAirbyteStream(
137137
TABLE_NAME,
138138
defaultNamespace,
139-
Field.of(COL_ID, JsonSchemaType.NUMBER),
139+
Field.of(COL_ID, JsonSchemaType.INTEGER),
140140
Field.of(COL_NAME, JsonSchemaType.STRING),
141141
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
142142
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
143143
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ID))),
144144
CatalogHelpers.createAirbyteStream(
145145
TABLE_NAME_WITHOUT_PK,
146146
defaultNamespace,
147-
Field.of(COL_ID, JsonSchemaType.NUMBER),
147+
Field.of(COL_ID, JsonSchemaType.INTEGER),
148148
Field.of(COL_NAME, JsonSchemaType.STRING),
149149
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING),
150-
Field.of(COL_ROW_ID, JsonSchemaType.NUMBER))
150+
Field.of(COL_ROW_ID, JsonSchemaType.INTEGER))
151151
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
152152
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ROW_ID))),
153153
CatalogHelpers.createAirbyteStream(
@@ -507,7 +507,7 @@ void testDiscoverWithMultipleSchemas() throws Exception {
507507
SCHEMA_NAME2,
508508
Field.of(COL_ID, JsonSchemaType.STRING),
509509
Field.of(COL_NAME, JsonSchemaType.STRING),
510-
Field.of(COL_ROW_ID, JsonSchemaType.NUMBER))
510+
Field.of(COL_ROW_ID, JsonSchemaType.INTEGER))
511511
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
512512
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ROW_ID))));
513513

‎airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CockroachDbSourceTest {
6060
Field.of("id", JsonSchemaType.NUMBER),
6161
Field.of("name", JsonSchemaType.STRING),
6262
Field.of("power", JsonSchemaType.NUMBER),
63-
Field.of(COL_ROW_ID, JsonSchemaType.NUMBER))
63+
Field.of(COL_ROW_ID, JsonSchemaType.INTEGER))
6464
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
6565
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ROW_ID))),
6666
CatalogHelpers.createAirbyteStream(

‎airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractMssqlSourceDatatypeTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void initTests() {
4242
addDataTypeTestData(
4343
TestDataHolder.builder()
4444
.sourceType("bigint")
45-
.airbyteType(JsonSchemaType.NUMBER)
45+
.airbyteType(JsonSchemaType.INTEGER)
4646
.addInsertValues("-9223372036854775808", "9223372036854775807", "0", "null")
4747
.addExpectedValues("-9223372036854775808", "9223372036854775807", "0", null)
4848
.createTablePatternSql(CREATE_TABLE_SQL)
@@ -51,7 +51,7 @@ protected void initTests() {
5151
addDataTypeTestData(
5252
TestDataHolder.builder()
5353
.sourceType("int")
54-
.airbyteType(JsonSchemaType.NUMBER)
54+
.airbyteType(JsonSchemaType.INTEGER)
5555
.addInsertValues("null", "-2147483648", "2147483647")
5656
.addExpectedValues(null, "-2147483648", "2147483647")
5757
.createTablePatternSql(CREATE_TABLE_SQL)
@@ -60,7 +60,7 @@ protected void initTests() {
6060
addDataTypeTestData(
6161
TestDataHolder.builder()
6262
.sourceType("smallint")
63-
.airbyteType(JsonSchemaType.NUMBER)
63+
.airbyteType(JsonSchemaType.INTEGER)
6464
.addInsertValues("null", "-32768", "32767")
6565
.addExpectedValues(null, "-32768", "32767")
6666
.createTablePatternSql(CREATE_TABLE_SQL)
@@ -69,7 +69,7 @@ protected void initTests() {
6969
addDataTypeTestData(
7070
TestDataHolder.builder()
7171
.sourceType("tinyint")
72-
.airbyteType(JsonSchemaType.NUMBER)
72+
.airbyteType(JsonSchemaType.INTEGER)
7373
.addInsertValues("null", "0", "255")
7474
.addExpectedValues(null, "0", "255")
7575
.createTablePatternSql(CREATE_TABLE_SQL)

‎airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/MssqlSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MssqlSourceTest {
3737
private static final AirbyteCatalog CATALOG = new AirbyteCatalog().withStreams(Lists.newArrayList(CatalogHelpers.createAirbyteStream(
3838
STREAM_NAME,
3939
DB_NAME,
40-
Field.of("id", JsonSchemaType.NUMBER),
40+
Field.of("id", JsonSchemaType.INTEGER),
4141
Field.of("name", JsonSchemaType.STRING),
4242
Field.of("born", JsonSchemaType.STRING))
4343
.withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))

‎airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptJdbcSourceAcceptanceTest.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@
2323
import io.airbyte.integrations.source.oracle.OracleSource;
2424
import io.airbyte.integrations.source.relationaldb.models.DbState;
2525
import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
26+
import io.airbyte.protocol.models.AirbyteCatalog;
2627
import io.airbyte.protocol.models.AirbyteMessage;
2728
import io.airbyte.protocol.models.AirbyteRecordMessage;
2829
import io.airbyte.protocol.models.AirbyteStateMessage;
30+
import io.airbyte.protocol.models.CatalogHelpers;
2931
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
3032
import io.airbyte.protocol.models.ConnectorSpecification;
3133
import io.airbyte.protocol.models.DestinationSyncMode;
34+
import io.airbyte.protocol.models.Field;
35+
import io.airbyte.protocol.models.JsonSchemaType;
3236
import io.airbyte.protocol.models.SyncMode;
3337
import java.math.BigDecimal;
3438
import java.sql.Connection;
@@ -38,6 +42,7 @@
3842
import java.sql.SQLException;
3943
import java.sql.Statement;
4044
import java.util.ArrayList;
45+
import java.util.Collections;
4146
import java.util.List;
4247
import java.util.Optional;
4348
import org.junit.jupiter.api.AfterAll;
@@ -256,6 +261,35 @@ void testSpec() throws Exception {
256261
assertEquals(expected, actual);
257262
}
258263

264+
protected AirbyteCatalog getCatalog(final String defaultNamespace) {
265+
return new AirbyteCatalog().withStreams(List.of(
266+
CatalogHelpers.createAirbyteStream(
267+
TABLE_NAME,
268+
defaultNamespace,
269+
Field.of(COL_ID, JsonSchemaType.NUMBER),
270+
Field.of(COL_NAME, JsonSchemaType.STRING),
271+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
272+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
273+
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ID))),
274+
CatalogHelpers.createAirbyteStream(
275+
TABLE_NAME_WITHOUT_PK,
276+
defaultNamespace,
277+
Field.of(COL_ID, JsonSchemaType.NUMBER),
278+
Field.of(COL_NAME, JsonSchemaType.STRING),
279+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
280+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
281+
.withSourceDefinedPrimaryKey(Collections.emptyList()),
282+
CatalogHelpers.createAirbyteStream(
283+
TABLE_NAME_COMPOSITE_PK,
284+
defaultNamespace,
285+
Field.of(COL_FIRST_NAME, JsonSchemaType.STRING),
286+
Field.of(COL_LAST_NAME, JsonSchemaType.STRING),
287+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
288+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
289+
.withSourceDefinedPrimaryKey(
290+
List.of(List.of(COL_FIRST_NAME), List.of(COL_LAST_NAME)))));
291+
}
292+
259293
@Override
260294
protected List<AirbyteMessage> getTestMessages() {
261295
return Lists.newArrayList(

‎airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleJdbcSourceAcceptanceTest.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@
2020
import io.airbyte.integrations.source.jdbc.test.JdbcSourceAcceptanceTest;
2121
import io.airbyte.integrations.source.relationaldb.models.DbState;
2222
import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
23+
import io.airbyte.protocol.models.AirbyteCatalog;
2324
import io.airbyte.protocol.models.AirbyteMessage;
2425
import io.airbyte.protocol.models.AirbyteMessage.Type;
2526
import io.airbyte.protocol.models.AirbyteRecordMessage;
2627
import io.airbyte.protocol.models.AirbyteStateMessage;
2728
import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
29+
import io.airbyte.protocol.models.CatalogHelpers;
2830
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
2931
import io.airbyte.protocol.models.ConnectorSpecification;
3032
import io.airbyte.protocol.models.DestinationSyncMode;
33+
import io.airbyte.protocol.models.Field;
34+
import io.airbyte.protocol.models.JsonSchemaType;
3135
import io.airbyte.protocol.models.SyncMode;
3236
import java.math.BigDecimal;
3337
import java.sql.Connection;
@@ -37,6 +41,7 @@
3741
import java.sql.SQLException;
3842
import java.sql.Statement;
3943
import java.util.ArrayList;
44+
import java.util.Collections;
4045
import java.util.List;
4146
import java.util.Optional;
4247
import org.junit.jupiter.api.AfterAll;
@@ -111,6 +116,35 @@ protected void incrementalDateCheck() throws Exception {
111116
Lists.newArrayList(getTestMessages().get(1), getTestMessages().get(2)));
112117
}
113118

119+
protected AirbyteCatalog getCatalog(final String defaultNamespace) {
120+
return new AirbyteCatalog().withStreams(List.of(
121+
CatalogHelpers.createAirbyteStream(
122+
TABLE_NAME,
123+
defaultNamespace,
124+
Field.of(COL_ID, JsonSchemaType.NUMBER),
125+
Field.of(COL_NAME, JsonSchemaType.STRING),
126+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
127+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
128+
.withSourceDefinedPrimaryKey(List.of(List.of(COL_ID))),
129+
CatalogHelpers.createAirbyteStream(
130+
TABLE_NAME_WITHOUT_PK,
131+
defaultNamespace,
132+
Field.of(COL_ID, JsonSchemaType.NUMBER),
133+
Field.of(COL_NAME, JsonSchemaType.STRING),
134+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
135+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
136+
.withSourceDefinedPrimaryKey(Collections.emptyList()),
137+
CatalogHelpers.createAirbyteStream(
138+
TABLE_NAME_COMPOSITE_PK,
139+
defaultNamespace,
140+
Field.of(COL_FIRST_NAME, JsonSchemaType.STRING),
141+
Field.of(COL_LAST_NAME, JsonSchemaType.STRING),
142+
Field.of(COL_UPDATED_AT, JsonSchemaType.STRING))
143+
.withSupportedSyncModes(List.of(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))
144+
.withSourceDefinedPrimaryKey(
145+
List.of(List.of(COL_FIRST_NAME), List.of(COL_LAST_NAME)))));
146+
}
147+
114148
@AfterEach
115149
public void tearDownOracle() throws Exception {
116150
// ORA-12519

‎airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
public class RedshiftSourceAcceptanceTest extends SourceAcceptanceTest {
3636

3737
protected static final List<Field> FIELDS = List.of(
38-
Field.of("c_custkey", JsonSchemaType.NUMBER),
38+
Field.of("c_custkey", JsonSchemaType.INTEGER),
3939
Field.of("c_name", JsonSchemaType.STRING),
4040
Field.of("c_nation", JsonSchemaType.STRING));
4141

0 commit comments

Comments
 (0)