Skip to content

Commit c2679bc

Browse files
authored
Merge pull request #243 from ZettaScaleLabs/fix_tests
Fix flaky query tests
2 parents a73e1b6 + 1c5f5d6 commit c2679bc

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

zenoh-java/src/jvmTest/java/io/zenoh/GetTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ public void tearDown() throws ZError {
5555
}
5656

5757
@Test
58-
public void get_runsWithCallbackTest() throws ZError {
58+
public void get_runsWithCallbackTest() throws ZError, InterruptedException {
5959
Reply[] reply = new Reply[1];
6060

6161
var getOptions = new GetOptions();
6262
getOptions.setTimeout(Duration.ofMillis(1000));
6363
session.get(selector, reply1 -> reply[0] = reply1, getOptions);
6464

65+
Thread.sleep(1000);
6566
assertNotNull(reply[0]);
6667
Sample sample = ((Reply.Success) reply[0]).getSample();
6768
assertEquals(payload, sample.getPayload());

zenoh-java/src/jvmTest/java/io/zenoh/QuerierTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class QuerierTest {
5151
* Test validating both Queryable and get operations.
5252
*/
5353
@Test
54-
public void querier_runsWithCallbackTest() throws ZError {
54+
public void querier_runsWithCallbackTest() throws ZError, InterruptedException {
5555
var sample = new Sample(
5656
testKeyExpr,
5757
testPayload,
@@ -91,6 +91,7 @@ public void querier_runsWithCallbackTest() throws ZError {
9191
options
9292
);
9393

94+
Thread.sleep(1000);
9495
assertNotNull(receivedReply[0]);
9596
assertEquals(sample, ((Reply.Success) receivedReply[0]).getSample());
9697

zenoh-java/src/jvmTest/java/io/zenoh/QueryableTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void tearDown() throws ZError {
4444
}
4545

4646
@Test
47-
public void queryableRunsWithCallback() throws ZError {
47+
public void queryableRunsWithCallback() throws ZError, InterruptedException {
4848
var timestamp = new TimeStamp(Date.from(Instant.now()));
4949

5050
var sample = new Sample(
@@ -70,7 +70,7 @@ public void queryableRunsWithCallback() throws ZError {
7070

7171
Reply[] reply = new Reply[1];
7272
session.get(testKeyExpr.into(), reply1 -> reply[0] = reply1);
73-
73+
Thread.sleep(1000);
7474
assertNotNull(reply[0]);
7575
Sample receivedSample = ((Reply.Success) reply[0]).getSample();
7676
assertEquals(sample, receivedSample);
@@ -130,7 +130,7 @@ public void queryTest() throws ZError, InterruptedException {
130130
}
131131

132132
@Test
133-
public void queryReplySuccessTest() throws ZError {
133+
public void queryReplySuccessTest() throws ZError, InterruptedException {
134134
var message = ZBytes.from("Test message");
135135
var timestamp = TimeStamp.getCurrentTime();
136136

@@ -149,7 +149,7 @@ public void queryReplySuccessTest() throws ZError {
149149

150150
Reply[] receivedReply = new Reply[1];
151151
session.get(testKeyExpr, reply -> receivedReply[0] = reply);
152-
152+
Thread.sleep(1000);
153153
queryable.close();
154154

155155
assertNotNull(receivedReply[0]);

zenoh-java/src/jvmTest/java/io/zenoh/UserAttachmentTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void queryWithAttachmentTest() throws ZError {
171171
}
172172

173173
@Test
174-
public void queryReplyWithAttachmentTest() throws ZError {
174+
public void queryReplyWithAttachmentTest() throws ZError, InterruptedException {
175175
Reply[] reply = new Reply[1];
176176
var queryable = session.declareQueryable(keyExpr, query -> {
177177
try {
@@ -191,14 +191,15 @@ public void queryReplyWithAttachmentTest() throws ZError {
191191

192192
queryable.close();
193193

194+
Thread.sleep(1000);
194195
Reply receivedReply = reply[0];
195196
assertNotNull(receivedReply);
196197
ZBytes receivedAttachment = ((Reply.Success) receivedReply).getSample().getAttachment();
197198
assertEquals(attachment, receivedAttachment);
198199
}
199200

200201
@Test
201-
public void queryReplyWithoutAttachmentTest() throws ZError {
202+
public void queryReplyWithoutAttachmentTest() throws ZError, InterruptedException {
202203
Reply[] reply = new Reply[1];
203204
var queryable = session.declareQueryable(keyExpr, query -> {
204205
try {
@@ -211,6 +212,7 @@ public void queryReplyWithoutAttachmentTest() throws ZError {
211212

212213
queryable.close();
213214

215+
Thread.sleep(1000);
214216
Reply receivedReply = reply[0];
215217
assertNotNull(receivedReply);
216218
ZBytes receivedAttachment = ((Reply.Success) receivedReply).getSample().getAttachment();

0 commit comments

Comments
 (0)