1414import java .io .IOException ;
1515import java .util .List ;
1616
17+ import org .awaitility .Awaitility ;
1718import org .testng .SkipException ;
1819import org .testng .annotations .AfterClass ;
1920import org .testng .annotations .Test ;
@@ -40,12 +41,22 @@ public class TestRediSearchConnectorSmokeTest extends BaseConnectorSmokeTest {
4041 private RediSearchServer redisearch ;
4142
4243 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 () {
4354 try {
4455 redisearch .getTestContext ().sync ().ftDropindexDeleteDocs (Beers .INDEX );
4556 } catch (Exception e ) {
4657 // ignore
4758 }
48- Beers . populateIndex ( redisearch .getTestContext ().getConnection () );
59+ Awaitility . await (). until (() -> redisearch .getTestContext ().sync (). dbsize () == 0 );
4960 }
5061
5162 @ Override
@@ -128,12 +139,7 @@ public void testBuiltinFields() throws IOException {
128139
129140 @ Test
130141 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 ();
137143 assertQuery ("SELECT count(*) FROM beers" , "VALUES 0" );
138144 }
139145
@@ -160,12 +166,7 @@ public void testShowCreateTable() {
160166
161167 @ Test
162168 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 ();
169170 assertUpdate ("INSERT INTO beers (id, name) VALUES ('abc', 'mybeer')" , 1 );
170171 assertThat (query ("SELECT id, name FROM beers" )).matches ("VALUES (VARCHAR 'abc', VARCHAR 'mybeer')" );
171172 List <String > keys = redisearch .getTestContext ().sync ().keys ("beer:*" );
0 commit comments