AcediaFramework
/
AcediaCore
2
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
Browse Source

Refactor commands to use new collections

pull/8/head
Anton Tarasenko 2 years ago
parent
b8647154fd
commit
fbe1ffd265
6 changed files with 125 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      sources/Commands/BuiltInCommands/ACommandHelp.uc
  2. 12
      sources/Commands/Command.uc
  3. 28
      sources/Commands/CommandDataBuilder.uc
  4. 95
      sources/Commands/CommandParser.uc
  5. 72
      sources/Commands/Tests/TEST_Command.uc
  6. 4
      sources/Commands/Tests/TEST_CommandDataBuilder.uc

20
sources/Commands/BuiltInCommands/ACommandHelp.uc
Unescape View File

@ -42,8 +42,8 @@ protected function BuildData(CommandDataBuilder builder)
protected function Executed(Command.CallData callData, EPlayer callerPlayer)
{
local AssociativeArray parameters, options;;
local DynamicArray commandsToDisplay;
local HashTable parameters, options;;
local ArrayList commandsToDisplay;
parameters = callData.parameters;
options = callData.options;
// Print command list if "--list" option was specified
@ -57,8 +57,9 @@ protected function Executed(Command.CallData callData, EPlayer callerPlayer)
// print a help page for this command.
if (!options.HasKey(P("list")) || parameters.HasKey(P("commands")))
{
commandsToDisplay = DynamicArray(parameters.GetItem(P("commands")));
commandsToDisplay = parameters.GetArrayList(P("commands"));
DisplayCommandHelpPages(callerPlayer, commandsToDisplay);
_.memory.Free(commandsToDisplay);
}
}
@ -82,7 +83,7 @@ private final function DisplayCommandList(EPlayer player)
nextCommand = commandsFeature.GetCommand(commandNames[i]);
if (nextCommand == none) continue;
nextData = nextCommand.GetData();
nextData = nextCommand.BorrowData();
console.UseColor(_.color.textEmphasis)
.Write(nextData.name)
.ResetColor()
@ -94,9 +95,10 @@ private final function DisplayCommandList(EPlayer player)
private final function DisplayCommandHelpPages(
EPlayer player,
DynamicArray commandList)
ArrayList commandList)
{
local int i;
local Text nextCommandName;
local Command nextCommand;
local Commands_Feature commandsFeature;
if (player == none) return;
@ -107,15 +109,17 @@ private final function DisplayCommandHelpPages(
// If arguments were empty - at least display our own help page
if (commandList == none)
{
PrintHelpPage(player.BorrowConsole(), GetData());
PrintHelpPage(player.BorrowConsole(), BorrowData());
return;
}
// Otherwise - print help for specified commands
for (i = 0; i < commandList.GetLength(); i += 1)
{
nextCommand = commandsFeature.GetCommand(Text(commandList.GetItem(i)));
nextCommandName = commandList.GetText(i);
nextCommand = commandsFeature.GetCommand(nextCommandName);
_.memory.Free(nextCommandName);
if (nextCommand == none) continue;
PrintHelpPage(player.BorrowConsole(), nextCommand.GetData());
PrintHelpPage(player.BorrowConsole(), nextCommand.BorrowData());
}
}

12
sources/Commands/Command.uc
Unescape View File

@ -70,8 +70,8 @@ struct CallData
// Specified sub-command and parameters/options
var public Text subCommandName;
// Provided parameters and specified options
var public AssociativeArray parameters;
var public AssociativeArray options;
var public HashTable parameters;
var public HashTable options;
// Errors that occurred during command call processing are described by
// error type and optional error textual name of the object
// (parameter, option, etc.) that caused it.
@ -94,9 +94,9 @@ enum ParameterType
CPT_Text,
// Special parameter that consumes the rest of the input into `Text`
CPT_Remainder,
// Parses into `AssociativeArray`
// Parses into `HashTable`
CPT_Object,
// Parses into `DynamicArray`
// Parses into `ArrayList`
CPT_Array
};
@ -202,7 +202,7 @@ protected function Constructor()
dataBuilder =
CommandDataBuilder(_.memory.Allocate(class'CommandDataBuilder'));
BuildData(dataBuilder);
commandData = dataBuilder.GetData();
commandData = dataBuilder.BorrowData();
dataBuilder.FreeSelf();
dataBuilder = none;
}
@ -577,7 +577,7 @@ public final function Text GetName()
* so deallocating any objects in the returned `struct` would lead to
* undefined behavior.
*/
public final function Data GetData()
public final function Data BorrowData()
{
return commandData;
}

