Skip to content

Commit 3db819c

Browse files
author
linzhijun
committed
fix 测试用例
1 parent 1479170 commit 3db819c

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

‎java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void Test() throws Exception {
4848
e = engine.TryEvaluate("pi", 0.0);
4949
assertEquals(Math.PI - e, 0.0, 0.01);
5050

51-
boolean b = engine.TryEvaluate("true", true);
51+
boolean b = engine.TryEvaluate("true", false);
5252
assertEquals(true, b);
53-
b = engine.TryEvaluate("false", false);
53+
b = engine.TryEvaluate("false", true);
5454
assertEquals(false, b);
5555

5656
int b1 = engine.TryEvaluate("if(true,1,2)", 0);
@@ -119,7 +119,7 @@ public void base_test() {
119119
boolean b = engine.TryEvaluate("1=1", false);
120120
assertEquals(true, b);
121121

122-
b = engine.TryEvaluate("1=2", false);
122+
b = engine.TryEvaluate("1=2", true);
123123
assertEquals(false, b);
124124

125125
b = engine.TryEvaluate("1<>2", false);
@@ -128,7 +128,7 @@ public void base_test() {
128128
b = engine.TryEvaluate("1!=2", false);
129129
assertEquals(true, b);
130130

131-
b = engine.TryEvaluate("1>2", false);
131+
b = engine.TryEvaluate("1>2", true);
132132
assertEquals(false, b);
133133

134134
b = engine.TryEvaluate("1<2", false);
@@ -137,7 +137,7 @@ public void base_test() {
137137
b = engine.TryEvaluate("1<=2", false);
138138
assertEquals(true, b);
139139

140-
b = engine.TryEvaluate("1>=2", false);
140+
b = engine.TryEvaluate("1>=2", true);
141141
assertEquals(false, b);
142142

143143
b = engine.TryEvaluate("'1'='1'", false);
@@ -146,7 +146,7 @@ public void base_test() {
146146
b = engine.TryEvaluate("'e'='e'", false);
147147
assertEquals(true, b);
148148

149-
b = engine.TryEvaluate("'1'='2'", false);
149+
b = engine.TryEvaluate("'1'='2'", true);
150150
assertEquals(false, b);
151151

152152
b = engine.TryEvaluate("'1'!='2'", false);

‎java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest_csharp.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void IsRegex_test()
103103
AlgorithmEngine engine = new AlgorithmEngine();
104104
boolean r = engine.TryEvaluate("IsRegex('abcd','a.*c')", false);
105105
assertEquals(r, true);
106-
r = engine.TryEvaluate("IsRegex('abcd','da.*c')", false);
106+
r = engine.TryEvaluate("IsRegex('abcd','da.*c')", true);
107107
assertEquals(r, false);
108108
}
109109

@@ -211,7 +211,7 @@ public void StartsWith()
211211
AlgorithmEngine engine = new AlgorithmEngine();
212212
boolean dt = engine.TryEvaluate("StartsWith('123456789','12')", false);
213213
assertEquals(dt, true);
214-
dt = engine.TryEvaluate("StartsWith('123456789','127')", false);
214+
dt = engine.TryEvaluate("StartsWith('123456789','127')", true);
215215
assertEquals(dt, false);
216216
}
217217
@Test
@@ -220,7 +220,7 @@ public void EndsWith()
220220
AlgorithmEngine engine = new AlgorithmEngine();
221221
boolean dt = engine.TryEvaluate("EndsWith('123456789','89')", false);
222222
assertEquals(dt, true);
223-
dt = engine.TryEvaluate("EndsWith('123456789','127')", false);
223+
dt = engine.TryEvaluate("EndsWith('123456789','127')", true);
224224
assertEquals(dt, false);
225225
}
226226

@@ -230,7 +230,7 @@ public void IsNullOrEmpty()
230230
AlgorithmEngine engine = new AlgorithmEngine();
231231
boolean dt = engine.TryEvaluate("IsNullOrEmpty('')", false);
232232
assertEquals(dt, true);
233-
dt = engine.TryEvaluate("IsNullOrEmpty(' ')", false);
233+
dt = engine.TryEvaluate("IsNullOrEmpty(' ')", true);
234234
assertEquals(dt, false);
235235
}
236236
@Test
@@ -241,7 +241,7 @@ public void IsNullOrWhiteSpace()
241241
assertEquals(dt, true);
242242
dt = engine.TryEvaluate("IsNullOrWhiteSpace(' ')", false);
243243
assertEquals(dt, true);
244-
dt = engine.TryEvaluate("IsNullOrWhiteSpace(' f ')", false);
244+
dt = engine.TryEvaluate("IsNullOrWhiteSpace(' f ')", true);
245245
assertEquals(dt, false);
246246
}
247247

