[Fix] Re-enable missing essential tests (#1195)

### Description Re-enable missing essential tests ### Context Bug fixes ### Testing - `./gradlew test`
stellar · Nov 8, 2023 · 8e595ea · 8e595ea
1 parent 53734c1
commit 8e595ea
Show file tree

Hide file tree

Showing 27 changed files with 56 additions and 134 deletions.
diff --git a/essential-tests/build.gradle.kts b/essential-tests/build.gradle.kts
@@ -31,6 +31,8 @@ dependencies {
   testFixturesImplementation(project(":wallet-reference-server"))
   testFixturesImplementation(project(":service-runner"))
   testFixturesImplementation(project(":lib-util"))
+
+  testImplementation(libs.stellar.wallet.sdk)
 }
 
 tasks { bootJar { enabled = false } }

diff --git a/...-tests/src/testFixtures/kotlin/org/stellar/anchor/integrationtest/ReferenceServerTests.kt b/...-tests/src/testFixtures/kotlin/org/stellar/anchor/integrationtest/ReferenceServerTests.kt
diff --git a/...tellar/anchor/AbstractIntegrationTests.kt → ...chor/platform/AbstractIntegrationTests.kt b/...tellar/anchor/AbstractIntegrationTests.kt → ...chor/platform/AbstractIntegrationTests.kt
@@ -1,11 +1,8 @@
-package org.stellar.anchor
+package org.stellar.anchor.platform
 
 import io.ktor.client.plugins.*
 import io.ktor.http.*
 import kotlinx.coroutines.runBlocking
-import org.stellar.anchor.client.*
-import org.stellar.anchor.platform.TestConfig
-import org.stellar.anchor.platform.resourceAsString
 import org.stellar.anchor.util.Sep1Helper.TomlContent
 import org.stellar.anchor.util.Sep1Helper.parse
 import org.stellar.walletsdk.ApplicationConfiguration

diff --git a/...kotlin/org/stellar/anchor/TestAccounts.kt → ...g/stellar/anchor/platform/TestAccounts.kt b/...kotlin/org/stellar/anchor/TestAccounts.kt → ...g/stellar/anchor/platform/TestAccounts.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor
+package org.stellar.anchor.platform
 
 var CLIENT_WALLET_SECRET = "SBHTWEF5U7FK53FLGDMBQYGXRUJ24VBM3M6VDXCHRIGCRG3Z64PH45LW"
 var CLIENT_WALLET_ACCOUNT = "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"

diff --git a/...ellar/anchor/e2etest/Sep24End2EndTests.kt → ...hor/platform/e2etest/Sep24End2EndTests.kt b/...ellar/anchor/e2etest/Sep24End2EndTests.kt → ...hor/platform/e2etest/Sep24End2EndTests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.e2etest
+package org.stellar.anchor.platform.e2etest
 
 import io.ktor.client.*
 import io.ktor.client.plugins.*
@@ -22,8 +22,6 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import org.springframework.web.util.UriComponentsBuilder
-import org.stellar.anchor.AbstractIntegrationTests
-import org.stellar.anchor.CLIENT_WALLET_SECRET
 import org.stellar.anchor.api.callback.SendEventRequest
 import org.stellar.anchor.api.callback.SendEventRequestPayload
 import org.stellar.anchor.api.event.AnchorEvent
@@ -33,6 +31,8 @@ import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
+import org.stellar.anchor.platform.AbstractIntegrationTests
+import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.Log.info
 import org.stellar.reference.client.AnchorReferenceServerClient

diff --git a/...stellar/anchor/e2etest/Sep6End2EndTest.kt → ...nchor/platform/e2etest/Sep6End2EndTest.kt b/...stellar/anchor/e2etest/Sep6End2EndTest.kt → ...nchor/platform/e2etest/Sep6End2EndTest.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.e2etest
+package org.stellar.anchor.platform.e2etest
 
 import io.ktor.http.*
 import kotlin.test.DefaultAsserter.fail
@@ -9,12 +9,12 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.SepTransactionStatus.*
 import org.stellar.anchor.api.sep.sep6.GetTransactionResponse
 import org.stellar.anchor.api.shared.InstructionField
 import org.stellar.anchor.client.Sep6Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.Log

diff --git a/...nchor/integrationtest/CallbackApiTests.kt → ...tform/integrationtest/CallbackApiTests.kt b/...nchor/integrationtest/CallbackApiTests.kt → ...tform/integrationtest/CallbackApiTests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import com.google.gson.Gson
 import java.time.Instant
@@ -13,7 +13,6 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import org.skyscreamer.jsonassert.JSONAssert
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.callback.GetCustomerRequest
 import org.stellar.anchor.api.callback.GetFeeRequest
 import org.stellar.anchor.api.callback.GetRateRequest
@@ -22,12 +21,13 @@ import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerRequest
 import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.client.Sep12Client
-import org.stellar.anchor.integrationtest.Sep12Tests.Companion.testCustomer1Json
-import org.stellar.anchor.integrationtest.Sep12Tests.Companion.testCustomer2Json
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.callback.RestCustomerIntegration
 import org.stellar.anchor.platform.callback.RestFeeIntegration
 import org.stellar.anchor.platform.callback.RestRateIntegration
+import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer1Json
+import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer2Json
 import org.stellar.anchor.util.GsonUtils
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)

