Merge pull request #207 from nstdio/restructure-tests

test: Restructure tests.

Author: nstdio

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Edgar Asatryan
+ * Copyright (C) 2022, 2025 Edgar Asatryan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ dependencies {
     implementation("org.gradlex:extra-java-module-info:1.4.1")
     implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
     implementation("net.researchgate:gradle-release:3.0.2")
-    implementation("com.github.dpaukov:combinatoricslib3:3.4.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
     implementation("se.bjurr.gitchangelog:git-changelog-gradle-plugin:2.1.0") {

buildSrc/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts

@@ -17,50 +17,23 @@
 @file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.nativeplatform.OperatingSystemFamily.LINUX
 import org.gradle.nativeplatform.OperatingSystemFamily.MACOS
 import org.gradle.nativeplatform.OperatingSystemFamily.WINDOWS
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.paukov.combinatorics3.Generator
 import java.lang.Boolean
 import kotlin.Suppress
-import kotlin.to
 
 plugins {
   `java-library`
-  idea
   id("org.gradlex.extra-java-module-info")
 }
 
 val isCI = System.getenv("CI").toBoolean()
 
-java {
-  sourceSets {
-    create("spiTest") {
-      val output = sourceSets.main.get().output
-      compileClasspath += output
-      runtimeClasspath += output
-    }
-  }
-}
-val sourceSetsSpiTest by sourceSets.named("spiTest")
-val spiTestImplementation by configurations
-
-idea.module {
-  testSourceDirs.addAll(sourceSetsSpiTest.allSource.srcDirs)
-}
-
-mapOf(
-  "spiTestImplementation" to "testImplementation",
-  "spiTestRuntimeOnly" to "testRuntimeOnly",
-).forEach { (t, u) ->
-  configurations.getByName(t) { extendsFrom(configurations.getByName(u)) }
-}
-
 val junitVersion = "5.11.4"
 val assertJVersion = "3.27.3"
 val kotestAssertionsVersion = "5.9.1"
@@ -75,12 +48,7 @@ val gsonVersion = "2.11.0"
 val equalsverifierVersion = "3.18.1"
 val coroutinesVersion = "1.10.1"
 
-val jsonLibs = mapOf(
-  "jackson" to "com.fasterxml.jackson.core",
-  "gson" to "gson-$gsonVersion"
-)
-
-val spiDeps = listOf(
+val optionalDeps = listOf(
   "org.brotli:dec:$brotliOrgVersion",
   "com.aayushatharva.brotli4j:brotli4j:$brotli4JVersion",
   "com.github.luben:zstd-jni:$zstdJniVersion",
@@ -89,7 +57,7 @@ val spiDeps = listOf(
 )
 
 dependencies {
-  spiDeps.forEach { compileOnly(it) }
+  optionalDeps.forEach { compileOnly(it) }
 
   testImplementation(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:$coroutinesVersion"))
 
@@ -115,29 +83,10 @@ dependencies {
   /** Kotlin Coroutines */
   testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 
-  spiDeps.forEach { spiTestImplementation(it) }
-  spiTestImplementation("com.aayushatharva.brotli4j:native-${arch()}:$brotli4JVersion")
+  optionalDeps.forEach { testImplementation(it) }
+  testImplementation("com.aayushatharva.brotli4j:native-${arch()}:$brotli4JVersion")
 }
 
-Generator.subset(jsonLibs.keys)
-  .simple()
-  .stream()
-  .forEach { it ->
-    val postFix = it.joinToString("And") { it.capitalized() }
-    val taskName = if (postFix.isEmpty()) "spiTest" else "spiTestWithout${postFix}"
-    tasks.create<Test>(taskName) {
-      description = "Run SPI tests"
-      group = "verification"
-      testClassesDirs = sourceSetsSpiTest.output.classesDirs
-      classpath = sourceSetsSpiTest.runtimeClasspath
-
-      doFirst {
-        val toExclude = classpath.filter { file -> it?.any { file.absolutePath.contains(it) } ?: false }
-        classpath -= toExclude
-      }
-    }
-  }
-
 tasks {
   withType<Test> {
     useJUnitPlatform()
@@ -150,26 +99,12 @@ tasks {
     }
   }
 
-  create<Task>("spiMatrixTest") {
-    description = "The aggregator task for all tests"
-    group = "verification"
-    dependsOn(filter { it.name.startsWith("spiTest") })
-  }
-
   withType<KotlinCompile> {
     kotlinOptions {
       languageVersion = "2.0"
       jvmTarget = JavaVersion.VERSION_11.toString()
     }
   }
-
-  check {
-    dependsOn("spiMatrixTest")
-  }
-
-  build {
-    dependsOn("spiMatrixTest")
-  }
 }
 
 configurations.names

src/main/java/io/github/nstdio/http/ext/spi/Classpath.java

@@ -17,18 +17,16 @@
 package io.github.nstdio.http.ext.spi;
 
 public class Classpath {
-  private static final boolean JACKSON = isPresent("com.fasterxml.jackson.databind.ObjectMapper");
-  private static final boolean GSON = isPresent("com.google.gson.Gson");
 
   private Classpath() {
   }
 
   public static boolean isJacksonPresent() {
-    return JACKSON;
+    return isPresent("com.fasterxml.jackson.databind.ObjectMapper");
   }
 
   public static boolean isGsonPresent() {
-    return GSON;
+    return isPresent("com.google.gson.Gson");
   }
 
   public static boolean isOrgBrotliPresent() {