Skip to content

Align Gradle with upstream: Adopt test suites for smoke tests #4612

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

Closed
trask wants to merge 1 commit into from
+24 −35
Closed

Align Gradle with upstream: Adopt test suites for smoke tests #4612

Show file tree
Hide file tree
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
49 changes: 24 additions & 25 deletions buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,6 @@ plugins {

val aiSmokeTest = extensions.create<AiSmokeTestExtension>("aiSmokeTest")

sourceSets {
create("smokeTest") {
compileClasspath += sourceSets.main.get().output
runtimeClasspath += sourceSets.main.get().output
}
}

val smokeTestImplementation by configurations.getting {
extendsFrom(configurations.implementation.get())
}

configurations["smokeTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())

// FIXME (trask) copy-pasted from ai.java-conventions.gradle
java {
toolchain {
Expand Down Expand Up @@ -66,18 +53,33 @@ dependencies {
// FIXME (trask) copy-pasted from ai.java-conventions.gradle
dependencyManagement(platform(project(":dependencyManagement")))

smokeTestImplementation(project(":smoke-tests:framework"))
agent(project(":agent:agent", configuration = "shadow"))

old3xAgent("com.microsoft.azure:applicationinsights-agent:3.2.11")
}

smokeTestImplementation("org.junit.jupiter:junit-jupiter-api")
smokeTestImplementation("org.junit.jupiter:junit-jupiter-params")
smokeTestImplementation("org.junit.jupiter:junit-jupiter-engine")
smokeTestImplementation("org.junit.platform:junit-platform-launcher")
// Configure test suites
testing {
suites {
register<JvmTestSuite>("smokeTest") {
dependencies {
implementation(project(":smoke-tests:framework"))

smokeTestImplementation("org.assertj:assertj-core")
implementation("org.junit.jupiter:junit-jupiter-api")
implementation("org.junit.jupiter:junit-jupiter-params")
runtimeOnly("org.junit.jupiter:junit-jupiter-engine")
runtimeOnly("org.junit.platform:junit-platform-launcher")

agent(project(":agent:agent", configuration = "shadow"))
implementation("org.assertj:assertj-core")
}
}
}
}

old3xAgent("com.microsoft.azure:applicationinsights-agent:3.2.11")
// Make smokeTest configuration extend from main implementation configuration
// so that project dependencies (e.g., log4j in ClassicSdkLog4j1Interop2x) are available
configurations.named("smokeTestImplementation") {
extendsFrom(configurations.implementation.get())
}

configurations.all {
Expand Down Expand Up @@ -106,17 +108,14 @@ tasks {
}
}

register<Test>("smokeTest") {
named<Test>("smokeTest") {
useJUnitPlatform()

// this is just to force building the agent first
dependsOn(":agent:agent:shadowJar")

dependsOn(assemble)

testClassesDirs = sourceSets["smokeTest"].output.classesDirs
classpath = sourceSets["smokeTest"].runtimeClasspath

// TODO (trask) experiment with parallelization
// maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1

Expand Down
5 changes: 0 additions & 5 deletions ...smokeTest/java/com/microsoft/applicationinsights/smoketest/OtlpLogAnalyticsOnAksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.mockserver.model.HttpRequest.request;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

import com.microsoft.applicationinsights.smoketest.schemav2.Data;
import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
Expand All @@ -28,11 +27,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockserver.model.HttpRequest;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {OtlpApplication.class},
webEnvironment = RANDOM_PORT)
@UseAgent
abstract class OtlpLogAnalyticsOnAksTest {

Expand Down
5 changes: 0 additions & 5 deletions .../OtlpMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OtlpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.mockserver.model.HttpRequest.request;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

import com.microsoft.applicationinsights.smoketest.schemav2.Data;
import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
Expand All @@ -19,11 +18,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockserver.model.HttpRequest;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {OtlpApplication.class},
webEnvironment = RANDOM_PORT)
@UseAgent
abstract class OtlpTest {

Expand Down