Enable some tests

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
helidon-io · Jun 27, 2023 · eb29952 · eb29952
1 parent 6b937ec
commit eb29952
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/...ples/integrations/micrometer/se/src/main/java/io/helidon/examples/micrometer/se/Main.java b/...ples/integrations/micrometer/se/src/main/java/io/helidon/examples/micrometer/se/Main.java
@@ -20,6 +20,7 @@
 import io.helidon.integrations.micrometer.MicrometerFeature;
 import io.helidon.logging.common.LogConfig;
 import io.helidon.nima.webserver.WebServer;
+import io.helidon.nima.webserver.WebServer.Builder;
 import io.helidon.nima.webserver.http.HttpRouting;
 
 import io.micrometer.core.instrument.Counter;
@@ -59,11 +60,10 @@ static WebServer startServer() {
         // By default, this will pick up application.yaml from the classpath
         Config config = Config.create();
 
-        WebServer server = WebServer.builder()
+        Builder builder = WebServer.builder()
                 .config(config.get("server"))
-                .routing(r -> setupRouting(r, config))
-                .build()
-                .start();
+                .routing(r -> setupRouting(r, config));
+        WebServer server = builder.build().start();
 
         System.out.println("WEB server is up! http://localhost:" + server.port() + "/greet");
         return server;

diff --git a/.../integrations/micrometer/se/src/test/java/io/helidon/examples/micrometer/se/MainTest.java b/.../integrations/micrometer/se/src/test/java/io/helidon/examples/micrometer/se/MainTest.java
@@ -23,7 +23,7 @@
 import io.helidon.nima.testing.junit5.webserver.SetUpServer;
 import io.helidon.nima.webclient.http1.Http1Client;
 import io.helidon.nima.webclient.http1.Http1ClientResponse;
-import io.helidon.nima.webserver.WebServer;
+import io.helidon.nima.webserver.WebServer.Builder;
 
 import jakarta.json.Json;
 import jakarta.json.JsonBuilderFactory;
@@ -61,7 +61,7 @@ public MainTest(Http1Client client) {
     }
 
     @SetUpServer
-    public static void setup(WebServer.Builder builder) {
+    public static void setup(Builder builder) {
         builder.routing(r -> Main.setupRouting(r, Config.create()));
     }
 

diff --git a/.../micrometer/src/test/java/io/helidon/integrations/micrometer/MicrometerEndpointTests.java b/.../micrometer/src/test/java/io/helidon/integrations/micrometer/MicrometerEndpointTests.java
@@ -27,7 +27,6 @@
 import io.helidon.nima.webserver.WebServer;
 
 import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class MicrometerEndpointTests {
@@ -36,13 +35,11 @@ public class MicrometerEndpointTests {
 
 
     @Test
-    @Disabled("406 Not Acceptable")
     public void testDefaultEndpoint() throws ExecutionException, InterruptedException {
         runTest(MicrometerFeature.DEFAULT_CONTEXT, MicrometerFeature::create);
     }
 
     @Test
-    @Disabled("406 Not Acceptable")
     public void testExplicitEndpointWithDefaultBuiltInRegistryViaConfig() throws ExecutionException, InterruptedException {
         String context = "/aa";
         runTest(context, () -> MicrometerFeature.builder()

diff --git a/...eter/src/test/java/io/helidon/integrations/micrometer/MicrometerSimplePrometheusTest.java b/...eter/src/test/java/io/helidon/integrations/micrometer/MicrometerSimplePrometheusTest.java
@@ -25,6 +25,7 @@
 
 import io.helidon.common.http.Http;
 import io.helidon.common.http.Http.Header;
+import io.helidon.common.http.HttpMediaType;
 import io.helidon.common.media.type.MediaTypes;
 import io.helidon.nima.webclient.WebClient;
 import io.helidon.nima.webclient.http1.Http1Client;
@@ -38,7 +39,6 @@
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class MicrometerSimplePrometheusTest {
@@ -83,13 +83,12 @@ void prepTest() {
     }
 
     @Test
-    @Disabled("Cannot parse media type: TEXT_PLAIN")
     public void checkViaMediaType() throws ExecutionException, InterruptedException {
         timer1.record(2L, TimeUnit.SECONDS);
         counter1.increment(3);
         gauge1.set(4);
         Http1ClientResponse response = webClient.get()
-                .header(Header.ACCEPT, MediaTypes.TEXT_PLAIN.toString())
+                .header(Header.ACCEPT, HttpMediaType.TEXT_PLAIN.toString())
                 .path("/micrometer")
                 .request();
 

diff --git a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/WebServer.java b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/WebServer.java
@@ -153,7 +153,7 @@ default void reloadTls(Tls tls) {
     /**
      * Fluent API builder for {@link WebServer}.
      */
-    class Builder implements io.helidon.common.Builder<Builder, WebServer>, Router.RouterBuilder<Builder> {
+    public static class Builder implements io.helidon.common.Builder<Builder, WebServer>, Router.RouterBuilder<Builder> {
 
         private static final AtomicInteger WEBSERVER_COUNTER = new AtomicInteger(1);