Merge pull request #565 from alex268/master

Added option to fail integration tests if test database is unavailable

Author: alex268

tests/junit4-support/src/main/java/tech/ydb/test/junit4/GrpcTransportRule.java

@@ -21,7 +21,21 @@
 public class GrpcTransportRule extends ProxyGrpcTransport implements TestRule {
     private static final Logger logger = LoggerFactory.getLogger(GrpcTransportRule.class);
 
-    private final AtomicReference<GrpcTransport> proxy = new AtomicReference<>();
+    private final AtomicReference<GrpcTransport> proxy;
+    private final boolean skipOnUnavailable;
+
+    private GrpcTransportRule(AtomicReference<GrpcTransport> proxy, boolean skipOnUnavailable) {
+        this.proxy = proxy;
+        this.skipOnUnavailable = skipOnUnavailable;
+    }
+
+    public GrpcTransportRule() {
+        this(new AtomicReference<>(), true);
+    }
+
+    public GrpcTransportRule failIfUnavailable() {
+        return new GrpcTransportRule(proxy, false);
+    }
 
     @Override
     public Statement apply(Statement base, Description description) {
@@ -30,17 +44,20 @@ public Statement apply(Statement base, Description description) {
         return new Statement() {
             @Override
             public void evaluate() throws Throwable {
+                String path = description.getDisplayName();
+                if (description.getMethodName() != null) {
+                    path += "/" + description.getMethodName();
+                }
+
                 if (!factory.isEnabled()) {
-                    logger.info("Test {} skipped because ydb helper is not available", description.getDisplayName());
+                    if (!skipOnUnavailable) {
+                        throw new AssertionError("Ydb helper is not available " + path);
+                    }
+                    logger.info("Test {} skipped because ydb helper is not available", path);
                     Assume.assumeFalse("YDB Helper is not available", true);
                     return;
                 }
 
-                String path = description.getClassName();
-                if (description.getMethodName() != null) {
-                    path += "/" + description.getMethodName();
-                }
-
                 logger.debug("create ydb helper for test {}", path);
                 try (YdbHelper helper = factory.createHelper()) {
                     try (GrpcTransport transport = helper.createTransport()) {

tests/junit4-support/src/main/java/tech/ydb/test/junit4/YdbHelperRule.java

@@ -20,7 +20,21 @@
 public class YdbHelperRule extends ProxyYdbHelper implements TestRule {
     private static final Logger logger = LoggerFactory.getLogger(YdbHelperRule.class);
 
-    private final AtomicReference<YdbHelper> proxy = new AtomicReference<>();
+    private final AtomicReference<YdbHelper> proxy;
+    private final boolean skipOnUnavailable;
+
+    private YdbHelperRule(AtomicReference<YdbHelper> proxy, boolean skipOnUnavailable) {
+        this.proxy = proxy;
+        this.skipOnUnavailable = skipOnUnavailable;
+    }
+
+    public YdbHelperRule() {
+        this(new AtomicReference<>(), true);
+    }
+
+    public YdbHelperRule failIfUnavailable() {
+        return new YdbHelperRule(proxy, false);
+    }
 
     @Override
     public Statement apply(Statement base, Description description) {
@@ -29,13 +43,17 @@ public Statement apply(Statement base, Description description) {
         return new Statement() {
             @Override
             public void evaluate() throws Throwable {
+                String path = description.getDisplayName();
+
                 if (!factory.isEnabled()) {
-                    logger.info("Test {} skipped because ydb helper is not available", description.getDisplayName());
+                    if (!skipOnUnavailable) {
+                        throw new AssertionError("Ydb helper is not available " + path);
+                    }
+                    logger.info("Test {} skipped because ydb helper is not available", path);
                     Assume.assumeFalse("YDB Helper is not available", true);
                     return;
                 }
 
-                String path = description.getDisplayName();
                 logger.debug("create ydb helper for test {}", path);
                 try (YdbHelper helper = factory.createHelper()) {
                     proxy.set(helper);

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

@@ -25,15 +25,35 @@ public class GrpcTransportExtension extends ProxyGrpcTransport implements AfterA
         BeforeAllCallback, BeforeEachCallback {
     private static final Logger logger = LoggerFactory.getLogger(GrpcTransportExtension.class);
 
-    private final Holder holder = new Holder();
+    private final boolean skipOnUnavailable;
+    private final Holder holder;
+
+    private GrpcTransportExtension(Holder holder, boolean skipOnUnavailable) {
+        this.holder = holder;
+        this.skipOnUnavailable = skipOnUnavailable;
+    }
+
+    public GrpcTransportExtension() {
+        this(new Holder(), true);
+    }
+
+    public GrpcTransportExtension failIfUnavailable() {
+        return new GrpcTransportExtension(holder, false);
+    }
 
     @Override
     protected GrpcTransport origin() {
         return holder.transport();
     }
 
     private void ensureEnabled(String displayName) {
-        Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
+        if (skipOnUnavailable) {
+            Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
+        } else {
+            if (!YdbHelperFactory.getInstance().isEnabled()) {
+                throw new AssertionError("Ydb helper is not available " + displayName);
+            }
+        }
     }
 
     @Override

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

@@ -23,15 +23,35 @@ public class YdbHelperExtension extends ProxyYdbHelper implements BeforeAllCallb
         BeforeEachCallback, AfterEachCallback {
     private static final Logger logger = LoggerFactory.getLogger(GrpcTransportExtension.class);
 
-    private final Holder holder = new Holder();
+    private final boolean skipOnUnavailable;
+    private final Holder holder;
+
+    private YdbHelperExtension(Holder holder, boolean skipOnUnavailable) {
+        this.holder = holder;
+        this.skipOnUnavailable = skipOnUnavailable;
+    }
+
+    public YdbHelperExtension() {
+        this(new Holder(), true);
+    }
+
+    public YdbHelperExtension failIfUnavailable() {
+        return new YdbHelperExtension(holder, false);
+    }
 
     @Override
     protected YdbHelper origin() {
         return holder.helper();
     }
 
     private void ensureEnabled(String displayName) {
-        Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
+        if (skipOnUnavailable) {
+            Assumptions.assumeTrue(YdbHelperFactory.getInstance().isEnabled(), "Ydb helper is disabled " + displayName);
+        } else {
+            if (!YdbHelperFactory.getInstance().isEnabled()) {
+                throw new AssertionError("Ydb helper is not available " + displayName);
+            }
+        }
     }
 
     @Override