Live-smoke bug 2026-06-02: queued Bloodcraft (deck #5), wire showed classId=2 (Swordcraft) for self_info on the /ai_unlimited_rank_battle/start response — client rendered the wrong leader. Two layers of the same bug: 1. MatchContextBuilder.BuildForRankBattleAsync hardcoded deckNo=1 instead of taking it from the do_matching request — verified against data_dumps/captures/traffic.ndjson L17 where deck_no=5 was on the wire. Signature changes to (viewerId, format, deckNo); DoMatchingInternal passes req.DeckNo. 2. AiStartInternal rebuilt MatchContext from scratch — but the /ai_*/start request body is BaseRequest only, no deck_no on the wire. The fix uses the MatchContext the bridge already stored at do_matching resolution time (in the Bot PendingBattle), so deck/cosmetic data is consistent end-to-end. New IBattleSessionStore.TryFindPendingForViewer(viewerId) finds the viewer's pending battle for lookup. The store entry persists across ai_start (idempotent reads are fine — the WS handler removes on connect). No-pending sentinel: ai_id=-1 surfaces the "no AI assigned" error in the client. Tests: 936 → 939 passing. - MatchContextBuilderTests.BuildForRankBattle_uses_the_caller_supplied_deck_number seeds deck #1 (class 1) and deck #5 (class 6) and asserts the deckNo argument picks the right one. - RankBattleControllerTests.AiStart_self_info_class_matches_queued_deck_number is the end-to-end regression: register Bot battle with deck #5, hit /ai_unlimited_rank_battle/start, assert self_info.classId == 6. - RankBattleControllerTests.AiStart_without_pending_battle_returns_neg1_sentinel locks the defensive ai_id=-1 path. - Existing AiStart_* tests bypass do_matching, so adapted to call a new RegisterBotBattleAsync helper that mirrors what InProcessPairUp does on AI-fallback resolution. SeedDeckAsync gains an optional classId so test cases can differentiate decks by class (was always picking Classes.First()). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
216 lines
9.2 KiB
C#
216 lines
9.2 KiB
C#
using System.Text.Json;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using SVSim.BattleNode.Bridge;
|
|
using SVSim.Database;
|
|
using SVSim.Database.Enums;
|
|
using SVSim.Database.Models;
|
|
using SVSim.EmulatedEntrypoint.Services;
|
|
using SVSim.UnitTests.Infrastructure;
|
|
|
|
namespace SVSim.UnitTests.Services;
|
|
|
|
[TestFixture]
|
|
public class MatchContextBuilderTests
|
|
{
|
|
[Test]
|
|
public async Task BuildForTwoPick_returns_context_from_run_state()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var vid = await factory.SeedViewerAsync();
|
|
var deck = Enumerable.Range(1, 30).Select(i => 100_011_000L + i).ToList();
|
|
int emblemId, degreeId;
|
|
|
|
using (var seedScope = factory.Services.CreateScope())
|
|
{
|
|
var db = seedScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
|
var emblem = await db.Emblems.FirstAsync();
|
|
var degree = await db.Degrees.FirstAsync();
|
|
emblemId = emblem.Id;
|
|
degreeId = degree.Id;
|
|
|
|
var viewer = await db.Viewers.FindAsync(vid);
|
|
viewer!.DisplayName = "Drafter";
|
|
viewer.Info.CountryCode = "KOR";
|
|
viewer.Info.IsOfficial = false;
|
|
viewer.Info.SelectedEmblem = emblem;
|
|
viewer.Info.SelectedDegree = degree;
|
|
db.ViewerArenaTwoPickRuns.Add(new ViewerArenaTwoPickRun
|
|
{
|
|
ViewerId = vid,
|
|
EntryId = 1,
|
|
ClassId = 5,
|
|
LeaderSkinId = 5_000_001L,
|
|
SelectedCardIdsJson = JsonSerializer.Serialize(deck),
|
|
IsSelectCompleted = true,
|
|
MaxBattleCount = 5,
|
|
CandidateClassIdsJson = "[1,2,3]",
|
|
PendingPickSetsJson = "[]",
|
|
ResultListJson = "[]",
|
|
NextCandidateId = 1,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
var ctx = await builder.BuildForTwoPickAsync(vid);
|
|
|
|
Assert.That(ctx.SelfDeckCardIds, Is.EqualTo(deck));
|
|
Assert.That(ctx.ClassId, Is.EqualTo("5"));
|
|
Assert.That(ctx.CharaId, Is.EqualTo("5000001")); // LeaderSkinId set
|
|
Assert.That(ctx.CountryCode, Is.EqualTo("KOR"));
|
|
Assert.That(ctx.UserName, Is.EqualTo("Drafter"));
|
|
Assert.That(ctx.EmblemId, Is.EqualTo(emblemId.ToString()));
|
|
Assert.That(ctx.DegreeId, Is.EqualTo(degreeId.ToString()));
|
|
Assert.That(ctx.IsOfficial, Is.EqualTo(0));
|
|
Assert.That(ctx.BattleType, Is.EqualTo(11));
|
|
// Hardcoded v1 fixtures (see spec §Deferred plumbing)
|
|
Assert.That(ctx.CardMasterName, Is.EqualTo("card_master_node_10015"));
|
|
Assert.That(ctx.FieldId, Is.EqualTo(43));
|
|
// Sleeve comes from ChallengeConfig.TwoPickSleeveId — ShippedDefaults is 0.
|
|
Assert.That(ctx.SleeveId, Is.EqualTo("0"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForTwoPick_throws_when_no_run()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var vid = await factory.SeedViewerAsync();
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
|
|
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => builder.BuildForTwoPickAsync(vid));
|
|
Assert.That(ex!.ErrorCode, Is.EqualTo("arena_two_pick_no_active_run"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForTwoPick_throws_when_draft_incomplete()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var vid = await factory.SeedViewerAsync();
|
|
|
|
using (var seedScope = factory.Services.CreateScope())
|
|
{
|
|
var db = seedScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
|
db.ViewerArenaTwoPickRuns.Add(new ViewerArenaTwoPickRun
|
|
{
|
|
ViewerId = vid,
|
|
EntryId = 1,
|
|
ClassId = 1,
|
|
SelectedCardIdsJson = JsonSerializer.Serialize(new long[] { 100_011_001L, 100_011_002L }),
|
|
IsSelectCompleted = false,
|
|
CandidateClassIdsJson = "[1,2,3]",
|
|
PendingPickSetsJson = "[]",
|
|
ResultListJson = "[]",
|
|
MaxBattleCount = 5,
|
|
NextCandidateId = 1,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
|
|
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => builder.BuildForTwoPickAsync(vid));
|
|
Assert.That(ex!.ErrorCode, Is.EqualTo("arena_two_pick_draft_incomplete"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForRankBattle_returns_MatchContext_with_format_specific_deck()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var viewerId = await factory.SeedViewerAsync(displayName: "Ranker");
|
|
await factory.SeedGlobalsAsync();
|
|
await factory.SeedDeckAsync(viewerId, Format.Rotation, 1, "Rank Rotation Deck");
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
|
|
var ctx = await builder.BuildForRankBattleAsync(viewerId, Format.Rotation, deckNo: 1);
|
|
|
|
Assert.That(ctx.UserName, Is.EqualTo("Ranker"));
|
|
Assert.That(ctx.BattleType, Is.EqualTo(11), "BattleType=11 matches the prod rank-battle wire value (same as TK2).");
|
|
Assert.That(ctx.ClassId, Is.Not.Null.And.Not.Empty, "ClassId from the selected deck's class.");
|
|
Assert.That(ctx.CardMasterName, Is.EqualTo("card_master_node_10015"));
|
|
Assert.That(ctx.FieldId, Is.EqualTo(43));
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForRankBattle_throws_when_no_deck_for_format()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var viewerId = await factory.SeedViewerAsync();
|
|
await factory.SeedGlobalsAsync();
|
|
// Intentionally no SeedDeckAsync for Rotation.
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
|
|
Assert.That(async () => await builder.BuildForRankBattleAsync(viewerId, Format.Rotation, deckNo: 1),
|
|
Throws.Exception);
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForRankBattle_uses_the_caller_supplied_deck_number()
|
|
{
|
|
// Regression for the 2026-06-02 "queued Bloodcraft, saw Swordcraft leader"
|
|
// wire bug — MatchContextBuilder.BuildForRankBattleAsync hardcoded deckNo=1.
|
|
// Seed two decks for different classes (1 and 6) and confirm the deckNo
|
|
// argument picks the right one.
|
|
await using var factory = new SVSimTestFactory();
|
|
var viewerId = await factory.SeedViewerAsync(displayName: "Ranker");
|
|
await factory.SeedGlobalsAsync();
|
|
await factory.SeedDeckAsync(viewerId, Format.Unlimited, number: 1, name: "Deck 1", classId: 1);
|
|
await factory.SeedDeckAsync(viewerId, Format.Unlimited, number: 5, name: "Deck 5", classId: 6);
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
|
|
var deck1Ctx = await builder.BuildForRankBattleAsync(viewerId, Format.Unlimited, deckNo: 1);
|
|
var deck5Ctx = await builder.BuildForRankBattleAsync(viewerId, Format.Unlimited, deckNo: 5);
|
|
|
|
Assert.That(deck1Ctx.ClassId, Is.EqualTo("1"), "deckNo=1 → class 1.");
|
|
Assert.That(deck5Ctx.ClassId, Is.EqualTo("6"), "deckNo=5 → class 6 (the wire-bug case).");
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildForTwoPick_falls_back_to_default_loadout_when_unequipped()
|
|
{
|
|
await using var factory = new SVSimTestFactory();
|
|
var vid = await factory.SeedViewerAsync();
|
|
var deck = Enumerable.Range(1, 30).Select(i => 100_011_000L + i).ToList();
|
|
|
|
using (var seedScope = factory.Services.CreateScope())
|
|
{
|
|
var db = seedScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
|
// No SelectedEmblem / SelectedDegree set → default (Id=0) nav rows.
|
|
db.ViewerArenaTwoPickRuns.Add(new ViewerArenaTwoPickRun
|
|
{
|
|
ViewerId = vid,
|
|
EntryId = 1,
|
|
ClassId = 1,
|
|
LeaderSkinId = 0, // No skin chosen → CharaId == ClassId
|
|
SelectedCardIdsJson = JsonSerializer.Serialize(deck),
|
|
IsSelectCompleted = true,
|
|
CandidateClassIdsJson = "[1,2,3]",
|
|
PendingPickSetsJson = "[]",
|
|
ResultListJson = "[]",
|
|
MaxBattleCount = 5,
|
|
NextCandidateId = 1,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
using var scope = factory.Services.CreateScope();
|
|
var builder = scope.ServiceProvider.GetRequiredService<IMatchContextBuilder>();
|
|
var ctx = await builder.BuildForTwoPickAsync(vid);
|
|
|
|
// DefaultLoadoutConfig.ShippedDefaults: EmblemId=100000000, DegreeId=300003
|
|
Assert.That(ctx.EmblemId, Is.EqualTo("100000000"));
|
|
Assert.That(ctx.DegreeId, Is.EqualTo("300003"));
|
|
Assert.That(ctx.CharaId, Is.EqualTo("1")); // falls back to ClassId
|
|
}
|
|
}
|