14
14
import java .io .IOException ;
15
15
import java .util .List ;
16
16
17
+ import org .awaitility .Awaitility ;
17
18
import org .testng .SkipException ;
18
19
import org .testng .annotations .AfterClass ;
19
20
import org .testng .annotations .Test ;
@@ -40,12 +41,22 @@ public class TestRediSearchConnectorSmokeTest extends BaseConnectorSmokeTest {
40
41
private RediSearchServer redisearch ;
41
42
42
43
private void populateBeers () throws IOException {
44
+ deleteBeers ();
45
+ Beers .populateIndex (redisearch .getTestContext ().getConnection ());
46
+ }
47
+
48
+ private void createBeersIndex () {
49
+ deleteBeers ();
50
+ Beers .createIndex (redisearch .getTestContext ().getConnection ());
51
+ }
52
+
53
+ private void deleteBeers () {
43
54
try {
44
55
redisearch .getTestContext ().sync ().ftDropindexDeleteDocs (Beers .INDEX );
45
56
} catch (Exception e ) {
46
57
// ignore
47
58
}
48
- Beers . populateIndex ( redisearch .getTestContext ().getConnection () );
59
+ Awaitility . await (). until (() -> redisearch .getTestContext ().sync (). dbsize () == 0 );
49
60
}
50
61
51
62
@ Override
@@ -128,12 +139,7 @@ public void testBuiltinFields() throws IOException {
128
139
129
140
@ Test
130
141
public void testCountEmptyIndex () throws IOException {
131
- try {
132
- redisearch .getTestContext ().sync ().ftDropindexDeleteDocs (Beers .INDEX );
133
- } catch (Exception e ) {
134
- // ignore
135
- }
136
- Beers .createIndex (redisearch .getTestContext ().getConnection ());
142
+ createBeersIndex ();
137
143
assertQuery ("SELECT count(*) FROM beers" , "VALUES 0" );
138
144
}
139
145
@@ -160,12 +166,7 @@ public void testShowCreateTable() {
160
166
161
167
@ Test
162
168
public void testInsertIndex () throws IOException {
163
- try {
164
- redisearch .getTestContext ().sync ().ftDropindexDeleteDocs (Beers .INDEX );
165
- } catch (Exception e ) {
166
- // ignore
167
- }
168
- Beers .createIndex (redisearch .getTestContext ().getConnection ());
169
+ createBeersIndex ();
169
170
assertUpdate ("INSERT INTO beers (id, name) VALUES ('abc', 'mybeer')" , 1 );
170
171
assertThat (query ("SELECT id, name FROM beers" )).matches ("VALUES (VARCHAR 'abc', VARCHAR 'mybeer')" );
171
172
List <String > keys = redisearch .getTestContext ().sync ().keys ("beer:*" );
0 commit comments