Skip to content

Commit

Permalink
Add windows OS to pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
tvallin committed Nov 9, 2024
1 parent bf5e61f commit 720e1f2
Show file tree
Hide file tree
Showing 16 changed files with 58 additions and 42 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ jobs:
run: etc/scripts/shellcheck.sh
build:
timeout-minutes: 15
runs-on: ubuntu-20.04
strategy:
matrix:
os: [ ubuntu-20.04, windows-2022 ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ private Filer scratchFiler() throws IOException {
private Optional<Path> codegenResourceFilerOut(String outPath,
String body,
Optional<Function<InputStream, String>> optFnUpdater) {
outPath = outPath.replace(File.separator, "/");
Messager messager = messager();
if (!filerWriterEnabled()) {
messager.log("(disabled) Writing " + outPath + " with:\n" + body);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public class ModuleUtils {
public static final String APPLICATION_PACKAGE_FILE_NAME = "app-package-name.txt";
static final System.Logger LOGGER = System.getLogger(ModuleUtils.class.getName());
static final String SERVICE_PROVIDER_MODULE_INFO_HBS = "module-info.hbs";
static final String SRC_MAIN_JAVA_DIR = "/src/main/java";
static final String SRC_TEST_JAVA_DIR = "/src/test/java";
static final String SRC_MAIN_JAVA_DIR = File.separator + "src" + File.separator + "main" + File.separator + "java";
static final String SRC_TEST_JAVA_DIR = File.separator + "src" + File.separator + "test" + File.separator + "java";
static final ModuleInfoItem MODULE_COMPONENT_MODULE_INFO = ModuleInfoItem.builder()
.provides(true)
.target(ModuleComponent.class.getName())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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, "/");
}


Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -76,9 +73,14 @@ void spanNaming() {

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"));
List<String> names = spanExporter.getFinishedSpanItems(2)
.stream()
.map(SpanData::getName)
.collect(Collectors.toList());

assertThat(names.size(), is(2));
assertThat(names, hasItem("http://localhost:" + webTarget.getUri().getPort() + "/named"));
assertThat(names, hasItem("HTTP GET"));
}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
* Copyright (c) 2020, 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.
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
import io.helidon.webserver.testing.junit5.SetUpServer;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
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;
Expand All @@ -68,6 +70,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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -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();
Expand All @@ -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)));
}
}
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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.
*/
Expand Down

0 comments on commit 720e1f2

Please sign in to comment.