diff --git a/.../integrationtest/CallbackSignatureTest.kt → .../integrationtest/CallbackSignatureTest.kt b/.../integrationtest/CallbackSignatureTest.kt → .../integrationtest/CallbackSignatureTest.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue

diff --git a/...r/integrationtest/EventProcessingTests.kt → ...m/integrationtest/EventProcessingTests.kt b/...r/integrationtest/EventProcessingTests.kt → ...m/integrationtest/EventProcessingTests.kt
@@ -1,9 +1,9 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import org.junit.jupiter.api.Test
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.event.AnchorEvent
 import org.stellar.anchor.event.EventService.EventQueue.TRANSACTION
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.config.PropertyEventConfig
 import org.stellar.anchor.platform.event.DefaultEventService

diff --git a/...nchor/integrationtest/PlatformApiTests.kt → ...tform/integrationtest/PlatformApiTests.kt b/...nchor/integrationtest/PlatformApiTests.kt → ...tform/integrationtest/PlatformApiTests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import com.google.gson.reflect.TypeToken
 import org.apache.http.HttpStatus.SC_OK
@@ -8,7 +8,6 @@ import org.skyscreamer.jsonassert.Customization
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
 import org.skyscreamer.jsonassert.comparator.CustomComparator
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.rpc.RpcRequest
 import org.stellar.anchor.api.rpc.method.NotifyOffchainFundsReceivedRequest
 import org.stellar.anchor.api.rpc.method.RequestOffchainFundsRequest
@@ -22,6 +21,7 @@ import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.client.Sep12Client
 import org.stellar.anchor.client.Sep24Client
 import org.stellar.anchor.client.Sep31Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.GsonUtils
 

diff --git a/...c/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/ReferenceServerTests.kt b/...c/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/ReferenceServerTests.kt
@@ -0,0 +1,3 @@
+package org.stellar.anchor.platform.integrationtest
+
+// The test is removed in favor of Sep24Tests.kt
diff --git a/...llar/anchor/integrationtest/Sep10Tests.kt → ...or/platform/integrationtest/Sep10Tests.kt b/...llar/anchor/integrationtest/Sep10Tests.kt → ...or/platform/integrationtest/Sep10Tests.kt
@@ -1,12 +1,11 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import kotlin.test.assertFailsWith
 import org.junit.jupiter.api.Test
-import org.stellar.anchor.*
 import org.stellar.anchor.api.exception.SepNotAuthorizedException
 import org.stellar.anchor.api.sep.sep10.ValidationRequest
 import org.stellar.anchor.client.Sep10Client
