Skip to content

Commit

Permalink
fix: Fix machine translation properties issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@JanCizmar
JanCizmar committed Jan 31, 2025
1 parent 42acbdf commit 57bd501
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 59 deletions.
6 changes: 0 additions & 6 deletions ...app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchChangeTranslationStateTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.enums.TranslationState
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -20,11 +19,6 @@ class BatchChangeTranslationStateTest : ProjectAuthControllerTest("/v2/projects/
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchClearTranslationsTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.enums.TranslationState
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -20,11 +19,6 @@ class BatchClearTranslationsTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchCopyTranslationsTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import io.tolgee.model.enums.TranslationState
import io.tolgee.model.key.Key
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -21,11 +20,6 @@ class BatchCopyTranslationsTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchDeleteKeysTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.batch.BatchJob
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -20,11 +19,6 @@ class BatchDeleteKeysTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
33 changes: 22 additions & 11 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchJobTestBase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import io.tolgee.ProjectAuthControllerTest
import io.tolgee.batch.BatchJobChunkExecutionQueue
import io.tolgee.batch.BatchJobService
import io.tolgee.configuration.tolgee.InternalProperties
import io.tolgee.configuration.tolgee.machineTranslation.AwsMachineTranslationProperties
import io.tolgee.configuration.tolgee.machineTranslation.GoogleMachineTranslationProperties
import io.tolgee.configuration.tolgee.machineTranslation.MachineTranslationProperties
import io.tolgee.development.testDataBuilder.TestDataService
import io.tolgee.development.testDataBuilder.data.BatchJobsTestData
Expand All @@ -13,7 +15,10 @@ import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.translation.Translation
import io.tolgee.testing.assert
import jakarta.persistence.EntityManager
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.mock.mockito.SpyBean
import org.springframework.stereotype.Component
import org.springframework.test.web.servlet.ResultActions
import java.util.function.Consumer
Expand All @@ -29,6 +34,7 @@ class BatchJobTestBase {
lateinit var batchJobService: BatchJobService

@Autowired
@SpyBean
lateinit var machineTranslationProperties: MachineTranslationProperties

@Autowired
Expand All @@ -37,6 +43,7 @@ class BatchJobTestBase {
var fakeBefore: Boolean = false

@Autowired
@SpyBean
private lateinit var internalProperties: InternalProperties

@Autowired
Expand All @@ -45,18 +52,22 @@ class BatchJobTestBase {
fun setup() {
batchJobOperationQueue.clear()
testData = BatchJobsTestData()
fakeBefore = internalProperties.fakeMtProviders
internalProperties.fakeMtProviders = true
machineTranslationProperties.google.apiKey = "mock"
machineTranslationProperties.google.defaultEnabled = true
machineTranslationProperties.google.defaultPrimary = true
machineTranslationProperties.aws.defaultEnabled = false
machineTranslationProperties.aws.accessKey = "mock"
machineTranslationProperties.aws.secretKey = "mock"
}

fun after() {
internalProperties.fakeMtProviders = fakeBefore
whenever(internalProperties.fakeMtProviders).thenReturn(true)

val googleMock = mock<GoogleMachineTranslationProperties>()
whenever(googleMock.apiKey).thenReturn("mock")
whenever(googleMock.defaultEnabled).thenReturn(true)
whenever(googleMock.defaultPrimary).thenReturn(true)

whenever(machineTranslationProperties.google).thenReturn(googleMock)

val awsMock = mock<AwsMachineTranslationProperties>()
whenever(awsMock.defaultEnabled).thenReturn(false)
whenever(awsMock.accessKey).thenReturn("mock")
whenever(awsMock.secretKey).thenReturn("mock")

whenever(machineTranslationProperties.aws).thenReturn(awsMock)
}

fun saveAndPrepare(testClass: ProjectAuthControllerTest) {
Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchMoveToNamespaceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import io.tolgee.model.batch.BatchJobStatus
import io.tolgee.testing.ContextRecreatingTest
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -33,11 +32,6 @@ class BatchMoveToNamespaceTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchMtTranslateTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import io.tolgee.model.batch.BatchJob
import io.tolgee.model.batch.BatchJobStatus
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -22,11 +21,6 @@ class BatchMtTranslateTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchPreTranslateByMtTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import io.tolgee.model.batch.BatchJob
import io.tolgee.model.batch.BatchJobStatus
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -22,11 +21,6 @@ class BatchPreTranslateByMtTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
6 changes: 0 additions & 6 deletions backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/batch/BatchTagKeysTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import io.tolgee.ProjectAuthControllerTest
import io.tolgee.fixtures.*
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -18,11 +17,6 @@ class BatchTagKeysTest : ProjectAuthControllerTest("/v2/projects/") {
batchJobTestBase.setup()
}

@AfterEach
fun after() {
batchJobTestBase.after()
}

val testData
get() = batchJobTestBase.testData

Expand Down
1 change: 1 addition & 0 deletions backend/data/src/main/kotlin/io/tolgee/service/translation/SetTranslationTextUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class SetTranslationTextUtil(

translation.state =
when {
translation.state == TranslationState.DISABLED -> TranslationState.DISABLED
translation.isUntranslated && hasText -> TranslationState.TRANSLATED
hasTextChanged -> TranslationState.TRANSLATED
text.isNullOrEmpty() -> TranslationState.UNTRANSLATED
Expand Down

0 comments on commit 57bd501

Please sign in to comment.