Skip to content

Enabled spring RestTemplate tests for spring 6 #2920

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.

Sign up for GitHub

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

Merged
JonasKunz merged 1 commit into from
Dec 15, 2022
Merged

Enabled spring RestTemplate tests for spring 6 #2920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 40 additions & 19 deletions ...te-test/src/test/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateVersionsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@
*/

import co.elastic.apm.agent.TestClassWithDependencyRunner;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;

import java.util.List;
import java.util.stream.Collectors;
Expand All @@ -62,29 +65,48 @@ public class SpringRestTemplateVersionsIT {
"4.1.0.RELEASE|true",
"4.2.0.RELEASE|true",
"4.3.0.RELEASE|true",
"5.0.0.RELEASE|true",
"5.1.0.RELEASE|true",
"5.2.0.RELEASE|true",
"[5.3.0,6.0.0)|true" // using ivy range specifier to make test against later versions
})
void testVersion(String version, boolean isSupported) throws Exception {
void testVersion4AndOlder(String version, boolean isSupported) throws Exception {
testVersionImpl(version, isSupported, List.of("org.slf4j:jcl-over-slf4j:1.7.30"));
}

@ParameterizedTest
@ValueSource(strings = {
"5.0.0.RELEASE",
"5.1.0.RELEASE",
"5.2.0.RELEASE",
"[5.3.0,6.0.0)", // using ivy range specifier to make test against later versions
})
void testVersion5(String version) throws Exception {
testVersionImpl(version, true, List.of(String.format("org.springframework:spring-jcl:%s", version)));
}

@ParameterizedTest
@ValueSource(strings = {
"[6.0.0,7.0.0)" // using ivy range specifier to make test against later versions
})
@EnabledForJreRange(min = JRE.JAVA_17, disabledReason = "Spring 6 requires JDK 17")
void testVersion6(String version) throws Exception {
testVersionImpl(version, true, List.of(
String.format("org.springframework:spring-jcl:%s", version),
"io.micrometer:micrometer-observation:1.10.2",
"io.micrometer:micrometer-commons:1.10.2"
));
}

void testVersionImpl(String version, boolean isSupported, List<String> additionalDependencies) throws Exception {
List<String> dependencies = Stream.of(
"spring-webmvc",
"spring-aop",
"spring-beans",
"spring-context",
"spring-core",
"spring-expression",
"spring-web")
"spring-webmvc",
"spring-aop",
"spring-beans",
"spring-context",
"spring-core",
"spring-expression",
"spring-web")
.map(s -> String.format("org.springframework:%s:%s", s, version))
.collect(Collectors.toList());

if (version.startsWith("5.")) {
dependencies.add(String.format("org.springframework:spring-jcl:%s", version));
} else {
dependencies.add("org.slf4j:jcl-over-slf4j:1.7.30");
}

dependencies.addAll(additionalDependencies);

Class<?> testClass = SprintRestTemplateIntegration.class;
Class<?>[] otherClasses = new Class<?>[0];
Expand All @@ -96,5 +118,4 @@ void testVersion(String version, boolean isSupported) throws Exception {
runner.run();
}


}