Skip to content

Commit 144e291

Browse files
committed
adds test to asyn
1 parent f364b8c commit 144e291

File tree

4 files changed

+15
-30
lines changed

4 files changed

+15
-30
lines changed

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/DocumentConfigurationUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class DocumentConfigurationUtils {
3434
private DocumentConfigurationUtils() {
3535
}
3636

37-
public static ElasticsearchDocumentCollectionManagerFactory getConfiguration() {
37+
public static ElasticsearchDocumentCollectionManagerFactory getFactory() {
3838
es.start();
3939
ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
4040
Map<String, Object> settings = new HashMap<>();

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerAsyncTest.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*/
1515
package org.jnosql.diana.elasticsearch.document;
1616

17-
import org.awaitility.Awaitility;
1817
import org.elasticsearch.index.query.TermQueryBuilder;
1918
import org.jnosql.diana.api.document.Document;
2019
import org.jnosql.diana.api.document.DocumentCollectionManager;
@@ -32,13 +31,13 @@
3231
import java.util.concurrent.atomic.AtomicReference;
3332
import java.util.function.Consumer;
3433

34+
import static org.awaitility.Awaitility.await;
3535
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
3636
import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.delete;
3737
import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.select;
3838
import static org.jnosql.diana.elasticsearch.document.DocumentEntityGerator.COLLECTION_NAME;
3939
import static org.jnosql.diana.elasticsearch.document.DocumentEntityGerator.INDEX;
4040
import static org.jnosql.diana.elasticsearch.document.DocumentEntityGerator.getEntity;
41-
import static org.junit.jupiter.api.Assertions.assertEquals;
4241
import static org.junit.jupiter.api.Assertions.assertFalse;
4342
import static org.junit.jupiter.api.Assertions.assertThrows;
4443
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -53,8 +52,7 @@ public class ElasticsearchDocumentCollectionManagerAsyncTest {
5352

5453
@BeforeEach
5554
public void setUp() {
56-
ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
57-
ElasticsearchDocumentCollectionManagerFactory managerFactory = configuration.get();
55+
ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
5856
entityManagerAsync = managerFactory.getAsync(COLLECTION_NAME);
5957
entityManager = managerFactory.get(INDEX);
6058
DocumentEntity documentEntity = getEntity();
@@ -101,9 +99,15 @@ public void shouldRemoveEntityAsync() throws InterruptedException {
10199
DocumentDeleteQuery deleteQuery = delete().from(COLLECTION_NAME).where(id.getName()).eq(id.get()).build();
102100
entityManagerAsync.delete(deleteQuery);
103101

104-
Thread.sleep(1_000L);
105-
assertTrue(entityManager.select(query).isEmpty());
102+
AtomicBoolean condition = new AtomicBoolean(false);
103+
AtomicReference<List<DocumentEntity>> entities = new AtomicReference<>();
104+
entityManagerAsync.select(query, l -> {
105+
condition.set(true);
106+
entities.set(l);
106107

108+
});
109+
await().untilTrue(condition);
110+
assertTrue(entities.get().isEmpty());
107111
}
108112

109113
@Test
@@ -120,7 +124,7 @@ public void shouldUserSearchBuilder() throws InterruptedException {
120124
atomicBoolean.set(true);
121125
}, "person");
122126

123-
Awaitility.await().untilTrue(atomicBoolean);
127+
await().untilTrue(atomicBoolean);
124128
List<DocumentEntity> account = result.get();
125129
assertFalse(account.isEmpty());
126130
}
@@ -138,7 +142,7 @@ public void shouldReturnAll() throws InterruptedException {
138142
condition.set(true);
139143
result.set(l);
140144
});
141-
Awaitility.await().untilTrue(condition);
145+
await().untilTrue(condition);
142146
List<DocumentEntity> entities = result.get();
143147
assertFalse(entities.isEmpty());
144148

@@ -157,7 +161,7 @@ public void shouldCount() throws InterruptedException {
157161
value.set(l);
158162
};
159163
entityManagerAsync.count(DocumentEntityGerator.COLLECTION_NAME, callback);
160-
Awaitility.await().untilTrue(condition);
164+
await().untilTrue(condition);
161165
assertTrue(value.get() > 0);
162166

163167
}

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
2626

27-
import java.sql.Time;
2827
import java.time.Duration;
2928
import java.util.ArrayList;
3029
import java.util.Arrays;
3130
import java.util.List;
32-
import java.util.concurrent.TimeUnit;
3331
import java.util.stream.Collectors;
3432

3533
import static java.util.Arrays.asList;
@@ -56,7 +54,7 @@ public class ElasticsearchDocumentCollectionManagerTest {
5654

5755
@BeforeEach
5856
public void setUp() {
59-
ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getConfiguration();
57+
ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
6058
entityManager = managerFactory.get(INDEX);
6159

6260
}

elasticsearch-driver/src/test/resources/diana-elasticsearch.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)