epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ConditionExpression => VariableExpression

Browse Source
This commit is contained in:
atlimit8
2017-04-11 01:26:38 -05:00
parent 1fa8286f1e
commit e73d3922dd
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Test/OpenRA.Game/ConditionExpressionTest.cs → OpenRA.Test/OpenRA.Game/VariableExpressionTest.cs
View File

@@ -19,7 +19,7 @@ using OpenRA.Support;
namespace OpenRA.Test
{
[TestFixture]
public class ConditionExpressionTest
public class VariableExpressionTest
{
IReadOnlyDictionary<string, int> testValues = new ReadOnlyDictionary<string, int>(new Dictionary<string, int>()
{
@@ -29,28 +29,28 @@ namespace OpenRA.Test
void AssertFalse(string expression)
{
Assert.False(new ConditionExpression(expression).Evaluate(testValues) > 0, expression);
Assert.False(new VariableExpression(expression).Evaluate(testValues) > 0, expression);
}
void AssertTrue(string expression)
{
Assert.True(new ConditionExpression(expression).Evaluate(testValues) > 0, expression);
Assert.True(new VariableExpression(expression).Evaluate(testValues) > 0, expression);
}
void AssertValue(string expression, int value)
{
Assert.AreEqual(value, new ConditionExpression(expression).Evaluate(testValues), expression);
Assert.AreEqual(value, new VariableExpression(expression).Evaluate(testValues), expression);
}
void AssertParseFailure(string expression)
{
Assert.Throws(typeof(InvalidDataException), () => new ConditionExpression(expression).Evaluate(testValues), expression);
Assert.Throws(typeof(InvalidDataException), () => new VariableExpression(expression).Evaluate(testValues), expression);
}
void AssertParseFailure(string expression, string errorMessage)
{
var actualErrorMessage = Assert.Throws(typeof(InvalidDataException),
() => new ConditionExpression(expression).Evaluate(testValues),
() => new VariableExpression(expression).Evaluate(testValues),
expression).Message;
Assert.AreEqual(errorMessage, actualErrorMessage, expression + " ===> " + actualErrorMessage);
}

2
OpenRA.Test/OpenRA.Test.csproj
View File

@@ -55,7 +55,7 @@
<Compile Include="OpenRA.Mods.Common\ShapeTest.cs" />
<Compile Include="OpenRA.Game\OrderTest.cs" />
<Compile Include="OpenRA.Game\PlatformTest.cs" />
<Compile Include="OpenRA.Game\ConditionExpressionTest.cs" />
<Compile Include="OpenRA.Game\VariableExpressionTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">