Skip to content

Commit 56cc7fe

Browse files
committed
follow convention
1 parent 586f092 commit 56cc7fe

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

tests/MiniSQL.Library.Tests/UnitTest1.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,64 +32,64 @@ private static void TestAtomValueOperators()
3232

3333
left.Type = AttributeTypes.Char;
3434
right.Type = AttributeTypes.Char;
35-
Assert.Equal(false, (left < right).BooleanValue);
36-
Assert.Equal(true, (left > right).BooleanValue);
37-
Assert.Equal(false, (left == right).BooleanValue);
38-
Assert.Equal(true, (left != right).BooleanValue);
39-
Assert.Equal(false, (left <= right).BooleanValue);
40-
Assert.Equal(true, (left >= right).BooleanValue);
35+
Assert.False((left < right).BooleanValue);
36+
Assert.True((left > right).BooleanValue);
37+
Assert.False((left == right).BooleanValue);
38+
Assert.True((left != right).BooleanValue);
39+
Assert.False((left <= right).BooleanValue);
40+
Assert.True((left >= right).BooleanValue);
4141
Assert.Equal("abedebabeceb", (left + right).StringValue);
4242

4343
left.Type = AttributeTypes.Int;
4444
right.Type = AttributeTypes.Int;
45-
Assert.Equal(true, (left < right).BooleanValue);
46-
Assert.Equal(false, (left > right).BooleanValue);
47-
Assert.Equal(false, (left == right).BooleanValue);
48-
Assert.Equal(true, (left != right).BooleanValue);
49-
Assert.Equal(true, (left <= right).BooleanValue);
50-
Assert.Equal(false, (left >= right).BooleanValue);
45+
Assert.True((left < right).BooleanValue);
46+
Assert.False((left > right).BooleanValue);
47+
Assert.False((left == right).BooleanValue);
48+
Assert.True((left != right).BooleanValue);
49+
Assert.True((left <= right).BooleanValue);
50+
Assert.False((left >= right).BooleanValue);
5151
Assert.Equal(628, (left + right).IntegerValue);
5252
Assert.Equal(-400, (left - right).IntegerValue);
5353
Assert.Equal(114 * 514, (left * right).IntegerValue);
5454
Assert.Equal(114 / 514, (left / right).IntegerValue);
5555

5656
left.Type = AttributeTypes.Float;
5757
right.Type = AttributeTypes.Float;
58-
Assert.Equal(false, (left < right).BooleanValue);
59-
Assert.Equal(false, (left > right).BooleanValue);
60-
Assert.Equal(true, (left == right).BooleanValue);
61-
Assert.Equal(false, (left != right).BooleanValue);
62-
Assert.Equal(true, (left <= right).BooleanValue);
63-
Assert.Equal(true, (left >= right).BooleanValue);
58+
Assert.False((left < right).BooleanValue);
59+
Assert.False((left > right).BooleanValue);
60+
Assert.True((left == right).BooleanValue);
61+
Assert.False((left != right).BooleanValue);
62+
Assert.True((left <= right).BooleanValue);
63+
Assert.True((left >= right).BooleanValue);
6464
Assert.Equal(28.28, (left + right).FloatValue);
65-
Assert.Equal(0.0,(left - right).FloatValue);
65+
Assert.Equal(0.0, (left - right).FloatValue);
6666
Assert.Equal(14.14 * 14.14, (left * right).FloatValue);
6767
Assert.Equal(1, (left / right).FloatValue);
6868
}
6969

7070
private static void TestExpression()
7171
{
72-
TestAndList();
72+
TestAndList();
7373
TestCalculateSingleValue();
7474
TestFullCalculate();
7575
}
7676

7777
private static void TestFullCalculate()
7878
{
7979
Expression exp = GetAndsExpression();
80-
80+
8181
List<AttributeValue> nameValuePairs = new List<AttributeValue>();
82-
nameValuePairs.Add(new AttributeValue("a", new AtomValue {Type = AttributeTypes.Int, IntegerValue = 33}));
83-
nameValuePairs.Add(new AttributeValue("b", new AtomValue {Type = AttributeTypes.Char, CharLimit = 5 , StringValue = "stc"}));
84-
nameValuePairs.Add(new AttributeValue("c", new AtomValue {Type = AttributeTypes.Float, FloatValue = 6.0}));
82+
nameValuePairs.Add(new AttributeValue("a", new AtomValue { Type = AttributeTypes.Int, IntegerValue = 33 }));
83+
nameValuePairs.Add(new AttributeValue("b", new AtomValue { Type = AttributeTypes.Char, CharLimit = 5, StringValue = "stc" }));
84+
nameValuePairs.Add(new AttributeValue("c", new AtomValue { Type = AttributeTypes.Float, FloatValue = 6.0 }));
8585

8686
AtomValue result = exp.Calculate(nameValuePairs);
87-
Assert.Equal(true, result.BooleanValue);
87+
Assert.True(result.BooleanValue);
8888

8989
nameValuePairs[1].Value.StringValue = "stz";
9090

9191
result = exp.Calculate(nameValuePairs);
92-
Assert.Equal(false, result.BooleanValue);
92+
Assert.False(result.BooleanValue);
9393
}
9494

9595
private static void TestCalculateSingleValue()
@@ -100,15 +100,15 @@ private static void TestCalculateSingleValue()
100100
attributeValue.Type = AttributeTypes.Char;
101101
attributeValue.CharLimit = 10;
102102
attributeValue.StringValue = "aaa";
103-
Assert.Equal(true, andsExpression.CheckKey(attributeName, attributeValue));
103+
Assert.True(andsExpression.CheckKey(attributeName, attributeValue));
104104
}
105105

106106
private static void TestAndList()
107107
{
108108
Expression andsExpression = GetAndsExpression();
109109
var andList = andsExpression.Ands;
110110
// "not equal" operator is ignored
111-
Assert.Equal(false, andList.ContainsKey("a"));
111+
Assert.False(andList.ContainsKey("a"));
112112
Assert.Equal(Operator.LessThanOrEqualTo, andList["b"].Operator);
113113
Assert.Equal("str", andList["b"].RightOperand.ConcreteValue.StringValue);
114114
Assert.Equal(Operator.LessThan, andList["c"].Operator);

0 commit comments

Comments
 (0)