-import org.stellar.anchor.platform.TestConfig
+import org.stellar.anchor.platform.*
 
 class Sep10Tests : AbstractIntegrationTests(TestConfig(testProfileName = "default")) {
   lateinit var sep10Client: Sep10Client

diff --git a/...llar/anchor/integrationtest/Sep12Tests.kt → ...or/platform/integrationtest/Sep12Tests.kt b/...llar/anchor/integrationtest/Sep12Tests.kt → ...or/platform/integrationtest/Sep12Tests.kt
@@ -1,13 +1,13 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import io.ktor.client.plugins.*
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.sep.sep12.Sep12Status
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.printRequest
 import org.stellar.anchor.platform.printResponse

diff --git a/...llar/anchor/integrationtest/Sep24Tests.kt → ...or/platform/integrationtest/Sep24Tests.kt b/...llar/anchor/integrationtest/Sep24Tests.kt → ...or/platform/integrationtest/Sep24Tests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.runBlocking
@@ -13,14 +13,14 @@ import org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
 import org.springframework.web.util.UriComponentsBuilder
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.exception.SepException
 import org.stellar.anchor.api.platform.PatchTransactionsRequest
 import org.stellar.anchor.apiclient.PlatformApiClient
 import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
 import org.stellar.anchor.auth.Sep24MoreInfoUrlJwt
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.gson
 import org.stellar.anchor.platform.printRequest

diff --git a/...llar/anchor/integrationtest/Sep31Tests.kt → ...or/platform/integrationtest/Sep31Tests.kt b/...llar/anchor/integrationtest/Sep31Tests.kt → ...or/platform/integrationtest/Sep31Tests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import java.time.Instant
 import kotlin.streams.toList
@@ -11,7 +11,6 @@ import org.skyscreamer.jsonassert.JSONCompareMode
 import org.skyscreamer.jsonassert.JSONCompareMode.LENIENT
 import org.springframework.data.domain.Sort.Direction
 import org.springframework.data.domain.Sort.Direction.*
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.exception.SepException
 import org.stellar.anchor.api.platform.*
 import org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_31
@@ -27,10 +26,11 @@ import org.stellar.anchor.api.sep.sep31.Sep31PostTransactionResponse
 import org.stellar.anchor.apiclient.PlatformApiClient
 import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.client.*
-import org.stellar.anchor.integrationtest.Sep12Tests.Companion.testCustomer1Json
-import org.stellar.anchor.integrationtest.Sep12Tests.Companion.testCustomer2Json
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.gson
+import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer1Json
+import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer2Json
 import org.stellar.anchor.platform.printRequest
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.StringHelper.json

diff --git a/...llar/anchor/integrationtest/Sep38Tests.kt → ...or/platform/integrationtest/Sep38Tests.kt b/...llar/anchor/integrationtest/Sep38Tests.kt → ...or/platform/integrationtest/Sep38Tests.kt
@@ -1,14 +1,14 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import java.time.Instant
 import java.time.format.DateTimeFormatter
 import kotlin.test.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.stellar.anchor.AbstractIntegrationTests
 import org.stellar.anchor.api.exception.SepException
 import org.stellar.anchor.api.sep.sep38.Sep38Context.SEP31
 import org.stellar.anchor.client.Sep38Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.printRequest
 import org.stellar.anchor.platform.printResponse

diff --git a/...ellar/anchor/integrationtest/Sep6Tests.kt → ...hor/platform/integrationtest/Sep6Tests.kt b/...ellar/anchor/integrationtest/Sep6Tests.kt → ...hor/platform/integrationtest/Sep6Tests.kt
@@ -1,13 +1,13 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import org.junit.jupiter.api.Test
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
-import org.stellar.anchor.AbstractIntegrationTests
-import org.stellar.anchor.CLIENT_WALLET_ACCOUNT
 import org.stellar.anchor.api.sep.sep38.Sep38Context
 import org.stellar.anchor.client.Sep38Client
 import org.stellar.anchor.client.Sep6Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
+import org.stellar.anchor.platform.CLIENT_WALLET_ACCOUNT
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.gson
 import org.stellar.anchor.util.Log

diff --git a/...chor/integrationtest/ServerHealthTests.kt → ...form/integrationtest/ServerHealthTests.kt b/...chor/integrationtest/ServerHealthTests.kt → ...form/integrationtest/ServerHealthTests.kt
@@ -1,4 +1,4 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

diff --git a/...r/integrationtest/StellarObserverTests.kt → ...m/integrationtest/StellarObserverTests.kt b/...r/integrationtest/StellarObserverTests.kt → ...m/integrationtest/StellarObserverTests.kt
@@ -1,11 +1,11 @@
-package org.stellar.anchor.integrationtest
+package org.stellar.anchor.platform.integrationtest
 
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
-import org.stellar.anchor.AbstractIntegrationTests
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.gson
 

diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
@@ -3,7 +3,6 @@ package org.stellar.anchor.platform
 import io.ktor.client.plugins.*
 import io.ktor.http.*
 import kotlinx.coroutines.runBlocking
-import org.stellar.anchor.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.test.*
 import org.stellar.anchor.util.Sep1Helper
 import org.stellar.walletsdk.ApplicationConfiguration

diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.springframework.web.util.UriComponentsBuilder
-import org.stellar.anchor.CLIENT_WALLET_SECRET
 import org.stellar.anchor.api.callback.SendEventRequest
 import org.stellar.anchor.api.callback.SendEventRequestPayload
 import org.stellar.anchor.api.event.AnchorEvent
@@ -22,6 +21,7 @@ import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
+import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.Log.info
 import org.stellar.reference.client.AnchorReferenceServerClient

diff --git a/...ded-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt b/...ded-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.springframework.web.util.UriComponentsBuilder
-import org.stellar.anchor.CLIENT_WALLET_SECRET
 import org.stellar.anchor.api.callback.SendEventRequest
 import org.stellar.anchor.api.callback.SendEventRequestPayload
 import org.stellar.anchor.api.event.AnchorEvent
@@ -22,6 +21,7 @@ import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
+import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.Log.info
 import org.stellar.reference.client.AnchorReferenceServerClient
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package org.stellar.anchor.platform.integrationtest

		// The test is removed in favor of Sep24Tests.kt