Skip to content

Commit

Permalink
ReusableTestModule is no longer considered experimental
Browse files Browse the repository at this point in the history
GitOrigin-RevId: c62e4691193531b30b1a4815a72cc58e0745f554
  • Loading branch information
mmollaverdi authored and svc-squareup-copybara committed Feb 4, 2025
1 parent caa4684 commit 9e740ca
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions misk-inject/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ dependencies {
implementation(libs.kotlinReflect)
implementation(libs.kotlinStdLibJdk8)

implementation(project(":misk-api"))

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.kotlinTest)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package misk.inject

import misk.annotation.ExperimentalMiskApi
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotEquals
import org.junit.jupiter.api.Test

@OptIn(ExperimentalMiskApi::class)
class ReusableTestModuleTest {

class NoArgTestModuleOne: ReusableTestModule()
Expand Down
2 changes: 0 additions & 2 deletions misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package misk.inject

import misk.annotation.ExperimentalMiskApi
import kotlin.reflect.KProperty1
import kotlin.reflect.full.memberProperties
import kotlin.reflect.jvm.isAccessible
Expand All @@ -9,7 +8,6 @@ import kotlin.reflect.jvm.isAccessible
* This class should be extended by test modules used in tests,
* for Misk to reuse the Guice injector across tests for significantly faster test suite performance.
*/
@ExperimentalMiskApi
abstract class ReusableTestModule: KAbstractModule() {
override fun equals(other: Any?): Boolean {
if (this === other) return true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import com.google.inject.Module
import com.google.inject.testing.fieldbinder.BoundFieldModule
import jakarta.inject.Inject
import jakarta.inject.Singleton
import misk.annotation.ExperimentalMiskApi
import misk.inject.KAbstractModule
import misk.inject.ReusableTestModule
import misk.inject.getInstance
Expand Down Expand Up @@ -206,7 +205,6 @@ private fun ExtensionContext.startService(): Boolean {
// The injector is reused across tests if
// 1. The tests module(s) used in the test extend ReusableTestModules, AND
// 2. The environment variable MISK_TEST_REUSE_INJECTOR is set to true
@OptIn(ExperimentalMiskApi::class)
private fun ExtensionContext.reuseInjector(): Boolean {
return getFromStoreOrCompute("reuseInjector") {
(System.getenv("MISK_TEST_REUSE_INJECTOR")?.toBoolean() ?: false) &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal class GracefulShutdownInterceptorFactory @Inject constructor(
@OptIn(ExperimentalMiskApi::class)
private val rejectionStatusCode = webConfig.graceful_shutdown_config!!.rejection_status_code

@OptIn(ExperimentalMiskApi::class)
private val interceptor = object : NetworkInterceptor {
override fun intercept(chain: NetworkChain) {
// Don't do anything for health checks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ internal class GracefulShutdownService @Inject constructor(
shuttingDown = false
}

@OptIn(ExperimentalMiskApi::class)
override fun shutDown() {
shuttingDown = true

Expand Down

0 comments on commit 9e740ca

Please sign in to comment.