Skip to content

Commit

Permalink
[ANCHOR-523] Delete duplicate test classes (#1197)
Browse files Browse the repository at this point in the history
### Description

This deletes some duplicate test classes in the extended test project.
The SEP-24 test can be deleted once the extended tests have been
converted to the new Junit style. The SEP-31 test should also be moved
into the essential tests once converted as well.

### Context

Test pipeline refactoring

### Testing

- `./gradlew test`

### Documentation

N/A

### Known limitations

N/A
  • Loading branch information
philipliu authored Nov 10, 2023
1 parent 8e595ea commit 8c45181
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 967 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package org.stellar.anchor.platform
import io.ktor.client.plugins.*
import io.ktor.http.*
import kotlinx.coroutines.runBlocking
import org.stellar.anchor.platform.test.*
import org.stellar.anchor.platform.test.CustodyApiTests
import org.stellar.anchor.platform.test.PlatformApiCustodyTests
import org.stellar.anchor.platform.test.Sep24BaseEnd2EndTest
import org.stellar.anchor.platform.test.Sep31End2EndTests
import org.stellar.anchor.util.Sep1Helper
import org.stellar.walletsdk.ApplicationConfiguration
import org.stellar.walletsdk.StellarConfiguration
Expand All @@ -30,11 +33,11 @@ open class AbstractIntegrationTest(private val config: TestConfig) {
val testProfileRunner = TestProfileExecutor(config)
lateinit var platformApiCustodyTests: PlatformApiCustodyTests
lateinit var custodyApiTests: CustodyApiTests
lateinit var sep24RpcE2eTests: Sep24RpcEnd2EndTests
lateinit var sep24CustodyE2eTests: Sep24CustodyEnd2EndTests
lateinit var sep24CustodyRpcE2eTests: Sep24CustodyRpcEnd2EndTests
lateinit var sep31RpcE2eTests: Sep31RpcEnd2EndTests
lateinit var sep31CustodyRpcE2eTests: Sep31CustodyRpcEnd2EndTests
lateinit var sep24RpcE2eTests: Sep24BaseEnd2EndTest
lateinit var sep24CustodyE2eTests: Sep24BaseEnd2EndTest
lateinit var sep24CustodyRpcE2eTests: Sep24BaseEnd2EndTest
lateinit var sep31RpcE2eTests: Sep31End2EndTests
lateinit var sep31CustodyRpcE2eTests: Sep31End2EndTests

fun setUp(envMap: Map<String, String>) {
envMap.forEach { (key, value) -> config.env[key] = value }
Expand All @@ -56,11 +59,11 @@ open class AbstractIntegrationTest(private val config: TestConfig) {

platformApiCustodyTests = PlatformApiCustodyTests(config, toml, jwt)
custodyApiTests = CustodyApiTests(config, toml, jwt)
sep24CustodyE2eTests = Sep24CustodyEnd2EndTests(config, jwt)
sep24RpcE2eTests = Sep24RpcEnd2EndTests(config, jwt)
sep24CustodyRpcE2eTests = Sep24CustodyRpcEnd2EndTests(config, jwt)
sep31RpcE2eTests = Sep31RpcEnd2EndTests(config, toml, jwt)
sep31CustodyRpcE2eTests = Sep31CustodyRpcEnd2EndTests(config, toml, jwt)
sep24CustodyE2eTests = Sep24BaseEnd2EndTest(config, jwt)
sep24RpcE2eTests = Sep24BaseEnd2EndTest(config, jwt)
sep24CustodyRpcE2eTests = Sep24BaseEnd2EndTest(config, jwt)
sep31RpcE2eTests = Sep31End2EndTests(config, toml, jwt)
sep31CustodyRpcE2eTests = Sep31End2EndTests(config, toml, jwt)
}

private suspend fun auth(): String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ import org.stellar.walletsdk.horizon.SigningKeyPair
import org.stellar.walletsdk.horizon.sign
import org.stellar.walletsdk.horizon.transaction.transferWithdrawalTransaction

class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
/** TODO: This should be replaced by Sep24End2EndTest */
class Sep24BaseEnd2EndTest(config: TestConfig, val jwt: String) {
private val walletSecretKey = System.getenv("WALLET_SECRET_KEY") ?: CLIENT_WALLET_SECRET
private val keypair = SigningKeyPair.fromSecret(walletSecretKey)
private val wallet =
Expand Down
Loading

0 comments on commit 8c45181

Please sign in to comment.