Enable h2 tests #7286

helidon-io · Aug 2, 2023 · 4ebac75 · 4ebac75
1 parent 6153086
commit 4ebac75
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/...ttp2/webclient/src/main/java/io/helidon/nima/http2/webclient/Http2ClientResponseImpl.java b/...ttp2/webclient/src/main/java/io/helidon/nima/http2/webclient/Http2ClientResponseImpl.java
@@ -85,7 +85,9 @@ public ReadableEntity entity() {
 
     private BufferData readBytes(int estimate) {
         try {
-            byte[] buffer = new byte[estimate];
+            // Empty buffer is considered as a fully consumed entity
+            // so estimate can't be less than 1
+            byte[] buffer = new byte[estimate > 0 ? estimate : 16];
             int read = inputStream.read(buffer);
             if (read < 1) {
                 return BufferData.empty();

diff --git a/...t/src/test/java/io/helidon/nima/tests/integration/http2/client/ClientFlowControlTest.java b/...t/src/test/java/io/helidon/nima/tests/integration/http2/client/ClientFlowControlTest.java
@@ -41,15 +41,13 @@
 import io.vertx.core.http.HttpServerRequest;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@Disabled
 class ClientFlowControlTest {
 
     private static final System.Logger LOGGER = System.getLogger(ClientFlowControlTest.class.getName());

diff --git a/...ttp2/client/src/test/java/io/helidon/nima/tests/integration/http2/client/HeadersTest.java b/...ttp2/client/src/test/java/io/helidon/nima/tests/integration/http2/client/HeadersTest.java
@@ -48,7 +48,6 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
 
-@Disabled
 class HeadersTest {
 
     private static final Duration TIMEOUT = Duration.ofSeconds(10);

diff --git a/nima/tests/integration/http2/client/src/test/resources/logging-test.properties b/nima/tests/integration/http2/client/src/test/resources/logging-test.properties
@@ -18,4 +18,4 @@ java.util.logging.ConsoleHandler.level=FINEST
 java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS.%1$tL %5$s%6$s%n
 # Global logging level. Can be overridden by specific loggers
 .level=INFO
-io.helidon.nima.level=FINEST
+io.helidon.nima.level=INFO
diff --git a/...rver/src/test/java/io/helidon/nima/tests/integration/http2/webserver/FlowControlTest.java b/...rver/src/test/java/io/helidon/nima/tests/integration/http2/webserver/FlowControlTest.java
@@ -45,7 +45,6 @@
 import io.helidon.nima.webserver.WebServerConfig;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.common.http.Http.Method.GET;
@@ -123,7 +122,6 @@ static void afterAll() throws InterruptedException {
     }
 
     @Test
-    @Disabled
     void flowControlWebClientInOut() throws ExecutionException, InterruptedException, TimeoutException {
         flowControlServerLatch = new CompletableFuture<>();
         flowControlClientLatch = new CompletableFuture<>();
@@ -180,7 +178,6 @@ void flowControlWebClientInOut() throws ExecutionException, InterruptedException
     }
 
     @Test
-    @Disabled
     void flowControlWebClientInbound() {
         var client = Http2Client.builder()
                 .protocolConfig(http2 -> http2.priorKnowledge(true))