mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-23 01:04:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
yairm210 2024-08-08 14:16:34 +03:00
parent 0c5e82487e
commit f764f7c467
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt
View File

@ -29,7 +29,7 @@ import com.badlogic.gdx.backends.android.DefaultAndroidFiles
import com.unciv.logic.GameInfo import com.unciv.logic.GameInfo
import com.unciv.logic.files.UncivFiles import com.unciv.logic.files.UncivFiles
import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
import com.unciv.logic.multiplayer.storage.OnlineMultiplayerServer import com.unciv.logic.multiplayer.storage.MultiplayerServer
import com.unciv.models.metadata.GameSettings.GameSettingsMultiplayer import com.unciv.models.metadata.GameSettings.GameSettingsMultiplayer
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.PrintWriter import java.io.PrintWriter
@ -310,7 +310,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
try { try {
Log.d(LOG_TAG, "doWork download $gameId") Log.d(LOG_TAG, "doWork download $gameId")
val gamePreview = OnlineMultiplayerServer(fileStorage, mapOf("Authorization" to authHeader)).tryDownloadGamePreview(gameId) val gamePreview = MultiplayerServer(fileStorage, mapOf("Authorization" to authHeader)).tryDownloadGamePreview(gameId)
Log.d(LOG_TAG, "doWork download $gameId done") Log.d(LOG_TAG, "doWork download $gameId done")
val currentTurnPlayer = gamePreview.getCivilization(gamePreview.currentPlayer) val currentTurnPlayer = gamePreview.getCivilization(gamePreview.currentPlayer)

2
tests/src/com/unciv/logic/civilization/diplomacy/GoldGiftingTests.kt
View File

@ -120,7 +120,7 @@ class GoldGiftingTests {
tradeOffer.acceptTrade() tradeOffer.acceptTrade()
bDiplomacy.nextTurn() bDiplomacy.nextTurn()
val tradeOffer2 = TradeLogic(a,b) val tradeOffer2 = TradeLogic(a,b)
tradeOffer2.currentTrade.theirOffers.add(TradeOffer("Gold", TradeOfferType.Gold, 900)) tradeOffer2.currentTrade.theirOffers.add(TradeOffer("Gold", TradeOfferType.Gold, 900, testGame.gameInfo.speed))
assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer.currentTrade.reverse(), b,a,false) > 0) assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer.currentTrade.reverse(), b,a,false) > 0)
tradeOffer2.acceptTrade() tradeOffer2.acceptTrade()
assertTrue(bDiplomacy.getGoldGifts() >= 0) // Must not be negative assertTrue(bDiplomacy.getGoldGifts() >= 0) // Must not be negative