‎java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest_flow.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ public void And_Test()
179179
t = engine.TryEvaluate("and(true(),1)", false);
180180
assertEquals(true, t);
181181

182-
t = engine.TryEvaluate("and(true(),false(),1=1)", false);
182+
t = engine.TryEvaluate("and(true(),false(),1=1)", true);
183183
assertEquals(false, t);
184-
t = engine.TryEvaluate("and(true(),false(),1)", false);
184+
t = engine.TryEvaluate("and(true(),false(),1)", true);
185185
assertEquals(false, t);
186186

187-
t = engine.TryEvaluate("and(true(),0)", false);
187+
t = engine.TryEvaluate("and(true(),0)", true);
188188
assertEquals(false, t);
189189
}
190190

@@ -205,15 +205,15 @@ public void Or_Test()
205205
t = engine.TryEvaluate("or(true(),0)", false);
206206
assertEquals(true, t);
207207

208-
t = engine.TryEvaluate("or(false(),1=2)", false);
208+
t = engine.TryEvaluate("or(false(),1=2)", true);
209209
assertEquals(false, t);
210210
}
211211

212212
@Test
213213
public void Not_Test()
214214
{
215215
AlgorithmEngine engine = new AlgorithmEngine();
216-
boolean t = engine.TryEvaluate("not(true())", false);
216+
boolean t = engine.TryEvaluate("not(true())", true);
217217
assertEquals(false, t);
218218
t = engine.TryEvaluate("not(false())", false);
219219
assertEquals(true, t);
@@ -231,7 +231,7 @@ public void true_Test()
231231
public void false_Test()
232232
{
233233
AlgorithmEngine engine = new AlgorithmEngine();
234-
boolean t = engine.TryEvaluate("false()", false);
234+
boolean t = engine.TryEvaluate("false()", true);
235235
assertEquals(false, t);
236236
}
237237

@@ -242,7 +242,7 @@ public void andor_Test()
242242
boolean t = engine.TryEvaluate("1=1 && 2==2 and 3=3", false);
243243
assertEquals(true, t);
244244

245-
t = engine.TryEvaluate("1=1 && 2!=2", false);
245+
t = engine.TryEvaluate("1=1 && 2!=2", true);
246246
assertEquals(false, t);
247247

248248
t = engine.TryEvaluate("1=1 && 2!=2", true);
@@ -255,7 +255,7 @@ public void andor_Test()
255255
t = engine.TryEvaluate("1=1 and 2==2", false);
256256
assertEquals(true, t);
257257

258-
t = engine.TryEvaluate("1=1 and 2!=2", false);
258+
t = engine.TryEvaluate("1=1 and 2!=2", true);
259259
assertEquals(false, t);
260260

261261
t = engine.TryEvaluate("1=1 and 2!=2", true);

‎java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest_string.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,12 @@ public void CONCATENATE_test()
5858
public void EXACT_test()
5959
{
6060
AlgorithmEngine engine = new AlgorithmEngine();
61-
boolean t = engine.TryEvaluate("EXACT('tt','33')", false);
62-
assertEquals(t, false);
63-
t = engine.TryEvaluate("EXACT('tt','tt')", true);
64-
assertEquals(t, true);
65-
t = engine.TryEvaluate("EXACT('tt','33')", true);
61+
boolean t = engine.TryEvaluate("EXACT('tt','33')", true);
6662
assertEquals(t, false);
6763
t = engine.TryEvaluate("EXACT('tt','tt')", false);
6864
assertEquals(t, true);
69-
t = engine.TryEvaluate("EXACT('33',33)", true);
70-
assertEquals(t, false);
65+
t = engine.TryEvaluate("EXACT('33',33)", false);
66+
assertEquals(t, true);
7167
t = engine.TryEvaluate("EXACT('331.1',331.1)", false);
7268
assertEquals(t, true);
7369
t = engine.TryEvaluate("EXACT('TRUE',TRUE())", false);

0 commit comments

Comments
 (0)