28
sources/Commands/CommandDataBuilder.uc
Unescape View File

@ -540,7 +540,7 @@ public final function CommandDataBuilder OptionalParams()
* @return Returns the caller `CommandDataBuilder` to allow for
* method chaining.
*/
public final function Command.Data GetData()
public final function Command.Data BorrowData()
{
local Command.Data newData;
RecordSelection();
@ -594,7 +594,7 @@ private final function Command.Parameter NewParameter(
* this setting only affects how parameter will be displayed in
* generated help.
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -629,7 +629,7 @@ public final function CommandDataBuilder ParamBoolean(
* this setting only affects how parameter will be displayed in
* generated help.
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -660,7 +660,7 @@ public final function CommandDataBuilder ParamBooleanList(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -687,7 +687,7 @@ public final function CommandDataBuilder ParamInteger(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -714,7 +714,7 @@ public final function CommandDataBuilder ParamIntegerList(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -741,7 +741,7 @@ public final function CommandDataBuilder ParamNumber(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -768,7 +768,7 @@ public final function CommandDataBuilder ParamNumberList(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -795,7 +795,7 @@ public final function CommandDataBuilder ParamText(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -822,7 +822,7 @@ public final function CommandDataBuilder ParamTextList(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -849,7 +849,7 @@ public final function CommandDataBuilder ParamRemainder(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -876,7 +876,7 @@ public final function CommandDataBuilder ParamObject(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -903,7 +903,7 @@ public final function CommandDataBuilder ParamObjectList(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for
@ -930,7 +930,7 @@ public final function CommandDataBuilder ParamArray(
* @param name Name of the parameter, will be copied
* (as it would appear in the generated help info).
* @param variableName Name of the variable that will store this
* parameter's value in `AssociativeArray` after user's command input
* parameter's value in `HashTable` after user's command input
* is parsed. Provided value will be copied.
* If left `none`, - will coincide with `name` parameter.
* @return Returns the caller `CommandDataBuilder` to allow for

95
sources/Commands/CommandParser.uc
Unescape View File

@ -210,11 +210,11 @@ public final function Command.CallData ParseWith(
Parser parser,
Command.Data commandData)
{
local AssociativeArray commandParameters;
local HashTable commandParameters;
// Temporary object to return `nextResult` while setting variable to `none`
local Command.CallData toReturn;
nextResult.parameters = _.collections.EmptyAssociativeArray();
nextResult.options = _.collections.EmptyAssociativeArray();
nextResult.parameters = _.collections.EmptyHashTable();
nextResult.options = _.collections.EmptyHashTable();
if (commandData.subCommands.length == 0)
{
DeclareError(CET_NoSubCommands, none);
@ -265,17 +265,17 @@ private final function AssertNoTrailingInput()
// Assumes `commandParser` is not `none`.
// Parses given required and optional parameters along with any
// possible option declarations.
// Returns `AssociativeArray` filled with (variable, parsed value) pairs.
// Returns `HashTable` filled with (variable, parsed value) pairs.
// Failure is equal to `commandParser` entering into a failed state.
private final function AssociativeArray ParseParameterArrays(
private final function HashTable ParseParameterArrays(
array<Command.Parameter> requiredParameters,
array<Command.Parameter> optionalParameters)
{
local AssociativeArray parsedParameters;
local HashTable parsedParameters;
if (!commandParser.Ok()) {
return none;
}
parsedParameters = _.collections.EmptyAssociativeArray();
parsedParameters = _.collections.EmptyHashTable();
// Parse parameters
ParseRequiredParameterArray(parsedParameters, requiredParameters);
ParseOptionalParameterArray(parsedParameters, optionalParameters);
@ -286,9 +286,9 @@ private final function AssociativeArray ParseParameterArrays(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses given required parameters along with any possible option
// declarations into given `parsedParameters` associative array.
// declarations into given `parsedParameters` `HashTable`.
private final function ParseRequiredParameterArray(
AssociativeArray parsedParameters,
HashTable parsedParameters,
array<Command.Parameter> requiredParameters)
{
local int i;
@ -324,9 +324,9 @@ private final function ParseRequiredParameterArray(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses given optional parameters along with any possible option
// declarations into given `parsedParameters` associative array.
// declarations into given `parsedParameters` hash table.
private final function ParseOptionalParameterArray(
AssociativeArray parsedParameters,
HashTable parsedParameters,
array<Command.Parameter> optionalParameters)
{
local int i;
@ -354,11 +354,11 @@ private final function ParseOptionalParameterArray(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses one given parameter along with any possible option
// declarations into given `parsedParameters` associative array.
// declarations into given `parsedParameters` `HashTable`.
// Returns `true` if we've successfully parsed given parameter without
// any errors.
private final function bool ParseParameter(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local bool parsedEnough;
@ -393,11 +393,11 @@ private final function bool ParseParameter(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single value for a given parameter (e.g. one integer for
// integer or integer list parameter types) along with any possible option
// declarations into given `parsedParameters` associative array.
// declarations into given `parsedParameters` `HashTable`.
// Returns `true` if we've successfully parsed a single value without
// any errors.
private final function bool ParseSingleValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
// Before parsing any other value we need to check if user has
@ -454,9 +454,9 @@ private final function bool ParseSingleValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single boolean value into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseBooleanValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local int i;
@ -501,9 +501,9 @@ private final function bool ParseBooleanValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single integer value into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseIntegerValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local int integerValue;
@ -518,9 +518,9 @@ private final function bool ParseIntegerValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single number (float) value into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseNumberValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local float numberValue;
@ -535,9 +535,9 @@ private final function bool ParseNumberValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single `Text` value into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseTextValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local bool failedParsing;
@ -568,9 +568,9 @@ private final function bool ParseTextValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single `Text` value into given `parsedParameters`
// associative array, consuming all remaining contents.
// hash table, consuming all remaining contents.
private final function bool ParseRemainderValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local MutableText value;
@ -585,13 +585,13 @@ private final function bool ParseRemainderValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single JSON object into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseObjectValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local AssociativeArray objectValue;
objectValue = _.json.ParseObjectWith(commandParser);
local HashTable objectValue;
objectValue = _.json.ParseHashTableWith(commandParser);
if (!commandParser.Ok()) {
return false;
}
@ -601,13 +601,13 @@ private final function bool ParseObjectValue(
// Assumes `commandParser` and `parsedParameters` are not `none`.
// Parses a single JSON array into given `parsedParameters`
// associative array.
// hash table.
private final function bool ParseArrayValue(
AssociativeArray parsedParameters,
HashTable parsedParameters,
Command.Parameter expectedParameter)
{
local DynamicArray arrayValue;
arrayValue = _.json.ParseArrayWith(commandParser);
local ArrayList arrayValue;
arrayValue = _.json.ParseArrayListWith(commandParser);
if (!commandParser.Ok()) {
return false;
}
@ -623,24 +623,27 @@ private final function bool ParseArrayValue(
// recorded at `parameter.variableName` key (creating it if missing).
// All recorded values are managed by `parametersArray`.
private final function RecordParameter(
AssociativeArray parametersArray,
HashTable parametersArray,
Command.Parameter parameter,
AcediaObject value)
/* take */AcediaObject value)
{
local DynamicArray parameterVariable;
local ArrayList parameterVariable;
if (!parameter.allowsList)
{
parametersArray.SetItem(parameter.variableName, value, true);
parametersArray.SetItem(parameter.variableName, value);
_.memory.Free(value);
return;
}
parameterVariable =
DynamicArray(parametersArray.GetItem(parameter.variableName));
ArrayList(parametersArray.GetItem(parameter.variableName));
if (parameterVariable == none) {
parameterVariable = _.collections.EmptyDynamicArray();
parameterVariable = _.collections.EmptyArrayList();
}
parameterVariable.AddItem(value, true);
parametersArray.SetItem(parameter.variableName, parameterVariable, true);
parameterVariable.AddItem(value);
_.memory.Free(value);
parametersArray.SetItem(parameter.variableName, parameterVariable);
_.memory.Free(parameterVariable);
}
// Assumes `commandParser` is not `none`.
@ -815,7 +818,7 @@ private final function bool AddOptionByCharacter(
// Assumes `commandParser` and `nextResult` are not `none`.
private final function bool ParseOptionParameters(Command.Option pickedOption)
{
local AssociativeArray optionParameters;
local HashTable optionParameters;
// If we are already parsing other option's parameters and did not finish
// parsing all required ones - we cannot start another option
if (currentTargetIsOption && currentTarget != CPT_ExtraParameter)
@ -825,9 +828,7 @@ private final function bool ParseOptionParameters(Command.Option pickedOption)
}
if (pickedOption.required.length == 0 && pickedOption.optional.length == 0)
{
// Here `optionParameters == none`
nextResult.options
.SetItem(pickedOption.longName, optionParameters, true);
nextResult.options.SetItem(pickedOption.longName, none);
return true;
}
currentTargetIsOption = true;
@ -838,9 +839,11 @@ private final function bool ParseOptionParameters(Command.Option pickedOption)
if (commandParser.Ok())
{
nextResult.options
.SetItem(pickedOption.longName, optionParameters, true);
.SetItem(pickedOption.longName, optionParameters);
_.memory.Free(optionParameters);
return true;
}
_.memory.Free(optionParameters);
return false;
}

72
sources/Commands/Tests/TEST_Command.uc
Unescape View File

@ -194,8 +194,8 @@ protected static function SubTest_MockAQ1AndFailed()
{
local Parser parser;
local Command command;
local DynamicArray paramArray;
local AssociativeArray parameters;
local ArrayList paramArray;
local HashTable parameters;
parser = Parser(__().memory.Allocate(class'Parser'));
command = class'MockCommandA'.static.GetInstance();
Issue("Command queries that should fail succeed instead.");
@ -211,7 +211,7 @@ protected static function SubTest_MockAQ1AndFailed()
command.ParseInputWith(parser.InitializeS(default.queryASuccess1), none)
.Parameters;
TEST_ExpectTrue(parameters.GetLength() == 2);
paramArray = DynamicArray(parameters.GetItem(P("isItSimple?")));
paramArray = ArrayList(parameters.GetItem(P("isItSimple?")));
TEST_ExpectTrue(paramArray.GetLength() == 1);
TEST_ExpectFalse(BoolBox(paramArray.GetItem(0)).Get());
TEST_ExpectTrue(IntBox(parameters.GetItem(P("int"))).Get() == 8);
@ -221,27 +221,27 @@ protected static function SubTest_MockAQ1AndFailed()
protected static function SubTest_MockAQ2()
{
local DynamicArray paramArray, subArray;
local AssociativeArray result, subObject;
local ArrayList paramArray, subArray;
local HashTable result, subObject;
Issue("Cannot parse command queries without optional parameters.");
result = class'MockCommandA'.static.GetInstance()
.ParseInputWith(PRS(default.queryASuccess2), none).Parameters;
TEST_ExpectTrue(result.GetLength() == 2);
subObject = AssociativeArray(result.GetItem(P("just_obj")));
subObject = HashTable(result.GetItem(P("just_obj")));
TEST_ExpectTrue(IntBox(subObject.GetItem(P("var"))).Get() == 7);
TEST_ExpectTrue(subObject.HasKey(P("another")));
TEST_ExpectNone(subObject.GetItem(P("another")));
paramArray = DynamicArray(result.GetItem(P("manyLists")));
paramArray = ArrayList(result.GetItem(P("manyLists")));
TEST_ExpectTrue(paramArray.GetLength() == 4);
subArray = DynamicArray(paramArray.GetItem(0));
subArray = ArrayList(paramArray.GetItem(0));
TEST_ExpectTrue(subArray.GetLength() == 2);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 1);
TEST_ExpectTrue(IntBox(subArray.GetItem(1)).Get() == 2);
subArray = DynamicArray(paramArray.GetItem(1));
subArray = ArrayList(paramArray.GetItem(1));
TEST_ExpectTrue(subArray.GetLength() == 1);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 3);
TEST_ExpectTrue(DynamicArray(paramArray.GetItem(2)).GetLength() == 0);
subArray = DynamicArray(paramArray.GetItem(3));
TEST_ExpectTrue(ArrayList(paramArray.GetItem(2)).GetLength() == 0);
subArray = ArrayList(paramArray.GetItem(3));
TEST_ExpectTrue(subArray.GetLength() == 3);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 8);
TEST_ExpectTrue(IntBox(subArray.GetItem(1)).Get() == 5);
@ -251,13 +251,13 @@ protected static function SubTest_MockAQ2()
protected static function SubTest_MockAQ3()
{
local DynamicArray paramArray;
local AssociativeArray result;
local ArrayList paramArray;
local HashTable result;
Issue("Cannot parse command queries with optional parameters.");
result = class'MockCommandA'.static.GetInstance()
.ParseInputWith(PRS(default.queryASuccess3), none).Parameters;
// Booleans
paramArray = DynamicArray(result.GetItem(P("isItSimple?")));
paramArray = ArrayList(result.GetItem(P("isItSimple?")));
TEST_ExpectTrue(paramArray.GetLength() == 7);
TEST_ExpectTrue(BoolBox(paramArray.GetItem(0)).Get());
TEST_ExpectFalse(BoolBox(paramArray.GetItem(1)).Get());
@ -269,13 +269,13 @@ protected static function SubTest_MockAQ3()
// Integer
TEST_ExpectTrue(IntBox(result.GetItem(P("int"))).Get() == -32);
// Floats
paramArray = DynamicArray(result.GetItem(P("list")));
paramArray = ArrayList(result.GetItem(P("list")));
TEST_ExpectTrue(paramArray.GetLength() == 3);
TEST_ExpectTrue(FloatBox(paramArray.GetItem(0)).Get() == 0.45);
TEST_ExpectTrue(FloatBox(paramArray.GetItem(1)).Get() == 234.7);
TEST_ExpectTrue(FloatBox(paramArray.GetItem(2)).Get() == 13);
// `Text`s
paramArray = DynamicArray(result.GetItem(P("another list")));
paramArray = ArrayList(result.GetItem(P("another list")));
TEST_ExpectTrue(paramArray.GetLength() == 3);
TEST_ExpectTrue(Text(paramArray.GetItem(0)).ToString() == "dk");
TEST_ExpectTrue(Text(paramArray.GetItem(1)).ToString() == "someone");
@ -285,19 +285,19 @@ protected static function SubTest_MockAQ3()
protected static function SubTest_MockAQ4()
{
local DynamicArray paramArray;
local AssociativeArray result, subObject;
local ArrayList paramArray;
local HashTable result, subObject;
Issue("Cannot parse command queries with optional parameters.");
result = class'MockCommandA'.static.GetInstance()
.ParseInputWith(PRS(default.queryASuccess4), none).Parameters;
TEST_ExpectTrue(result.GetLength() == 3);
subObject = AssociativeArray(result.GetItem(P("just_obj")));
subObject = HashTable(result.GetItem(P("just_obj")));
TEST_ExpectTrue(IntBox(subObject.GetItem(P("var"))).Get() == 7);
TEST_ExpectTrue(subObject.HasKey(P("another")));
TEST_ExpectNone(subObject.GetItem(P("another")));
paramArray = DynamicArray(result.GetItem(P("manyLists")));
paramArray = ArrayList(result.GetItem(P("manyLists")));
TEST_ExpectTrue(paramArray.GetLength() == 4);
subObject = AssociativeArray(result.GetItem(P("last_obj")));
subObject = HashTable(result.GetItem(P("last_obj")));
TEST_ExpectTrue(subObject.GetLength() == 0);
}
@ -337,14 +337,14 @@ protected static function SubTest_MockBFailed()
protected static function SubTest_MockBQ1()
{
local Command.CallData result;
local DynamicArray subArray;
local AssociativeArray params, options, subObject;
local ArrayList subArray;
local HashTable params, options, subObject;
Issue("Cannot parse command queries with options.");
result = class'MockCommandB'.static.GetInstance()
.ParseInputWith(PRS(default.queryBSuccess1), none);
params = result.Parameters;
TEST_ExpectTrue(params.GetLength() == 2);
subArray = DynamicArray(params.GetItem(P("just_array")));
subArray = ArrayList(params.GetItem(P("just_array")));
TEST_ExpectTrue(subArray.GetLength() == 2);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 7);
TEST_ExpectNone(subArray.GetItem(1));
@ -352,9 +352,9 @@ protected static function SubTest_MockBQ1()
== "text");
options = result.options;
TEST_ExpectTrue(options.GetLength() == 1);
subObject = AssociativeArray(options.GetItem(P("values")));
subObject = HashTable(options.GetItem(P("values")));
TEST_ExpectTrue(subObject.GetLength() == 1);
subArray = DynamicArray(subObject.GetItem(P("types")));
subArray = ArrayList(subObject.GetItem(P("types")));
TEST_ExpectTrue(subArray.GetLength() == 5);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 1);
TEST_ExpectTrue(IntBox(subArray.GetItem(1)).Get() == 3);
@ -366,8 +366,8 @@ protected static function SubTest_MockBQ1()
protected static function SubTest_MockBQ2()
{
local Command.CallData result;
local DynamicArray subArray;
local AssociativeArray options, subObject;
local ArrayList subArray;
local HashTable options, subObject;
Issue("Cannot parse command queries with mixed-in options.");
result = class'MockCommandB'.static.GetInstance()
.ParseInputWith(PRS(default.queryBSuccess2), none);
@ -382,13 +382,13 @@ protected static function SubTest_MockBQ2()
TEST_ExpectNone(options.GetItem(P("verbose")));
TEST_ExpectTrue(options.HasKey(P("forced")));
TEST_ExpectNone(options.GetItem(P("forced")));
subObject = AssociativeArray(options.GetItem(P("type")));
subObject = HashTable(options.GetItem(P("type")));
TEST_ExpectTrue( Text(subObject.GetItem(P("type"))).ToString()
== "value");
subObject = AssociativeArray(options.GetItem(P("Test")));
subObject = HashTable(options.GetItem(P("Test")));
TEST_ExpectTrue(Text(subObject.GetItem(P("to_test"))).IsEmpty());
subObject = AssociativeArray(options.GetItem(P("values")));
subArray = DynamicArray(subObject.GetItem(P("types")));
subObject = HashTable(options.GetItem(P("values")));
subArray = ArrayList(subObject.GetItem(P("types")));
TEST_ExpectTrue(subArray.GetLength() == 1);
TEST_ExpectTrue(IntBox(subArray.GetItem(0)).Get() == 8);
}
@ -396,19 +396,19 @@ protected static function SubTest_MockBQ2()
protected static function SubTest_MockBQ3Remainder()
{
local Command.CallData result;
local DynamicArray subArray;
local AssociativeArray options, subObject;
local ArrayList subArray;
local HashTable options, subObject;
Issue("Cannot parse command queries with `CPT_Remainder` type parameters.");
result = class'MockCommandB'.static.GetInstance()
.ParseInputWith(PRS(default.queryBSuccess3), none);
TEST_ExpectTrue(result.parameters.GetLength() == 1);
subArray = DynamicArray(result.parameters.GetItem(P("list")));
subArray = ArrayList(result.parameters.GetItem(P("list")));
TEST_ExpectTrue(FloatBox(subArray.GetItem(0)).Get() == 3);
TEST_ExpectTrue(FloatBox(subArray.GetItem(1)).Get() == -76);
options = result.options;
TEST_ExpectTrue(options.GetLength() == 1);
TEST_ExpectTrue(options.HasKey(P("remainder")));
subObject = AssociativeArray(options.GetItem(P("remainder")));
subObject = HashTable(options.GetItem(P("remainder")));
TEST_ExpectTrue( Text(subObject.GetItem(P("everything"))).ToString()
== "--type \"value\" -va 8 -sV --forced -T \"\" 32");
}

4
sources/Commands/Tests/TEST_CommandDataBuilder.uc
Unescape View File

@ -91,7 +91,7 @@ protected static function Test_Empty()
@ "blank command data.");
builder =
CommandDataBuilder(__().memory.Allocate(class'CommandDataBuilder'));
data = builder.GetData();
data = builder.BorrowData();
TEST_ExpectTrue(data.subcommands.length == 1);
TEST_ExpectTrue(data.subcommands[0].name.IsEmpty());
TEST_ExpectNone(data.subcommands[0].description);
@ -104,7 +104,7 @@ protected static function Test_Empty()
protected static function Test_Full()
{
local Command.Data data;
data = PrepareBuilder().GetData();
data = PrepareBuilder().BorrowData();
Context("Testing that `CommandDataBuilder` properly builds command data for"
@ "complex commands.");
Issue("Incorrect amount of sub-commands and/or option.");

Write Preview
Loading…
Cancel
Save