admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-29 01:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

start prepping for 2.13 (#167)

Browse Source 
* more use of MoreOption

* add to BUILD

* update some deps

* fix deprecated scalatest stuff

* reformat

* seems backward

* more deprecations

* add deprecation to toolchain


Former-commit-id: cc2217e07883852d38a0f6d1d1eb0834e046cf94
This commit is contained in:
admin
2021-01-23 17:16:55 -08:00
committed by GitHub
parent 331d136fbd
commit ee28326edd
109 changed files with 434 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.bazelrc
+3
View File
@@ -3,3 +3,6 @@ bazel-1.0.0.bazelrc
build --cxxopt='-std=c++17'
test --cxxopt='-std=c++17'
build --strategy=Scalac=worker
build --worker_sandboxing
WORKSPACE
+18 -18
View File
@@ -53,47 +53,47 @@ http_archive(
#
# Scala support
#
skylib_version = "1.0.3"
http_archive(
name = "bazel_skylib",
urls = [
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
],
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
type = "tar.gz",
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
)
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace()
rules_scala_version="a2f5852902f5b9f0302c727eead52ca2c7b6c3e2" # update this as needed
scala_version = "2.12.10"
rules_scala_version="5df8033f752be64fbe2cedfd1bdbad56e2033b15" # update this as needed
rules_scala_sha="b7fa29db72408a972e6b6685d1bc17465b3108b620cb56d9b1700cf6f70f624a"
scala_version = "2.12.13"
http_archive(
name = "io_bazel_rules_scala",
strip_prefix = "rules_scala-%s" % rules_scala_version,
type = "zip",
url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version,
sha256 = "8c48283aeb70e7165af48191b0e39b7434b0368718709d1bced5c3781787d8e7",
sha256 = rules_scala_sha,
)
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
scala_register_unused_deps_toolchains()
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = scala_version)
load("//tools:toolchains.bzl", "scala_register_unused_deps_and_opts_toolchains")
scala_register_unused_deps_and_opts_toolchains()
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
scala_repositories((
scala_version,
{
"scala_compiler": "cedc3b9c39d215a9a3ffc0cc75a1d784b51e9edc7f13051a1b4ad5ae22cfbc0c",
"scala_library": "0a57044d10895f8d3dd66ad4286891f607169d948845ac51e17b4c1cf0ab569d",
"scala_reflect": "56b609e1bab9144fb51525bfa01ccd72028154fc40a58685a1e9adcbe7835730",
}
))
scala_repositories()
load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories")
scala_proto_repositories(scala_version = scala_version)
scala_proto_repositories()
load("@io_bazel_rules_scala//scala_proto:toolchains.bzl", "scala_proto_register_toolchains")
scala_proto_register_toolchains()
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
scalatest_repositories()
scalatest_toolchain()
load("//3rdparty:workspace.bzl", "maven_dependencies")
maven_dependencies()
load("//3rdparty:target_file.bzl", "build_external_workspace")
src/main/scala/net/eagle0/eagle/ai/AIClient.scala
+4 -3
View File
@@ -70,9 +70,10 @@ case class AIClient(
RC.resolveTreatyOffer(gs, ac, idx)
case PLEASE_RECRUIT_ME_COMMAND =>
RC.resolvePleaseRecruitMeOffer(gs, ac, idx)
case ATTACK_DECISION_COMMAND => RC.attackDecision(gs, ac, idx)
case FREE_FOR_ALL_DECISION_COMMAND => RC.freeForAllDecision(gs, ac, idx)
case RESOLVE_INVITATION_COMMAND => RC.resolveInvitation(gs, ac, idx)
case ATTACK_DECISION_COMMAND => RC.attackDecision(gs, ac, idx)
case FREE_FOR_ALL_DECISION_COMMAND =>
RC.freeForAllDecision(gs, ac, idx)
case RESOLVE_INVITATION_COMMAND => RC.resolveInvitation(gs, ac, idx)
case UNKNOWN_COMMAND =>
throw new EagleInternalException(
"Invalid command type UNKNOWN_COMMAND"
src/main/scala/net/eagle0/eagle/library/util/CommandChoiceHelpers.scala
+8 -40
View File
@@ -3,44 +3,24 @@ package net.eagle0.eagle.library.util
import net.eagle0.common.MoreOption
import net.eagle0.common.hostility.Hostility
import net.eagle0.eagle.api.command.SelectedCommand.SpecializedCommand
import net.eagle0.eagle.api.command.arm_troops_command.{
ArmTroopsSelectedCommand,
ArmedBattalion
}
import net.eagle0.eagle.api.command.arm_troops_command.{ArmTroopsSelectedCommand, ArmedBattalion}
import net.eagle0.eagle.api.command.attack_decision_command.AttackDecisionSelectedCommand
import net.eagle0.eagle.api.command.defend_command.DefendSelectedCommand
import net.eagle0.eagle.api.command.divine_command.DivineSelectedCommand
import net.eagle0.eagle.api.command.free_for_all_decision_command.FreeForAllDecisionSelectedCommand
import net.eagle0.eagle.api.command.handle_captured_hero_command.CapturedHeroOption.{
EXECUTE_CAPTURED_HERO_OPTION,
IMPRISON_CAPTURED_HERO_OPTION,
RECRUIT_CAPTURED_HERO_OPTION
}
import net.eagle0.eagle.api.command.handle_captured_hero_command.{
ExpandedCapturedHero,
HandleCapturedHeroSelectedCommand
}
import net.eagle0.eagle.api.command.handle_captured_hero_command.CapturedHeroOption.{EXECUTE_CAPTURED_HERO_OPTION, IMPRISON_CAPTURED_HERO_OPTION, RECRUIT_CAPTURED_HERO_OPTION}
import net.eagle0.eagle.api.command.handle_captured_hero_command.{ExpandedCapturedHero, HandleCapturedHeroSelectedCommand}
import net.eagle0.eagle.api.command.handle_province_events_command.HandleProvinceEventsSelectedCommand
import net.eagle0.eagle.api.command.hero_gift_command.HeroGiftSelectedCommand
import net.eagle0.eagle.api.command.improve_command.ImprovementType
import net.eagle0.eagle.api.command.march_command.{
MarchCommandFromOneProvince,
MarchSelectedCommand
}
import net.eagle0.eagle.api.command.organize_troops_command.{
ChangedBattalion,
NewBattalion,
OrganizeTroopsSelectedCommand
}
import net.eagle0.eagle.api.command.march_command.{MarchCommandFromOneProvince, MarchSelectedCommand}
import net.eagle0.eagle.api.command.organize_troops_command.{ChangedBattalion, NewBattalion, OrganizeTroopsSelectedCommand}
import net.eagle0.eagle.api.command.please_recruit_me_command.PleaseRecruitMeSelectedCommand
import net.eagle0.eagle.api.command.province_gift_command.ProvinceGiftSelectedCommand
import net.eagle0.eagle.api.command.recruit_heroes_command.RecruitHeroesSelectedCommand
import net.eagle0.eagle.api.command.resolve_invitation_command.ResolveInvitationSelectedCommand
import net.eagle0.eagle.api.command.resolve_treaty_offer_command.ResolveTreatyOfferSelectedCommand
import net.eagle0.eagle.api.command.resolve_tribute_command.{
ResolveTributeSelectedCommand,
TributeAndFaction
}
import net.eagle0.eagle.api.command.resolve_tribute_command.{ResolveTributeSelectedCommand, TributeAndFaction}
import net.eagle0.eagle.api.command.send_supplies_command.SendSuppliesSelectedCommand
import net.eagle0.eagle.api.command.util.appropriate_battalions.AppropriateBattalionIds
import net.eagle0.eagle.api.command.util.army_stats.ArmyStats
@@ -49,20 +29,8 @@ import net.eagle0.eagle.api.command.{AvailableCommand, SelectedCommand}
import net.eagle0.eagle.common.battalion_type.BattalionTypeId
import net.eagle0.eagle.common.combat_unit.CombatUnit
import net.eagle0.eagle.common.command_type.CommandType
import net.eagle0.eagle.common.command_type.CommandType.{
ARM_TROOPS_COMMAND,
DIVINE_COMMAND,
FEAST_COMMAND,
PROVINCE_GIFT_COMMAND,
RECRUIT_HEROES_COMMAND,
RESOLVE_TRIBUTE_COMMAND,
RETURN_COMMAND,
SUPPRESS_BRIGANDS_COMMAND
}
import net.eagle0.eagle.common.recruitment_info.RecruitmentStatus.{
RECRUITMENT_STATUS_NOT_DIVINED,
RECRUITMENT_STATUS_WOULD_JOIN
}
import net.eagle0.eagle.common.command_type.CommandType.{ARM_TROOPS_COMMAND, DIVINE_COMMAND, FEAST_COMMAND, PROVINCE_GIFT_COMMAND, RECRUIT_HEROES_COMMAND, RESOLVE_TRIBUTE_COMMAND, RETURN_COMMAND, SUPPRESS_BRIGANDS_COMMAND}
import net.eagle0.eagle.common.recruitment_info.RecruitmentStatus.{RECRUITMENT_STATUS_NOT_DIVINED, RECRUITMENT_STATUS_WOULD_JOIN}
import net.eagle0.eagle.common.tribute_demanded.TributeDemanded
import net.eagle0.eagle.common.unaffiliated_hero.UnaffiliatedHero
import net.eagle0.eagle.internal.battalion.Battalion
src/main/scala/net/eagle0/eagle/library/util/GameStateViewDiffer.scala
+1 -4
View File
@@ -6,10 +6,7 @@ import net.eagle0.eagle.api.faction_view.{FactionView, FactionViewDiff}
import net.eagle0.eagle.api.game_state_view.{GameStateView, GameStateViewDiff}
import net.eagle0.eagle.api.hero_view.HeroViewDiff.OptionalProfession
import net.eagle0.eagle.api.hero_view.{HeroView, HeroViewDiff}
import net.eagle0.eagle.api.province_view.FullProvinceInfoDiff.{
OrderedRulingPlayerHeroIds,
ProvinceOrdersOption
}
import net.eagle0.eagle.api.province_view.FullProvinceInfoDiff.{OrderedRulingPlayerHeroIds, ProvinceOrdersOption}
import net.eagle0.eagle.api.province_view._
import net.eagle0.eagle.common.round_phase.NewRoundPhase
src/main/scala/net/eagle0/eagle/library/util/RandomCommands.scala
+11 -48
View File
@@ -2,71 +2,34 @@ package net.eagle0.eagle.library.util
import net.eagle0.common.MoreOption
import net.eagle0.eagle.api.command.SelectedCommand.SpecializedCommand
import net.eagle0.eagle.api.command.arm_troops_command.{
ArmTroopsSelectedCommand,
ArmedBattalion
}
import net.eagle0.eagle.api.command.arm_troops_command.{ArmTroopsSelectedCommand, ArmedBattalion}
import net.eagle0.eagle.api.command.attack_decision_command.AttackDecisionSelectedCommand
import net.eagle0.eagle.api.command.defend_command.DefendSelectedCommand
import net.eagle0.eagle.api.command.diplomacy_command.{
DiplomacyOption,
DiplomacySelectedCommand
}
import net.eagle0.eagle.api.command.diplomacy_command.{DiplomacyOption, DiplomacySelectedCommand}
import net.eagle0.eagle.api.command.divine_command.DivineSelectedCommand
import net.eagle0.eagle.api.command.free_for_all_decision_command.FreeForAllDecisionSelectedCommand
import net.eagle0.eagle.api.command.handle_captured_hero_command.{
ExpandedCapturedHero,
HandleCapturedHeroSelectedCommand
}
import net.eagle0.eagle.api.command.handle_captured_hero_command.{ExpandedCapturedHero, HandleCapturedHeroSelectedCommand}
import net.eagle0.eagle.api.command.handle_province_events_command.HandleProvinceEventsSelectedCommand
import net.eagle0.eagle.api.command.hero_gift_command.HeroGiftSelectedCommand
import net.eagle0.eagle.api.command.improve_command.ImproveSelectedCommand
import net.eagle0.eagle.api.command.jailbreak_command.JailbreakSelectedCommand
import net.eagle0.eagle.api.command.march_command.{
MarchCommandFromOneProvince,
MarchSelectedCommand
}
import net.eagle0.eagle.api.command.orders_command.{
OrdersSelectedCommand,
ProvinceOrders
}
import net.eagle0.eagle.api.command.organize_troops_command.{
ChangedBattalion,
NewBattalion,
OrganizeTroopsSelectedCommand
}
import net.eagle0.eagle.api.command.please_recruit_me_command.{
OneProvincePleaseRecruitMe,
PleaseRecruitMeSelectedCommand
}
import net.eagle0.eagle.api.command.province_gift_command.{
EligibleProvinceGift,
ProvinceGiftSelectedCommand
}
import net.eagle0.eagle.api.command.march_command.{MarchCommandFromOneProvince, MarchSelectedCommand}
import net.eagle0.eagle.api.command.orders_command.{OrdersSelectedCommand, ProvinceOrders}
import net.eagle0.eagle.api.command.organize_troops_command.{ChangedBattalion, NewBattalion, OrganizeTroopsSelectedCommand}
import net.eagle0.eagle.api.command.please_recruit_me_command.{OneProvincePleaseRecruitMe, PleaseRecruitMeSelectedCommand}
import net.eagle0.eagle.api.command.province_gift_command.{EligibleProvinceGift, ProvinceGiftSelectedCommand}
import net.eagle0.eagle.api.command.recruit_heroes_command.RecruitHeroesSelectedCommand
import net.eagle0.eagle.api.command.resolve_invitation_command.ResolveInvitationSelectedCommand
import net.eagle0.eagle.api.command.resolve_treaty_offer_command.ResolveTreatyOfferSelectedCommand
import net.eagle0.eagle.api.command.resolve_tribute_command.{
ResolveTributeSelectedCommand,
TributeAndFaction
}
import net.eagle0.eagle.api.command.resolve_tribute_command.{ResolveTributeSelectedCommand, TributeAndFaction}
import net.eagle0.eagle.api.command.send_supplies_command.SendSuppliesSelectedCommand
import net.eagle0.eagle.api.command.trade_command.TradeSelectedCommand
import net.eagle0.eagle.api.command.trade_command.TradeSelectedCommand.TradeType.{
BUY_FOOD,
SELL_FOOD
}
import net.eagle0.eagle.api.command.trade_command.TradeSelectedCommand.TradeType.{BUY_FOOD, SELL_FOOD}
import net.eagle0.eagle.api.command.util.attack_decision_type.AttackDecisionType
import net.eagle0.eagle.api.command.{AvailableCommand, SelectedCommand}
import net.eagle0.eagle.common.combat_unit.CombatUnit
import net.eagle0.eagle.common.command_type.CommandType
import net.eagle0.eagle.common.command_type.CommandType.{
ARM_TROOPS_COMMAND,
RECON_COMMAND,
RECRUIT_HEROES_COMMAND,
RESOLVE_TRIBUTE_COMMAND,
SUPPRESS_BRIGANDS_COMMAND
}
import net.eagle0.eagle.common.command_type.CommandType.{ARM_TROOPS_COMMAND, RECON_COMMAND, RECRUIT_HEROES_COMMAND, RESOLVE_TRIBUTE_COMMAND, SUPPRESS_BRIGANDS_COMMAND}
import net.eagle0.eagle.common.invitation.Invitation
import net.eagle0.eagle.common.treaty_offer.TreatyOffer
import net.eagle0.eagle.common.tribute_demanded.TributeDemanded
src/test/resources/net/eagle0/shardok/maps/MapValidationTest.scala
+4 -2
View File
@@ -4,9 +4,11 @@ import net.eagle0.eagle.ProvinceId
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.util.{IDable, MapGenerator}
import net.eagle0.shardok.common.hex_map.HexMap
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class MapValidationTest extends FlatSpec with BeforeAndAfterEach with Matchers {
class MapValidationTest extends AnyFlatSpec with BeforeAndAfterEach with Matchers {
import net.eagle0.util.HexMapUtils.hexMap
private def checkNeighbor(
src/test/scala/net/eagle0/common/BUILD
+1
View File
@@ -16,6 +16,7 @@ scala_library(
scala_test(
name = "iterable_utils_test",
srcs = ["IterableUtilsTest.scala"],
scalacopts = ["-deprecation"],
deps = [
"//src/main/scala/net/eagle0/common:iterable_utils",
],
src/test/scala/net/eagle0/common/IterableUtilsTest.scala
+3 -2
View File
@@ -1,8 +1,9 @@
package net.eagle0.common
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class IterableUtilsTest extends FlatSpec with Matchers {
class IterableUtilsTest extends AnyFlatSpec with Matchers {
import IterableUtils._
"minByOption" should "return the minimum if there is one" in {
src/test/scala/net/eagle0/eagle/ai/MidGameAIClientTest.scala
+4 -2
View File
@@ -10,10 +10,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class MidGameAIClientTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/ActionResultFilterTest.scala
+4 -2
View File
@@ -1,8 +1,10 @@
package net.eagle0.eagle.library
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ActionResultFilterTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {}
src/test/scala/net/eagle0/eagle/library/EngineTest.scala
+4 -2
View File
@@ -5,11 +5,13 @@ import net.eagle0.eagle.internal.action_result.ActionResult
import net.eagle0.eagle.library.util.HeroGenerator
import net.eagle0.eagle.service.InMemoryHistory
import org.scalamock.scalatest.MockFactory
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
//noinspection RedundantDefaultArgument
class EngineTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with MockFactory
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableArmTroopsCommandFactoryTest.scala
+4 -2
View File
@@ -8,10 +8,12 @@ import net.eagle0.eagle.internal.battalion.Battalion
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableArmTroopsCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
val rulingFactionId = 5
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableAttackDecisionCommandFactoryTest.scala
+3 -2
View File
@@ -15,9 +15,10 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleInternalException
import net.eagle0.eagle.{FactionId, RoundId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableAttackDecisionCommandFactoryTest extends FlatSpec with Matchers {
class AvailableAttackDecisionCommandFactoryTest extends AnyFlatSpec with Matchers {
private val attackerFid: FactionId = 3
private val defenderFid: FactionId = 4
private val currentRoundId: RoundId = 27
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableCommandsFactoryTest.scala
+4 -2
View File
@@ -8,10 +8,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalamock.scalatest.MockFactory
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with MockFactory
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDefendCommandsFactoryTest.scala
+4 -2
View File
@@ -13,11 +13,13 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.{FactionId, RoundId}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
//noinspection RedundantDefaultArgument
class AvailableDefendCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
val actingFactionId = 2
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDiplomacyCommandsFactoryTest.scala
+4 -2
View File
@@ -10,10 +10,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable.{mapifyFactions, mapifyHeroes, mapifyProvinces}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableDiplomacyCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableFeastCommandFactoryTest.scala
+4 -2
View File
@@ -5,10 +5,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableFeastCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableFreeForAllDecisionCommandFactoryTest.scala
+3 -2
View File
@@ -21,10 +21,11 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.{FactionId, ProvinceId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableFreeForAllDecisionCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers {
val actingFid: FactionId = 4
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleCapturedHeroCommandFactoryTest.scala
+3 -2
View File
@@ -8,10 +8,11 @@ import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableHandleCapturedHeroCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers {
behavior of "AvailableHandleCapturedHeroCommandFactoryTest"
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHeroGiftCommandFactoryTest.scala
+4 -2
View File
@@ -8,10 +8,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableHeroGiftCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableImproveCommandsFactoryTest.scala
+5 -2
View File
@@ -7,10 +7,13 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleInternalException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableImproveCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
val rulingFactionId = 9
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableJailbreakCommandFactoryTest.scala
+4 -2
View File
@@ -11,10 +11,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableJailbreakCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
import net.eagle0.common.ProtoMatchers._
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableMarchCommandFactoryTest.scala
+4 -2
View File
@@ -9,11 +9,13 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
//noinspection RedundantDefaultArgument
class AvailableMarchCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
private val actingPlayerId = 5
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableOrdersCommandFactoryTest.scala
+3 -2
View File
@@ -6,9 +6,10 @@ import net.eagle0.eagle.common.province_order_type.ProvinceOrderType.{DEVELOP, E
import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableOrdersCommandFactoryTest extends FlatSpec with Matchers {
class AvailableOrdersCommandFactoryTest extends AnyFlatSpec with Matchers {
val factionId = 5
val hostilePlayerId = 3
val factionHeadId = 43
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableOrganizeTroopsCommandsFactoryTest.scala
+4 -2
View File
@@ -7,10 +7,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableOrganizeTroopsCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
private val actingPlayerId = 5
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableProvinceGiftCommandFactoryTest.scala
+4 -2
View File
@@ -7,10 +7,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableProvinceGiftCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
override def beforeEach(): Unit = {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableReconCommandFactoryTest.scala
+4 -2
View File
@@ -10,10 +10,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.IncomingEndTurnAction.IncomingRecon
import net.eagle0.eagle.internal.province.{IncomingEndTurnAction, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableReconCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableRecruitHeroesCommandFactoryTest.scala
+4 -2
View File
@@ -11,10 +11,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.GameStateViewUtils
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableRecruitHeroesCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableResolveInvitationCommandFactoryTest.scala
+3 -2
View File
@@ -6,10 +6,11 @@ import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.util.IDable.{mapifyFactions, mapifyProvinces}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableResolveInvitationCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers {
private val actingFid = 19
private val firstInvitingFid = 22
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableResolveTributeCommandsFactoryTest.scala
+3 -2
View File
@@ -13,10 +13,11 @@ import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.util.IDable
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableResolveTributeCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers {
val actingFactionId = 3
val actingProvinceId = 17
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableRestCommandsFactoryTest.scala
+3 -2
View File
@@ -3,9 +3,10 @@ package net.eagle0.eagle.library.actions.availability
import net.eagle0.eagle.api.command.AvailableCommand
import net.eagle0.eagle.common.command_type.CommandType.REST_COMMAND
import net.eagle0.eagle.internal.game_state.GameState
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableRestCommandsFactoryTest extends FlatSpec with Matchers {
class AvailableRestCommandsFactoryTest extends AnyFlatSpec with Matchers {
"availableCommands" should "return a rest command" in {
val command =
AvailableRestCommandsFactory.availableCommand(GameState(), 12, 6)
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableReturnCommandsFactoryTest.scala
+3 -2
View File
@@ -5,9 +5,10 @@ import net.eagle0.eagle.common.command_type.CommandType.RETURN_COMMAND
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableReturnCommandsFactoryTest extends FlatSpec with Matchers {
class AvailableReturnCommandsFactoryTest extends AnyFlatSpec with Matchers {
private val rulingHeroId = Hero()
.withName("Joe")
.withId(17)
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableSendSuppliesCommandFactoryTest.scala
+4 -2
View File
@@ -4,10 +4,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableSendSuppliesCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
private val actingPlayerId = 5
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableSwearBrotherhoodCommandFactoryTest.scala
+4 -2
View File
@@ -6,10 +6,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableSwearBrotherhoodCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
override def beforeEach(): Unit = Settings.loadSettings(
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTradeCommandFactoryTest.scala
+4 -2
View File
@@ -5,10 +5,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableTradeCommandFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTrainCommandsFactoryTest.scala
+4 -2
View File
@@ -7,10 +7,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableTrainCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
private val actingFactionId = 5
src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTravelCommandsFactoryTest.scala
+4 -2
View File
@@ -5,10 +5,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AvailableTravelCommandsFactoryTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/CheckForFactionChangesActionTest.scala
+3 -2
View File
@@ -17,9 +17,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class CheckForFactionChangesActionTest extends FlatSpec with Matchers {
class CheckForFactionChangesActionTest extends AnyFlatSpec with Matchers {
import net.eagle0.common.ProtoMatchers._
src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndAttackDecisionPhaseActionTest.scala
+3 -2
View File
@@ -4,9 +4,10 @@ import net.eagle0.eagle.common.action_result_type.ActionResultType.END_ATTACK_DE
import net.eagle0.eagle.common.round_phase.NewRoundPhase
import net.eagle0.eagle.common.round_phase.RoundPhase.DEFENSE_DECISION
import net.eagle0.eagle.internal.game_state.GameState
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class EndAttackDecisionPhaseActionTest extends FlatSpec with Matchers {
class EndAttackDecisionPhaseActionTest extends AnyFlatSpec with Matchers {
val gameState: GameState = GameState()
"execute" should "set the basics" in {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndBattleResolutionPhaseActionTest.scala
+3 -2
View File
@@ -3,9 +3,10 @@ package net.eagle0.eagle.library.actions.impl.action
import net.eagle0.eagle.common.action_result_type.ActionResultType
import net.eagle0.eagle.common.round_phase.{NewRoundPhase, RoundPhase}
import net.eagle0.eagle.internal.game_state.GameState
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class EndBattleResolutionPhaseActionTest extends FlatSpec with Matchers {
class EndBattleResolutionPhaseActionTest extends AnyFlatSpec with Matchers {
"execute" should "have type END_RESOLUTION_PHASE" in {
val gameState = GameState(
src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndDefenseDecisionPhaseActionTest.scala
+4 -2
View File
@@ -9,9 +9,11 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.{FactionId, ProvinceId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class EndDefenseDecisionPhaseActionTest extends FlatSpec with Matchers {
class EndDefenseDecisionPhaseActionTest extends AnyFlatSpec with Matchers {
val defendingProvinceId: ProvinceId = 1
val defenderFid: FactionId = 3
val attacker1Fid: FactionId = 7
src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndPlayerCommandsPhaseActionTest.scala
+3 -2
View File
@@ -7,9 +7,10 @@ import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class EndPlayerCommandsPhaseActionTest extends FlatSpec with Matchers {
class EndPlayerCommandsPhaseActionTest extends AnyFlatSpec with Matchers {
val rulingFactionId = 5
val heroes = Seq(
Hero().withId(3).withWisdom(23).withFactionId(rulingFactionId),
src/test/scala/net/eagle0/eagle/library/actions/impl/action/FriendlyMoveActionTest.scala
+3 -2
View File
@@ -8,9 +8,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class FriendlyMoveActionTest extends FlatSpec with Matchers {
class FriendlyMoveActionTest extends AnyFlatSpec with Matchers {
val movingPlayer = 8
src/test/scala/net/eagle0/eagle/library/actions/impl/action/NewRoundActionTest.scala
+4 -2
View File
@@ -19,10 +19,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class NewRoundActionTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
import net.eagle0.common.ProtoMatchers._
src/test/scala/net/eagle0/eagle/library/actions/impl/action/NewYearActionTest.scala
+7 -2
View File
@@ -7,9 +7,14 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class NewYearActionTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class NewYearActionTest
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
private val lowSupportProvince = Province()
.withId(17)
.withRulingFactionId(1)
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformFoodConsumptionPhaseActionTest.scala
+4 -2
View File
@@ -12,10 +12,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformFoodConsumptionPhaseActionTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformHeroDeparturesActionTest.scala
+4 -2
View File
@@ -12,10 +12,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.StaticRandom
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformHeroDeparturesActionTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformJailbreakResolutionActionTest.scala
+4 -2
View File
@@ -16,10 +16,12 @@ import net.eagle0.eagle.internal.province.{IncomingEndTurnAction, Province}
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable
import net.eagle0.eagle.{FactionId, HeroId, ProvinceId}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformJailbreakResolutionActionTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers
with ProtoMatchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceEventsActionTest.scala
+4 -2
View File
@@ -6,10 +6,12 @@ import net.eagle0.eagle.internal.changed_province.ChangedProvince.ProvinceEvents
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformProvinceEventsActionTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionActionTest.scala
+3 -2
View File
@@ -12,9 +12,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformProvinceMoveResolutionActionTest extends FlatSpec with Matchers {
class PerformProvinceMoveResolutionActionTest extends AnyFlatSpec with Matchers {
val movingPlayer = 3
val currentRoundId = 27
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformReconResolutionActionTest.scala
+4 -2
View File
@@ -14,10 +14,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.IncomingEndTurnAction.IncomingRecon
import net.eagle0.eagle.internal.province.{IncomingEndTurnAction, Province}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformReconResolutionActionTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformUncontestedConquestActionTest.scala
+3 -2
View File
@@ -13,9 +13,10 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.library.actions.impl.{BattalionMap, HeroMap}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformUncontestedConquestActionTest extends FlatSpec with Matchers {
class PerformUncontestedConquestActionTest extends AnyFlatSpec with Matchers {
val attackerId = 1
val heroes: Seq[Hero] = Seq(
src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformVassalCommandsPhaseActionTest.scala
+4 -2
View File
@@ -25,10 +25,12 @@ import net.eagle0.eagle.library.actions.impl.command.CommandFactory
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.CommandChoiceHelpers
import org.scalamock.scalatest.MockFactory
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class PerformVassalCommandsPhaseActionTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach
with MockFactory {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/ProvinceConqueredActionTest.scala
+3 -2
View File
@@ -14,9 +14,10 @@ import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.actions.impl.{BattalionMap, HeroMap}
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.shardok_interface.{EagleUnit, ResolvedEagleUnit}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ProvinceConqueredActionTest extends FlatSpec with Matchers {
class ProvinceConqueredActionTest extends AnyFlatSpec with Matchers {
val attackingPlayerId = 8
private val attackingHero1 = Hero()
.withFactionId(attackingPlayerId)
src/test/scala/net/eagle0/eagle/library/actions/impl/action/ProvinceHeldActionTest.scala
+4 -2
View File
@@ -11,9 +11,11 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.shardok_interface.ResolvedEagleUnit
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ProvinceHeldActionTest extends FlatSpec with Matchers {
class ProvinceHeldActionTest extends AnyFlatSpec with Matchers {
val defenderPid = 18
val defendingArmy = Army(factionId = defenderPid)
src/test/scala/net/eagle0/eagle/library/actions/impl/action/RequestBattlesActionTest.scala
+4 -2
View File
@@ -22,10 +22,12 @@ import net.eagle0.eagle.library.actions.impl.{BattalionMap, HeroMap}
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.shardok_interface.EagleUnit
import org.scalamock.scalatest.MockFactory
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class RequestBattlesActionTest
extends FlatSpec
extends AnyFlatSpec
with MockFactory
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/ResolveBattleActionTest.scala
+3 -2
View File
@@ -25,10 +25,11 @@ import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.library.util.IDable
import net.eagle0.eagle.shardok_interface.{BattleResolution, ResolvedEagleUnit, ResolvedShardokPlayer}
import org.scalamock.scalatest.MockFactory
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ResolveBattleActionTest
extends FlatSpec
extends AnyFlatSpec
with MockFactory
with Matchers
with ProtoMatchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/action/UnaffiliatedHeroAppearedActionTest.scala
+3 -2
View File
@@ -8,9 +8,10 @@ import net.eagle0.eagle.common.unaffiliated_hero.UnaffiliatedHero.Type.{RESIDENT
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class UnaffiliatedHeroAppearedActionTest extends FlatSpec with Matchers {
class UnaffiliatedHeroAppearedActionTest extends AnyFlatSpec with Matchers {
val provinceId = 17
val heroId = 23
src/test/scala/net/eagle0/eagle/library/actions/impl/action/UnaffiliatedHeroesChangedActionTest.scala
+3 -2
View File
@@ -6,9 +6,10 @@ import net.eagle0.eagle.common.unaffiliated_hero.UnaffiliatedHero.Type.{PRISONER
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class UnaffiliatedHeroesChangedActionTest extends FlatSpec with Matchers {
class UnaffiliatedHeroesChangedActionTest extends AnyFlatSpec with Matchers {
val heroId1 = 7
val hero1 = Hero()
.withId(heroId1)
src/test/scala/net/eagle0/eagle/library/actions/impl/action/WonFreeForAllActionTest.scala
+3 -2
View File
@@ -12,10 +12,11 @@ import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.shardok_battle.ShardokPlayer
import net.eagle0.eagle.library.util.IDable.mapifyProvinces
import net.eagle0.eagle.shardok_interface.ResolvedEagleUnit
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class WonFreeForAllActionTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers {
private val winningFid = 37
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ArmTroopsCommandTest.scala
+4 -2
View File
@@ -11,10 +11,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ArmTroopsCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
import net.eagle0.eagle.library.actions.impl._
src/test/scala/net/eagle0/eagle/library/actions/impl/command/AttackDecisionCommandTest.scala
+3 -2
View File
@@ -18,10 +18,11 @@ import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.EagleClientException
import net.eagle0.eagle.library.actions.availability.ExpandedCombatUnitUtils
import net.eagle0.eagle.{FactionId, ProvinceId, RoundId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class AttackDecisionCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers {
val attackerFid: FactionId = 19
src/test/scala/net/eagle0/eagle/library/actions/impl/command/CommandFactoryTest.scala
+3 -2
View File
@@ -6,10 +6,11 @@ import net.eagle0.eagle.common.command_type.CommandType.{DEFEND_COMMAND, MARCH_C
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.library.EagleInternalException
import org.scalamock.scalatest.MockFactory
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
//noinspection RedundantDefaultArgument
class CommandFactoryTest extends FlatSpec with MockFactory with Matchers {
class CommandFactoryTest extends AnyFlatSpec with MockFactory with Matchers {
"makeCommand" should "throw if the type does not have a corresponding command" in {
val availableCommand = AvailableCommand(
`type` = MARCH_COMMAND
src/test/scala/net/eagle0/eagle/library/actions/impl/command/DefendCommandTest.scala
+3 -2
View File
@@ -9,9 +9,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class DefendCommandTest extends FlatSpec with Matchers {
class DefendCommandTest extends AnyFlatSpec with Matchers {
import net.eagle0.eagle.library.actions.impl._
val fleeProvinceId = 19
src/test/scala/net/eagle0/eagle/library/actions/impl/command/DiplomacyCommandTest.scala
+4 -2
View File
@@ -17,10 +17,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.{EagleClientException, EagleInternalException}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class DiplomacyCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/FeastCommandTest.scala
+4 -2
View File
@@ -12,9 +12,11 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class FeastCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class FeastCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
override def beforeEach(): Unit = Settings.loadSettings(
Map(
"loyaltyGainFromFeast" -> "12",
src/test/scala/net/eagle0/eagle/library/actions/impl/command/FreeForAllDecisionCommandTest.scala
+3 -2
View File
@@ -13,10 +13,11 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.{FactionId, ProvinceId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class FreeForAllDecisionCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers {
val actingFid: FactionId = 18
src/test/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommandTest.scala
+4 -2
View File
@@ -16,10 +16,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class HandleCapturedHeroesCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
import net.eagle0.common.ProtoMatchers._
src/test/scala/net/eagle0/eagle/library/actions/impl/command/HeroGiftCommandTest.scala
+4 -2
View File
@@ -12,10 +12,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class HeroGiftCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ImproveCommandTest.scala
+5 -2
View File
@@ -13,10 +13,13 @@ import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable
import org.scalactic.{Equality, TolerantNumerics}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ImproveCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
import net.eagle0.eagle.library.actions.impl._
src/test/scala/net/eagle0/eagle/library/actions/impl/command/IssueOrdersCommandTest.scala
+3 -2
View File
@@ -15,9 +15,10 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.{FactionId, HeroId, ProvinceId}
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class IssueOrdersCommandTest extends FlatSpec with Matchers {
class IssueOrdersCommandTest extends AnyFlatSpec with Matchers {
val factionId = 7
val actingProvince = 5
val factionLeader = 19
src/test/scala/net/eagle0/eagle/library/actions/impl/command/JailbreakCommandTest.scala
+4 -2
View File
@@ -15,10 +15,12 @@ import net.eagle0.eagle.internal.province.{IncomingEndTurnAction, Province}
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.{FactionId, ProvinceId}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class JailbreakCommandTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/MarchCommandTest.scala
+4 -2
View File
@@ -15,9 +15,11 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class MarchCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class MarchCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
val heroes: Seq[Hero] = Seq(
Hero(
id = 1,
src/test/scala/net/eagle0/eagle/library/actions/impl/command/OrganizeTroopsCommandTest.scala
+4 -2
View File
@@ -12,10 +12,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class OrganizeTroopsCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ProvinceGiftCommandTest.scala
+4 -2
View File
@@ -14,10 +14,12 @@ import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ProvinceGiftCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ReconCommandTest.scala
+4 -2
View File
@@ -12,9 +12,11 @@ import net.eagle0.eagle.internal.province.IncomingEndTurnAction
import net.eagle0.eagle.internal.province.IncomingEndTurnAction.IncomingRecon
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ReconCommandTest extends FlatSpec with BeforeAndAfterEach with Matchers {
class ReconCommandTest extends AnyFlatSpec with BeforeAndAfterEach with Matchers {
import net.eagle0.common.ProtoMatchers._
val gameState = GameState()
src/test/scala/net/eagle0/eagle/library/actions/impl/command/RecruitHeroesCommandTest.scala
+4 -2
View File
@@ -13,10 +13,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class RecruitHeroesCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
val provinceId = 8
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ResolveInvitationCommandTest.scala
+4 -2
View File
@@ -22,10 +22,12 @@ import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleClientException
import net.eagle0.eagle.library.settings.Settings
import net.eagle0.eagle.library.util.IDable.{mapifyBattalions, mapifyFactions, mapifyHeroes, mapifyProvinces}
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ResolveInvitationCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with ProtoMatchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ResolveTreatyOfferCommandTest.scala
+4 -2
View File
@@ -10,10 +10,12 @@ import net.eagle0.eagle.common.treaty_offer.TreatyOffer
import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.library.EagleClientException
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ResolveTreatyOfferCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ResolveTributeCommandTest.scala
+3 -2
View File
@@ -15,9 +15,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.supplies.Supplies
import net.eagle0.eagle.library.EagleCommandException
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ResolveTributeCommandTest extends FlatSpec with Matchers {
class ResolveTributeCommandTest extends AnyFlatSpec with Matchers {
import net.eagle0.common.ProtoMatchers._
val actingFactionId = 3
src/test/scala/net/eagle0/eagle/library/actions/impl/command/RestCommandTest.scala
+4 -2
View File
@@ -7,9 +7,11 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class RestCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class RestCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
import net.eagle0.eagle.library.actions.impl._
val rulingFactionId = 5
src/test/scala/net/eagle0/eagle/library/actions/impl/command/ReturnCommandTest.scala
+3 -2
View File
@@ -9,9 +9,10 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ReturnCommandTest extends FlatSpec with Matchers {
class ReturnCommandTest extends AnyFlatSpec with Matchers {
import net.eagle0.eagle.library.actions.impl._
val actingPlayerId = 19
src/test/scala/net/eagle0/eagle/library/actions/impl/command/SendSuppliesCommandTest.scala
+4 -2
View File
@@ -11,10 +11,12 @@ import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.internal.supplies.{MovingSupplies, Supplies}
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class SendSuppliesCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/SuppressBrigandsCommandTest.scala
+4 -2
View File
@@ -17,10 +17,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleClientException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class SuppressBrigandsCommandTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/actions/impl/command/SwearBrotherhoodCommandTest.scala
+4 -2
View File
@@ -10,10 +10,12 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class SwearBrotherhoodCommandTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
override def beforeEach(): Unit = Settings.loadSettings(
src/test/scala/net/eagle0/eagle/library/actions/impl/command/TradeCommandTest.scala
+4 -2
View File
@@ -10,9 +10,11 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class TradeCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class TradeCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
val factionId = 82
val provinceId = 3
src/test/scala/net/eagle0/eagle/library/actions/impl/command/TrainCommandTest.scala
+4 -2
View File
@@ -10,9 +10,11 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class TrainCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class TrainCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
import net.eagle0.eagle.library.actions.impl._
val heroes: Seq[Hero] = Seq(
src/test/scala/net/eagle0/eagle/library/actions/impl/command/TravelCommandTest.scala
+4 -2
View File
@@ -12,9 +12,11 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.EagleCommandException
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.{BeforeAndAfterEach}
import org.scalatest.matchers.should.Matchers
class TravelCommandTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class TravelCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
import net.eagle0.eagle.library.actions.impl._
val actingPlayerId = 19
src/test/scala/net/eagle0/eagle/library/actions/impl/common/ActionResultApplierTest.scala
+3 -2
View File
@@ -22,9 +22,10 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.shardok_battle.ShardokBattle
import net.eagle0.eagle.library.EagleInternalException
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class ActionResultApplierTest extends FlatSpec with Matchers {
class ActionResultApplierTest extends AnyFlatSpec with Matchers {
import net.eagle0.common.ProtoMatchers._
"a result with a new round id" should "change the round ID in the game state" in {
src/test/scala/net/eagle0/eagle/library/util/BUILD
+1
View File
@@ -126,6 +126,7 @@ scala_test(
scala_test(
name = "string_construction_parser_test",
srcs = ["StringConstructionParserTest.scala"],
scalacopts = ["-deprecation"],
deps = [
"//src/main/scala/net/eagle0/eagle/library/util:string_construction_parser",
"//src/main/scala/net/eagle0/eagle/library/util:string_construction_token",
src/test/scala/net/eagle0/eagle/library/util/CommandChoiceHelpersTest.scala
+1 -3
View File
@@ -1,8 +1,6 @@
package net.eagle0.eagle.library.util
import org.scalatest.FlatSpec
class CommandChoiceHelpersTest extends FlatSpec {
class CommandChoiceHelpersTest extends AnyFlatSpec {
behavior of "CommandChoiceHelpersTest"
src/test/scala/net/eagle0/eagle/library/util/DateUtilsTest.scala
+3 -2
View File
@@ -1,9 +1,10 @@
package net.eagle0.eagle.library.util
import net.eagle0.eagle.common.date.Date
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class DateUtilsTest extends FlatSpec with Matchers {
class DateUtilsTest extends AnyFlatSpec with Matchers {
import DateUtils._Date
import net.eagle0.common.ProtoMatchers._
src/test/scala/net/eagle0/eagle/library/util/FactionUtilsTest.scala
+7 -2
View File
@@ -4,9 +4,14 @@ import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class FactionUtilsTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class FactionUtilsTest
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
behavior of "FactionUtilsTest"
src/test/scala/net/eagle0/eagle/library/util/FunctionalRandomTest.scala
+3 -2
View File
@@ -1,10 +1,11 @@
package net.eagle0.eagle.library.util
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
import scala.util.Random
class FunctionalRandomTest extends FlatSpec with Matchers {
class FunctionalRandomTest extends AnyFlatSpec with Matchers {
behavior of "FunctionalRandomTest"
src/test/scala/net/eagle0/eagle/library/util/GameStateViewUtilsTest.scala
+4 -2
View File
@@ -23,10 +23,12 @@ import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.internal.shardok_battle.{ShardokBattle, ShardokPlayer}
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class GameStateViewUtilsTest
extends FlatSpec
extends AnyFlatSpec
with BeforeAndAfterEach
with Matchers {
src/test/scala/net/eagle0/eagle/library/util/HeroUtilsTest.scala
+3 -2
View File
@@ -1,9 +1,10 @@
package net.eagle0.eagle.library.util
import net.eagle0.eagle.internal.hero.Hero
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class HeroUtilsTest extends FlatSpec with Matchers {
class HeroUtilsTest extends AnyFlatSpec with Matchers {
"discordance" should "be 0 for heroes with identical traits" in {
val hero1 = Hero(
src/test/scala/net/eagle0/eagle/library/util/ProvinceDistancesTest.scala
+3 -2
View File
@@ -4,9 +4,10 @@ import net.eagle0.eagle.ProvinceId
import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.province.{Neighbor, Province}
import net.eagle0.eagle.library.util.ProvinceDistances.ProvinceAndDistance
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class ProvinceDistancesTest extends FlatSpec with Matchers {
class ProvinceDistancesTest extends AnyFlatSpec with Matchers {
behavior of "ProvinceDistancesTest"
src/test/scala/net/eagle0/eagle/library/util/ProvinceUtilsTest.scala
+7 -2
View File
@@ -10,9 +10,14 @@ import net.eagle0.eagle.internal.game_state.GameState
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.internal.province.Province
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class ProvinceUtilsTest extends FlatSpec with Matchers with BeforeAndAfterEach {
class ProvinceUtilsTest
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {
val factionId = 32
val factionHeadId = 17
val leaderIdLow = 3
src/test/scala/net/eagle0/eagle/library/util/RecruitmentOddsUtilsTest.scala
+4 -2
View File
@@ -6,10 +6,12 @@ import net.eagle0.eagle.common.unaffiliated_hero.UnaffiliatedHero.Type.{OUTLAW,
import net.eagle0.eagle.internal.faction.Faction
import net.eagle0.eagle.internal.hero.Hero
import net.eagle0.eagle.library.settings.Settings
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class RecruitmentOddsUtilsTest
extends FlatSpec
extends AnyFlatSpec
with Matchers
with BeforeAndAfterEach {

Some files were not shown because too many files have changed in this diff Show More