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.

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

S3 destination: added data types tests #12098

Merged
merged 20 commits into from
Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
44a6d81
add Boolean, Number, DateTimeWithTZ compare methods
DoNotPanicUA Mar 11, 2022
656148a
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Mar 22, 2022
46c3a1b
Improve value comparison
DoNotPanicUA Mar 30, 2022
2a4b384
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Mar 30, 2022
cd53764
Compare inherit objects element by element
DoNotPanicUA Apr 6, 2022
4cd50de
Merge remote-tracking branch 'origin/aleonets/add-dat-tests-ph1' into…
DoNotPanicUA Apr 6, 2022
3c911c9
Move comparison methods to a new class not to overload the test class.
DoNotPanicUA Apr 7, 2022
f28b9af
format
DoNotPanicUA Apr 8, 2022
af1cff8
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 10, 2022
06764b2
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 11, 2022
4ddee6c
Move common method to ComparatorUtils. + Review update
DoNotPanicUA Apr 12, 2022
127b4ba
format
DoNotPanicUA Apr 12, 2022
ed890d3
review
DoNotPanicUA Apr 13, 2022
4007837
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 13, 2022
f1e860b
review
DoNotPanicUA Apr 13, 2022
5b59eb1
mark resolveIdentifier method as deprecated
DoNotPanicUA Apr 13, 2022
c2106a4
remove size objects validation. We iterate expected elements and comp…
DoNotPanicUA Apr 13, 2022
28625d6
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 14, 2022
ca1c3ab
S3 destination: enable DAT tests for s3
sashaNeshcheret Apr 15, 2022
bce99f2
Merge remote-tracking branch 'origin/master' into omneshcheret/dat-s3
sashaNeshcheret Apr 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import io.airbyte.integrations.destination.s3.avro.AvroConstants;
import io.airbyte.integrations.destination.s3.avro.JsonFieldNameUpdater;
import io.airbyte.integrations.destination.s3.util.AvroRecordHelper;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -67,4 +68,9 @@ protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
return jsonRecords;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new S3AvroParquetTestDataComparator();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package io.airbyte.integrations.destination.s3;

import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class S3AvroParquetTestDataComparator extends AdvancedTestDataComparator {

@Override
protected boolean compareDateValues(String airbyteMessageValue, String destinationValue) {
var destinationDate = LocalDate.ofEpochDay(Long.parseLong(destinationValue));
var expectedDate = LocalDate.parse(airbyteMessageValue, DateTimeFormatter.ofPattern(AIRBYTE_DATE_FORMAT));
return expectedDate.equals(destinationDate);
}

private Instant getInstantFromEpoch(String epochValue) {
return Instant.ofEpochMilli(Long.parseLong(epochValue.replaceAll("000$", "")));
}

@Override
protected ZonedDateTime parseDestinationDateWithTz(String destinationValue) {
return ZonedDateTime.ofInstant(getInstantFromEpoch(destinationValue), ZoneOffset.UTC);
}

@Override
protected boolean compareDateTimeValues(String airbyteMessageValue, String destinationValue) {
var format = DateTimeFormatter.ofPattern(AIRBYTE_DATETIME_FORMAT);
LocalDateTime dateTime = LocalDateTime.ofInstant(getInstantFromEpoch(destinationValue), ZoneOffset.UTC);
return super.compareDateTimeValues(airbyteMessageValue, format.format(dateTime));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,22 @@ private static JsonNode getJsonNode(final Map<String, String> input, final Map<S
case "boolean" -> json.put(key, Boolean.valueOf(value));
case "integer" -> json.put(key, Integer.valueOf(value));
case "number" -> json.put(key, Double.valueOf(value));
case "" -> addNoTypeValue(json, key, value);
default -> json.put(key, value);
}
}
return json;
}

private static void addNoTypeValue(ObjectNode json, String key, String value) {
if (value != null && (value.matches("^\\[.*\\]$")) || value.matches("^\\{.*\\}$")) {
var newNode = Jsons.deserialize(value);
json.set(key, newNode);
} else {
json.put(key, value);
}
}

@Override
protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
final String streamName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import io.airbyte.integrations.destination.NamingConventionTransformer;
import io.airbyte.integrations.destination.s3.util.S3NameTransformer;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.LinkedList;
Expand Down Expand Up @@ -165,4 +167,24 @@ protected void tearDown(final TestDestinationEnv testEnv) {
}
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io.airbyte.integrations.destination.s3.avro.JsonFieldNameUpdater;
import io.airbyte.integrations.destination.s3.parquet.S3ParquetWriter;
import io.airbyte.integrations.destination.s3.util.AvroRecordHelper;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -71,4 +72,9 @@ protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
return jsonRecords;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new S3AvroParquetTestDataComparator();
}

}