tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Toolshed part 2 (#18997)

Browse Source 
* fixe

* Save work.

* Rune-aware parser.

* oogh

* pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

* Publicizes a lot of common generic commands, so custom toolshed envs can include them.

* i think i might implode

* Tests.

* a

* b

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
This commit is contained in:
Moony
2023-08-23 16:03:41 -05:00
committed by GitHub
parent 852b66dee6
commit 3d3c9e3348
20 changed files with 349 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
View File

@@ -22,10 +22,12 @@ public abstract class ToolshedTest : IInvocationContext
protected RobustIntegrationTest.ServerIntegrationInstance Server = default!;
protected RobustIntegrationTest.ClientIntegrationInstance? Client = null;
protected ToolshedManager Toolshed = default!;
public ToolshedManager Toolshed { get; private set; } = default!;
public ToolshedEnvironment Environment => Toolshed.DefaultEnvironment;
protected IAdminManager AdminManager = default!;
protected IInvocationContext? Context = null;
protected IInvocationContext? InvocationContext = null;
[TearDown]
public async Task TearDownInternal()
@@ -44,11 +46,11 @@ public abstract class ToolshedTest : IInvocationContext
public virtual async Task Setup()
{
PairTracker = await PoolManager.GetServerClient(new PoolSettings {Connected = Connected});
Server = PairTracker.Pair.Server;
Server = PairTracker.Server;
if (Connected)
{
Client = PairTracker.Pair.Client;
Client = PairTracker.Client;
await Client.WaitIdleAsync();
}
@@ -63,10 +65,17 @@ public abstract class ToolshedTest : IInvocationContext
return Toolshed.InvokeCommand(this, command, null, out result);
}
protected T InvokeCommand<T>(string command)
{
InvokeCommand(command, out var res);
Assert.That(res, Is.AssignableTo<T>());
return (T) res!;
}
protected void ParseCommand(string command, Type? inputType = null, Type? expectedType = null, bool once = false)
{
var parser = new ForwardParser(command, Toolshed);
var success = CommandRun.TryParse(false, false, parser, inputType, expectedType, once, out _, out _, out var error);
var parser = new ParserContext(command, Toolshed);
var success = CommandRun.TryParse(false, parser, inputType, expectedType, once, out _, out _, out var error);
if (error is not null)
ReportError(error);
@@ -77,9 +86,9 @@ public abstract class ToolshedTest : IInvocationContext
public bool CheckInvokable(CommandSpec command, out IConError? error)
{
if (Context is not null)
if (InvocationContext is not null)
{
return Context.CheckInvokable(command, out error);
return InvocationContext.CheckInvokable(command, out error);
}
error = null;
@@ -92,9 +101,9 @@ public abstract class ToolshedTest : IInvocationContext
{
get
{
if (Context is not null)
if (InvocationContext is not null)
{
return Context.Session;
return InvocationContext.Session;
}
return InvocationSession;