add windows os + rebase

tvallin · tvallin · commit f2d3a95ebda1 · 2024-11-08T15:04:01.000+01:00
diff --git a/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java b/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java
@@ -16,6 +16,7 @@
 
 package io.helidon.integrations.oci.sdk.runtime;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
@@ -162,7 +163,14 @@ static boolean canReadPath(String pathName) {
     }
 
     static String userHomePrivateKeyPath(OciConfig ociConfig) {
-        return Paths.get(System.getProperty("user.home"), ".oci", ociConfig.authKeyFile()).toString();
+        return normalizePath(Paths.get(System.getProperty("user.home"), ".oci", ociConfig.authKeyFile()).toString());
+    }
+
+    private static String normalizePath(String value) {
+        if (value == null) {
+            return null;
+        }
+        return value.replace(File.separator, "/");
     }
 
 
diff --git a/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java
@@ -43,7 +43,7 @@ public class InMemorySpanExporter implements SpanExporter {
      */
     public List<SpanData> getFinishedSpanItems(int spanCount) {
         assertSpanCount(spanCount);
-        return finishedSpanItems.stream().sorted(comparingLong(SpanData::getStartEpochNanos).reversed())
+        return finishedSpanItems.stream().sorted(comparingLong(SpanData::getEndEpochNanos)
                 .collect(Collectors.toList());
     }
 
diff --git a/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
@@ -17,10 +17,8 @@
 package io.helidon.microprofile.telemetry;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
-import io.helidon.http.Status;
-import io.helidon.microprofile.telemetry.InMemorySpanExporter;
-import io.helidon.microprofile.telemetry.InMemorySpanExporterProvider;
 import io.helidon.microprofile.testing.junit5.AddBean;
 import io.helidon.microprofile.testing.junit5.AddConfig;
 import io.helidon.microprofile.testing.junit5.AddExtension;
@@ -29,16 +27,15 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.ApplicationPath;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Application;
 import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 
 /**
@@ -73,12 +70,15 @@ void setup() {
 
     @Test
     void spanNaming() {
+        List<String> names = spanExporter.getFinishedSpanItems(2)
+                .stream()
+                .map(SpanData::getName)
+                .collect(Collectors.toList());
 
         assertThat(webTarget.path("named").request().get().getStatus(), is(Response.Status.OK.getStatusCode()));
-
-        List<SpanData> spanItems = spanExporter.getFinishedSpanItems(2);
-        assertThat(spanItems.size(), is(2));
-        assertThat(spanItems.get(0).getName(), is("http://localhost:" + webTarget.getUri().getPort() + "/named"));
+        assertThat(names.size(), is(2));
+        assertThat(names, hasItem("http://localhost:" + webTarget.getUri().getPort() + "/named"));
+        assertThat(names, hasItem("HTTP GET"));
     }
 
 
diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java
@@ -43,6 +43,8 @@
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static java.lang.System.Logger.Level.DEBUG;
 
@@ -106,6 +108,7 @@ void resendAckTestPart1(SeContainer cdi) {
 
     @Test
     @Order(2)
+    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "https://github.com/helidon-io/helidon/issues/8509")
     void resendAckTestPart2(SeContainer cdi) {
             MockConnector mockConnector = cdi.select(MockConnector.class, TEST_CONNECTOR_ANNOTATION).get();
 
diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java
@@ -54,7 +54,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 
-@Testcontainers
+@Testcontainers(disabledWithoutDocker = true)
 @HelidonTest(resetPerTest = true)
 @AddBean(TestResource.class)
 class CommonLoginBase {
diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java
@@ -20,8 +20,6 @@
 import jakarta.ws.rs.client.WebTarget;
 import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.Response;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_POST_LOGOUT_TEST_MESSAGE;
diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java
@@ -27,33 +27,24 @@
 import io.helidon.security.jwt.Jwt;
 import io.helidon.security.jwt.SignedJwt;
 import io.helidon.security.jwt.jwk.Jwk;
-import io.helidon.security.providers.oidc.common.OidcConfig;
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.security.providers.oidc.common.OidcConfig.DEFAULT_ID_COOKIE_NAME;
 import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE;
-import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
 
 class IdTokenIT extends CommonLoginBase {
 
diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java
@@ -24,8 +24,6 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
 import org.glassfish.jersey.client.ClientProperties;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE;
diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java
@@ -33,21 +33,15 @@
 import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.junit.jupiter.api.Test;
 
-import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_POST_LOGOUT_TEST_MESSAGE;
 import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE;
 import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 
 @AddConfig(key = "security.providers.1.oidc.token-signature-validation", value = "false")
diff --git a/webserver/static-content/src/main/java/io/helidon/webserver/staticcontent/FileSystemContentHandler.java b/webserver/static-content/src/main/java/io/helidon/webserver/staticcontent/FileSystemContentHandler.java
@@ -16,6 +16,7 @@
 
 package io.helidon.webserver.staticcontent;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.nio.file.Files;
@@ -79,7 +80,7 @@ boolean doHandle(Method method, String requestedPath, ServerRequest req, ServerR
 
         String rawPath = req.prologue().uriPath().rawPath();
 
-        String relativePath = root.relativize(path).toString().replace("\\", "/");
+        String relativePath = root.relativize(path).toString().replace(File.separator, "/");
         String requestedResource;
         if (mapped) {
             requestedResource = relativePath;
diff --git a/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java b/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java
@@ -60,6 +60,7 @@
 import io.helidon.webserver.testing.junit5.SetUpServer;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.OS;
 
 import static io.helidon.http.Method.GET;
 import static io.netty.handler.codec.http2.Http2CodecUtil.FRAME_HEADER_LENGTH;
@@ -68,6 +69,7 @@
 import static org.hamcrest.Matchers.is;
 
 @ServerTest
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "https://github.com/helidon-io/helidon/issues/8510")
 class EmptyFrameCntTest {
 
     private static final Duration TIMEOUT = Duration.ofSeconds(10);
diff --git a/webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerStopIdleTest.java b/webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerStopIdleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
 import io.helidon.webserver.WebServer;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,7 +32,20 @@
 class WebServerStopIdleTest {
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     void stopWhenIdleExpectTimelyStop() {
+        stopWhenIdleExpectTimelyStop(500);
+    }
+
+    @Test
+    @EnabledOnOs(
+            value = OS.WINDOWS,
+            disabledReason = "Slow pipeline runner make it stop a few millisecond later")
+    void stopWhenIdleExpectTimelyStopWindows() {
+        stopWhenIdleExpectTimelyStop(505);
+    }
+
+    void stopWhenIdleExpectTimelyStop(int timeout) {
         WebServer webServer = WebServer.builder()
                 .routing(router -> router.get("ok", (req, res) -> res.send("ok")))
                 .build();
@@ -46,6 +62,6 @@ void stopWhenIdleExpectTimelyStop() {
         long startMillis = System.currentTimeMillis();
         webServer.stop();
         int stopExecutionTimeInMillis = (int) (System.currentTimeMillis() - startMillis);
-        assertThat(stopExecutionTimeInMillis, is(lessThan(500)));
+        assertThat(stopExecutionTimeInMillis, is(lessThan(timeout)));
     }
 }
diff --git a/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java b/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@
 import static io.helidon.webserver.tests.websocket.WsAction.OperationType.TEXT;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-;
-
 /**
  * A websocket client that is driven by a conversation instance.
  */

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class InMemorySpanExporter implements SpanExporter {`
`43`	`43`	`*/`
`44`	`44`	`public List<SpanData> getFinishedSpanItems(int spanCount) {`
`45`	`45`	`assertSpanCount(spanCount);`
`46`		`- return finishedSpanItems.stream().sorted(comparingLong(SpanData::getStartEpochNanos).reversed())`
	`46`	`+ return finishedSpanItems.stream().sorted(comparingLong(SpanData::getEndEpochNanos)`
`47`	`47`	`.collect(Collectors.toList());`
`48`	`48`	`}`
`49`	`49`