Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert vaadin tests to java #7444

Merged
merged 2 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected void stopServer(ConfigurableApplicationContext ctx) {

@Override
protected void configure(HttpServerTestOptions options) {
options.setContextPath(getContextPath());
options.setContextPath("/xyz");
options.setHasHandlerSpan(unused -> true);
options.setHasResponseSpan(
endpoint -> endpoint == REDIRECT || endpoint == ERROR || endpoint == NOT_FOUND);
Expand Down Expand Up @@ -101,10 +101,6 @@ private static Class<?> load(String name) {
}
}

private static String getContextPath() {
return "/xyz";
}

@Override
public String expectedHttpRoute(ServerEndpoint endpoint) {
switch (endpoint) {
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/vaadin-14.2/javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ muzzle {
pass {
group.set("com.vaadin")
module.set("flow-server")
versions.set("[3.1.0,23.3.0)")
versions.set("[3.1.0,)")
}
}

Expand Down Expand Up @@ -68,7 +68,7 @@ dependencies {
testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))

add("vaadin14LatestTestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.+")
add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.2.+")
add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+")
}

configurations {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.vaadin;

public class Vaadin142Test extends AbstractVaadin14Test {}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package test.io.opentelemetry.javaagent.instrumentation.vaadin;

import io.opentelemetry.javaagent.instrumentation.vaadin.AbstractVaadin14Test;

public class Vaadin14LatestTest extends AbstractVaadin14Test {}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.vaadin;

public class Vaadin16Test extends AbstractVaadin16Test {}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.vaadin;

public class VaadinLatestTest extends AbstractVaadin16Test {}

This file was deleted.

This file was deleted.

Loading