Skip to content

Commit

Permalink
test: fixed imports and references
Browse files Browse the repository at this point in the history
Signed-off-by: Maximillian Arruda <dearrudam@gmail.com>
  • Loading branch information
dearrudam committed Mar 12, 2024
1 parent c1f7298 commit 4ba3550
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.ID;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.ID;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityGenerator.createRandomEntity;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBTestUtils.CONFIG;

Expand Down Expand Up @@ -143,7 +143,7 @@ void shouldInsert() {
assertSoftly(softly -> {
DocumentEntity entity = createRandomEntity();
var _entityType = entity.name();
var id = entity.find(DocumentEntityConverter.ID, String.class).orElseThrow();
var id = entity.find(DynamoDBConverter.ID, String.class).orElseThrow();
var persistedEntity = documentManager.insert(entity);

softly.assertThat(persistedEntity)
Expand Down Expand Up @@ -204,7 +204,7 @@ void shouldUpdate() {
documentManager.insert(List.of(entity1, entity2, entity3));

final BiConsumer<SoftAssertions, DocumentEntity> assertions = (softly, updatedEntity) -> {
Map<String, AttributeValue> item = getItem(updatedEntity.name(), updatedEntity.find(DocumentEntityConverter.ID, String.class).orElseThrow());
Map<String, AttributeValue> item = getItem(updatedEntity.name(), updatedEntity.find(DynamoDBConverter.ID, String.class).orElseThrow());
softly.assertThat(item.get("name"))
.as("the name attribute should exists in the returned item from dynamodb")
.isNotNull();
Expand Down Expand Up @@ -245,7 +245,7 @@ private Map<String, AttributeValue> getItem(String _entityType, String id) {
.tableName(_entityType)
.key(Map.of(
entityNameResolver.apply(_entityType), AttributeValue.builder().s(_entityType).build(),
DocumentEntityConverter.ID, AttributeValue.builder().s(id).build()
DynamoDBConverter.ID, AttributeValue.builder().s(id).build()
))
.build())
.item();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static DocumentEntity createRandomEntityWithSubDocuments(int levels) {
@NotNull
private static DocumentEntity createRandomEntityWithSubDocuments(String collectionName, int levels) {
Map<String, Object> map = new HashMap<>();
map.put(DocumentEntityConverter.ID, UUID.randomUUID().toString());
map.put(DynamoDBConverter.ID, UUID.randomUUID().toString());
map.put("name", faker.name().firstName());
map.put("hoje", LocalDate.now());
map.put("agora", LocalDateTime.now());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;

@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
class DocumentEntityConverterTest {
class DynamoDBConverterTest {

static final Faker faker = new Faker();

Expand All @@ -57,13 +57,13 @@ void shouldConvertToItemRequest() {
Document.of("phones", List.of(faker.name().firstName(), faker.name().firstName(), faker.name().firstName()))
));

var item = DocumentEntityConverter.toItem(entityNameResolver, entity);
var item = DynamoDBConverter.toItem(entityNameResolver, entity);

var entityFromItem = DocumentEntityConverter.toDocumentEntity(entityNameResolver, item);
var entityFromItem = DynamoDBConverter.toDocumentEntity(entityNameResolver, item);

var expected = Json.createReader(new StringReader(JSONB.toJson(DocumentEntityConverter.getMap(entityNameResolver, entity)))).readObject();
var expected = Json.createReader(new StringReader(JSONB.toJson(DynamoDBConverter.getMap(entityNameResolver, entity)))).readObject();

var actual = Json.createReader(new StringReader(JSONB.toJson(DocumentEntityConverter.getMap(entityNameResolver, entityFromItem)))).readObject();
var actual = Json.createReader(new StringReader(JSONB.toJson(DynamoDBConverter.getMap(entityNameResolver, entityFromItem)))).readObject();

softly.assertThat(actual).as("cannot convert a simple DocumentEntity")
.isEqualTo(expected);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import java.util.function.UnaryOperator;

enum DynamoDBTestUtils {
public enum DynamoDBTestUtils {

CONFIG;

Expand Down Expand Up @@ -63,7 +63,7 @@ DocumentManager getDocumentManager(Settings settings) {
return getDocumentManagerFactory(settings).apply(database);
}

Settings getSettings() {
public Settings getSettings() {
dynamodb.start();
String dynamoDBHost = getDynamoDBHost(dynamodb.getHost(), dynamodb.getFirstMappedPort());
return getSettings(dynamoDBHost);
Expand All @@ -75,7 +75,7 @@ Settings getSettings(String dynamoDBHost) {
.build();
}

Settings customSetting(SettingsBuilder builder) {
public Settings customSetting(SettingsBuilder builder) {
var defaultSetting = getSettings();
var customSetting = builder.build();
return Settings.builder()
Expand All @@ -85,7 +85,7 @@ Settings customSetting(SettingsBuilder builder) {
}

@NotNull
private static SettingsBuilder getSettingsBuilder(UnaryOperator<SettingsBuilder> builder) {
public static SettingsBuilder getSettingsBuilder(UnaryOperator<SettingsBuilder> builder) {
return builder.apply(Settings.builder())
.put(MappingConfigurations.DOCUMENT_DATABASE, "test")
.put(DynamoDBConfigurations.AWS_ACCESSKEY, System.getProperty("AWS_ACCESS_KEY_ID", "AKIAIOSFODNN7EXAMPLE"))
Expand All @@ -95,6 +95,12 @@ private static SettingsBuilder getSettingsBuilder(UnaryOperator<SettingsBuilder>
.put(DynamoDBConfigurations.ENTITY_PARTITION_KEY, "entityType");
}

public void setupSystemProperties(SettingsBuilder builder) {
Settings settings = customSetting(builder);
System.getProperties().putAll(settings.toMap());
System.out.println(System.getProperties());
}

@NotNull
String getDynamoDBHost(String host, int port) {
return "http://" + host + ":" + port;
Expand Down

0 comments on commit 4ba3550

Please sign in to comment.