Skip to content

Commit dab9b75

Browse files
committed
Added option failIfUnavailable to JUnit5 helper
1 parent 01f8286 commit dab9b75

File tree

2 files changed

+44
-4
lines changed

2 files changed

+44
-4
lines changed

tests/junit5-support/src/main/java/tech/ydb/test/junit5/GrpcTransportExtension.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,35 @@ public class GrpcTransportExtension extends ProxyGrpcTransport implements AfterA
2525
BeforeAllCallback, BeforeEachCallback {
2626
private static final Logger logger = LoggerFactory.getLogger(GrpcTransportExtension.class);
2727

28-
private final Holder holder = new Holder();
28+
private final boolean skipOnUnavailable;
29+
private final Holder holder;
30+
31+
private GrpcTransportExtension(Holder holder, boolean skipOnUnavailable) {
32+
this.holder = holder;
33+
this.skipOnUnavailable = skipOnUnavailable;
34+
}
35+
36+
public GrpcTransportExtension() {
37+
this(new Holder(), true);
38+
}
39+
40+
public GrpcTransportExtension failIfUnavailable() {
41+
return new GrpcTransportExtension(holder, false);
42+
}
2943

3044
@Override
3145
protected GrpcTransport origin() {
3246
return holder.transport();
3347
}
3448

3549
private void ensureEnabled(String displayName) {
36-
Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
50+
if (skipOnUnavailable) {
51+
Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
52+
} else {
53+
if (!YdbHelperFactory.getInstance().isEnabled()) {
54+
throw new AssertionError("Ydb helper is not available " + displayName);
55+
}
56+
}
3757
}
3858

3959
@Override

tests/junit5-support/src/main/java/tech/ydb/test/junit5/YdbHelperExtension.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,35 @@ public class YdbHelperExtension extends ProxyYdbHelper implements BeforeAllCallb
2323
BeforeEachCallback, AfterEachCallback {
2424
private static final Logger logger = LoggerFactory.getLogger(GrpcTransportExtension.class);
2525

26-
private final Holder holder = new Holder();
26+
private final boolean skipOnUnavailable;
27+
private final Holder holder;
28+
29+
private YdbHelperExtension(Holder holder, boolean skipOnUnavailable) {
30+
this.holder = holder;
31+
this.skipOnUnavailable = skipOnUnavailable;
32+
}
33+
34+
public YdbHelperExtension() {
35+
this(new Holder(), true);
36+
}
37+
38+
public YdbHelperExtension failIfUnavailable() {
39+
return new YdbHelperExtension(holder, false);
40+
}
2741

2842
@Override
2943
protected YdbHelper origin() {
3044
return holder.helper();
3145
}
3246

3347
private void ensureEnabled(String displayName) {
34-
Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
48+
if (skipOnUnavailable) {
49+
Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
50+
} else {
51+
if (!YdbHelperFactory.getInstance().isEnabled()) {
52+
throw new AssertionError("Ydb helper is not available " + displayName);
53+
}
54+
}
3555
}
3656

3757
@Override

0 commit comments

Comments
 (0)