Skip to content

Commit a855338

Browse files
pengnampengnam
authored
Merge branch 'master' into add-new-system-tests-for-next-and-call
2 parents 036e7c1 + 1612aac commit a855338

25 files changed

+2401
-253
lines changed

‎Team20/Code20/SPA/SPA.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<ItemGroup>
14+
<ClCompile Include="..\source\AffectsBipDispatcher.cpp" />
15+
<ClCompile Include="..\source\AffectsBipStarDispatcher.cpp" />
1416
<ClCompile Include="..\source\AffectsDispatcher.cpp" />
1517
<ClCompile Include="..\source\AffectsStarDispatcher.cpp" />
1618
<ClCompile Include="..\source\CallsDispatcher.cpp" />
1719
<ClCompile Include="..\source\CallsStarDispatcher.cpp" />
1820
<ClCompile Include="..\source\ClauseDispatcher.cpp" />
1921
<ClCompile Include="..\source\DispatcherGraph.cpp" />
22+
<ClCompile Include="..\source\NextBipDispatcher.cpp" />
23+
<ClCompile Include="..\source\NextBipStarDispatcher.cpp" />
2024
<ClCompile Include="..\source\NextDispatcher.cpp" />
2125
<ClCompile Include="..\source\NextStarDispatcher.cpp" />
2226
<ClCompile Include="..\source\Pql.cpp" />

‎Team20/Code20/SPA/SPA.vcxproj.filters

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@
159159
<ClCompile Include="..\source\SimpleSubParser.cpp">
160160
<Filter>Source Files\FrontEnd</Filter>
161161
</ClCompile>
162+
<ClCompile Include="..\source\AffectsBipStarDispatcher.cpp">
163+
<Filter>Source Files\PQL\Dispatchers</Filter>
164+
</ClCompile>
165+
<ClCompile Include="..\source\AffectsBipDispatcher.cpp">
166+
<Filter>Source Files\PQL\Dispatchers</Filter>
167+
</ClCompile>
168+
<ClCompile Include="..\source\NextBipDispatcher.cpp">
169+
<Filter>Source Files\PQL\Dispatchers</Filter>
170+
</ClCompile>
171+
<ClCompile Include="..\source\NextBipStarDispatcher.cpp">
172+
<Filter>Source Files\PQL\Dispatchers</Filter>
173+
</ClCompile>
162174
</ItemGroup>
163175
<ItemGroup>
164176
<ClInclude Include="..\source\TNode.h">

‎Team20/Code20/UnitTesting/TestPkbCalls.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ TEST_CLASS(TestCallsQuery) {
7474

7575
TEST_METHOD(CallsProcedureAndProcedure) {
7676
Assert::IsTrue(
77-
pkb.getQueryInterface()->calls(setUpTests.procedure,
78-
setUpTests.procedure) ==
79-
NAME_NAME_PAIRS(
77+
convertToOrderedList(pkb.getQueryInterface()->calls(
78+
setUpTests.procedure, setUpTests.procedure)) ==
79+
convertToOrderedList(NAME_NAME_PAIRS(
8080
NAME_VECTOR{"main", "main", "complicate", "extratwo", "extratwo",
8181
"extrathree", "extrathree", "extrafour", "extrafour"},
8282
NAME_VECTOR{"aux", "complicate", "extra", "extra", "aux", "main",
83-
"extratwo", "extrathree", "main"}));
83+
"extratwo", "extrathree", "main"})));
8484
} // namespace UnitTesting
8585

8686
TEST_METHOD(CallsProcedureAndUnderscore) {
@@ -174,17 +174,17 @@ TEST_CLASS(TestCallsQuery) {
174174

175175
TEST_METHOD(CallsStarProcedureAndProcedure) {
176176
Assert::IsTrue(
177-
pkb.getQueryInterface()->callsStar(setUpTests.procedure,
178-
setUpTests.procedure) ==
179-
NAME_NAME_PAIRS(
177+
convertToOrderedList(pkb.getQueryInterface()->callsStar(
178+
setUpTests.procedure, setUpTests.procedure)) ==
179+
convertToOrderedList(NAME_NAME_PAIRS(
180180
NAME_VECTOR{"main", "main", "main", "complicate", "extratwo",
181181
"extratwo", "extrathree", "extrathree", "extrathree",
182182
"extrathree", "extrathree", "extrafour", "extrafour",
183183
"extrafour", "extrafour", "extrafour", "extrafour"},
184184
NAME_VECTOR{"aux", "extra", "complicate", "extra", "extra", "aux",
185185
"main", "extratwo", "extra", "aux", "complicate",
186186
"extrathree", "main", "extratwo", "aux", "extra",
187-
"complicate"}));
187+
"complicate"})));
188188
} // namespace UnitTesting
189189

190190
TEST_METHOD(CallsStarProcedureAndUnderscore) {

‎Team20/Code20/UnitTesting/TestPkbModifies.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ TEST_CLASS(TestModifiesQuery) {
7777
TEST_METHOD(ModifiesStmtAndVariable) {
7878

7979
Assert::IsTrue(
80-
pkb.getQueryInterface()->modifies(setUpTests.stmt,
81-
setUpTests.variable) ==
82-
LINE_NAME_PAIRS{
80+
convertToOrderedList(pkb.getQueryInterface()->modifies(
81+
setUpTests.stmt, setUpTests.variable)) ==
82+
convertToOrderedList(LINE_NAME_PAIRS{
8383
LINE_VECTOR{
8484
setUpTests.l9, setUpTests.l1, setUpTests.l2, setUpTests.l3,
8585
setUpTests.l4, setUpTests.l5, setUpTests.l7, setUpTests.l7,
@@ -99,7 +99,7 @@ TEST_CLASS(TestModifiesQuery) {
9999
"t", "q", "t", "q", "t", "q", "t", "t", "t", "t", "q",
100100
"q", "q", "q", "y", "x", "x", "r", "m", "y", "q", "t",
101101
"y", "x", "y", "q", "x", "r", "m", "t", "x", "r", "m",
102-
"y", "q", "t", "y", "q", "x", "r", "m", "t"}});
102+
"y", "q", "t", "y", "q", "x", "r", "m", "t"}}));
103103

104104
} // namespace UnitTesting
105105

@@ -134,11 +134,12 @@ TEST_CLASS(TestModifiesQuery) {
134134
TEST_METHOD(ModifiesStatementAndVariable) {
135135

136136
Assert::IsTrue(
137-
pkb.getQueryInterface()->modifies(setUpTests.a, setUpTests.variable) ==
138-
LINE_NAME_PAIRS(LINE_VECTOR{setUpTests.l4, setUpTests.l20,
139-
setUpTests.l10, setUpTests.l18,
140-
setUpTests.l16, setUpTests.l24},
141-
NAME_VECTOR{"y", "q", "m", "t", "t", "q"}));
137+
convertToOrderedList(pkb.getQueryInterface()->modifies(
138+
setUpTests.a, setUpTests.variable)) ==
139+
convertToOrderedList(LINE_NAME_PAIRS(
140+
LINE_VECTOR{setUpTests.l4, setUpTests.l20, setUpTests.l10,
141+
setUpTests.l18, setUpTests.l16, setUpTests.l24},
142+
NAME_VECTOR{"y", "q", "m", "t", "t", "q"})));
142143
} // namespace UnitTesting
143144

144145
TEST_METHOD(ModifiesStatementAndUnderscore) {
@@ -210,9 +211,9 @@ TEST_CLASS(TestModifiesQuery) {
210211
TEST_METHOD(ModifiesProcedureAndVariable) {
211212

212213
Assert::IsTrue(
213-
pkb.getQueryInterface()->modifies(setUpTests.procedure,
214-
setUpTests.variable) ==
215-
NAME_NAME_PAIRS(
214+
convertToOrderedList(pkb.getQueryInterface()->modifies(
215+
setUpTests.procedure, setUpTests.variable)) ==
216+
convertToOrderedList(NAME_NAME_PAIRS(
216217
NAME_VECTOR{"extrafour", "extrafour", "extrafour", "extrafour",
217218
"extrafour", "extrafour", "aux", "aux",
218219
"main", "main", "main", "main",
@@ -221,7 +222,7 @@ TEST_CLASS(TestModifiesQuery) {
221222
"extrathree", "extrathree", "extrathree", "extrathree"},
222223
NAME_VECTOR{"y", "q", "x", "r", "m", "t", "y", "x",
223224
"x", "r", "m", "y", "q", "t", "q", "t",
224-
"y", "x", "y", "q", "x", "r", "m", "t"}));
225+
"y", "x", "y", "q", "x", "r", "m", "t"})));
225226
} // namespace UnitTesting
226227

227228
TEST_METHOD(ModifiesProcedureAndUnderscore) {

‎Team20/Code20/UnitTesting/TestPkbParent.cpp

Lines changed: 83 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -144,33 +144,34 @@ TEST_CLASS(TestParentQuery) {
144144

145145
TEST_METHOD(ParentStatementAndStatement) {
146146

147-
Assert::IsTrue(
148-
pkb.getQueryInterface()->parent(setUpTests.i, setUpTests.a) ==
149-
LINE_LINE_PAIRS(LINE_VECTOR{setUpTests.l19, setUpTests.l15},
150-
LINE_VECTOR{setUpTests.l20, setUpTests.l16}));
147+
Assert::IsTrue(convertToOrderedList(pkb.getQueryInterface()->parent(
148+
setUpTests.i, setUpTests.a)) ==
149+
convertToOrderedList(LINE_LINE_PAIRS(
150+
LINE_VECTOR{setUpTests.l19, setUpTests.l15},
151+
LINE_VECTOR{setUpTests.l20, setUpTests.l16})));
151152
} // namespace UnitTesting
152153

153154
TEST_METHOD(ParentStatementAndStmt) {
154155

155-
Assert::IsTrue(
156-
pkb.getQueryInterface()->parent(setUpTests.i, setUpTests.stmt) ==
157-
LINE_LINE_PAIRS(
158-
LINE_VECTOR{
159-
setUpTests.l19,
160-
setUpTests.l19,
161-
setUpTests.l15,
162-
setUpTests.l15,
163-
setUpTests.l15,
164-
setUpTests.l15,
165-
},
166-
LINE_VECTOR{
167-
setUpTests.l20,
168-
setUpTests.l21,
169-
setUpTests.l16,
170-
setUpTests.l17,
171-
setUpTests.l19,
172-
setUpTests.l22,
173-
}));
156+
Assert::IsTrue(convertToOrderedList(pkb.getQueryInterface()->parent(
157+
setUpTests.i, setUpTests.stmt)) ==
158+
convertToOrderedList(LINE_LINE_PAIRS(
159+
LINE_VECTOR{
160+
setUpTests.l19,
161+
setUpTests.l19,
162+
setUpTests.l15,
163+
setUpTests.l15,
164+
setUpTests.l15,
165+
setUpTests.l15,
166+
},
167+
LINE_VECTOR{
168+
setUpTests.l20,
169+
setUpTests.l21,
170+
setUpTests.l16,
171+
setUpTests.l17,
172+
setUpTests.l19,
173+
setUpTests.l22,
174+
})));
174175
} // namespace UnitTesting
175176

176177
TEST_METHOD(ParentStatementAndUnderscore) {
@@ -203,47 +204,48 @@ TEST_CLASS(TestParentQuery) {
203204
TEST_METHOD(ParentStmtAndStatement) {
204205

205206
Assert::IsTrue(
206-
pkb.getQueryInterface()->parent(setUpTests.stmt, setUpTests.a) ==
207-
LINE_LINE_PAIRS(
207+
convertToOrderedList(
208+
pkb.getQueryInterface()->parent(setUpTests.stmt, setUpTests.a)) ==
209+
convertToOrderedList(LINE_LINE_PAIRS(
208210
LINE_VECTOR{setUpTests.l3, setUpTests.l19, setUpTests.l17,
209211
setUpTests.l15, setUpTests.l23},
210212
LINE_VECTOR{setUpTests.l4, setUpTests.l20, setUpTests.l18,
211-
setUpTests.l16, setUpTests.l24}));
213+
setUpTests.l16, setUpTests.l24})));
212214
} // namespace UnitTesting
213215

214216
TEST_METHOD(ParentStmtAndStmt) {
215217

216-
Assert::IsTrue(
217-
pkb.getQueryInterface()->parent(setUpTests.stmt, setUpTests.stmt) ==
218-
LINE_LINE_PAIRS(
219-
LINE_VECTOR{
220-
setUpTests.l3,
221-
setUpTests.l3,
222-
setUpTests.l19,
223-
setUpTests.l19,
224-
setUpTests.l14,
225-
setUpTests.l14,
226-
setUpTests.l15,
227-
setUpTests.l15,
228-
setUpTests.l15,
229-
setUpTests.l15,
230-
setUpTests.l23,
231-
setUpTests.l17,
232-
},
233-
LINE_VECTOR{
234-
setUpTests.l4,
235-
setUpTests.l5,
236-
setUpTests.l20,
237-
setUpTests.l21,
238-
setUpTests.l15,
239-
setUpTests.l23,
240-
setUpTests.l16,
241-
setUpTests.l17,
242-
setUpTests.l19,
243-
setUpTests.l22,
244-
setUpTests.l24,
245-
setUpTests.l18,
246-
}));
218+
Assert::IsTrue(convertToOrderedList(pkb.getQueryInterface()->parent(
219+
setUpTests.stmt, setUpTests.stmt)) ==
220+
convertToOrderedList(LINE_LINE_PAIRS(
221+
LINE_VECTOR{
222+
setUpTests.l3,
223+
setUpTests.l3,
224+
setUpTests.l19,
225+
setUpTests.l19,
226+
setUpTests.l14,
227+
setUpTests.l14,
228+
setUpTests.l15,
229+
setUpTests.l15,
230+
setUpTests.l15,
231+
setUpTests.l15,
232+
setUpTests.l23,
233+
setUpTests.l17,
234+
},
235+
LINE_VECTOR{
236+
setUpTests.l4,
237+
setUpTests.l5,
238+
setUpTests.l20,
239+
setUpTests.l21,
240+
setUpTests.l15,
241+
setUpTests.l23,
242+
setUpTests.l16,
243+
setUpTests.l17,
244+
setUpTests.l19,
245+
setUpTests.l22,
246+
setUpTests.l24,
247+
setUpTests.l18,
248+
})));
247249
} // namespace UnitTesting
248250

249251
TEST_METHOD(ParentStmtAndUnderscore) {
@@ -428,33 +430,36 @@ TEST_CLASS(TestParentQuery) {
428430
} // namespace UnitTesting
429431

430432
TEST_METHOD(ParentStarStatementAndStatement) {
431-
Assert::IsTrue(
432-
pkb.getQueryInterface()->parentStar(setUpTests.i, setUpTests.a) ==
433-
LINE_LINE_PAIRS(LINE_VECTOR{setUpTests.l19, setUpTests.l15,
434-
setUpTests.l15, setUpTests.l15},
435-
LINE_VECTOR{setUpTests.l20, setUpTests.l20,
436-
setUpTests.l18, setUpTests.l16}));
437-
Assert::IsTrue(
438-
pkb.getQueryInterface()->parentStar(setUpTests.w, setUpTests.a) ==
439-
LINE_LINE_PAIRS(
433+
Assert::IsTrue(convertToOrderedList(pkb.getQueryInterface()->parentStar(
434+
setUpTests.i, setUpTests.a)) ==
435+
convertToOrderedList(LINE_LINE_PAIRS(
436+
LINE_VECTOR{setUpTests.l19, setUpTests.l15,
437+
setUpTests.l15, setUpTests.l15},
438+
LINE_VECTOR{setUpTests.l20, setUpTests.l20,
439+
setUpTests.l18, setUpTests.l16})));
440+
Assert::IsTrue(
441+
convertToOrderedList(
442+
pkb.getQueryInterface()->parentStar(setUpTests.w, setUpTests.a)) ==
443+
convertToOrderedList(LINE_LINE_PAIRS(
440444
LINE_VECTOR{setUpTests.l3, setUpTests.l14, setUpTests.l17,
441445
setUpTests.l14, setUpTests.l14, setUpTests.l23,
442446
setUpTests.l14},
443447
LINE_VECTOR{setUpTests.l4, setUpTests.l20, setUpTests.l18,
444448
setUpTests.l18, setUpTests.l16, setUpTests.l24,
445-
setUpTests.l24}));
449+
setUpTests.l24})));
446450
} // namespace UnitTesting
447451

448452
TEST_METHOD(ParentStarStatementAndStmt) {
449453
Assert::IsTrue(
450-
pkb.getQueryInterface()->parentStar(setUpTests.i, setUpTests.stmt) ==
451-
LINE_LINE_PAIRS(
454+
convertToOrderedList(pkb.getQueryInterface()->parentStar(
455+
setUpTests.i, setUpTests.stmt)) ==
456+
convertToOrderedList(LINE_LINE_PAIRS(
452457
LINE_VECTOR{setUpTests.l15, setUpTests.l15, setUpTests.l15,
453458
setUpTests.l15, setUpTests.l15, setUpTests.l15,
454459
setUpTests.l15, setUpTests.l19, setUpTests.l19},
455460
LINE_VECTOR{setUpTests.l16, setUpTests.l17, setUpTests.l19,
456461
setUpTests.l22, setUpTests.l18, setUpTests.l20,
457-
setUpTests.l21, setUpTests.l20, setUpTests.l21}));
462+
setUpTests.l21, setUpTests.l20, setUpTests.l21})));
458463
} // namespace UnitTesting
459464

460465
TEST_METHOD(ParentStarStatementAndUnderscore) {
@@ -489,8 +494,9 @@ TEST_CLASS(TestParentQuery) {
489494

490495
TEST_METHOD(ParentStarStmtAndStatement) {
491496
Assert::IsTrue(
492-
pkb.getQueryInterface()->parentStar(setUpTests.stmt, setUpTests.a) ==
493-
LINE_LINE_PAIRS(
497+
convertToOrderedList(pkb.getQueryInterface()->parentStar(
498+
setUpTests.stmt, setUpTests.a)) ==
499+
convertToOrderedList(LINE_LINE_PAIRS(
494500
LINE_VECTOR{setUpTests.l3, setUpTests.l19, setUpTests.l15,
495501
setUpTests.l14, setUpTests.l17, setUpTests.l15,
496502
setUpTests.l14, setUpTests.l15, setUpTests.l14,
@@ -507,13 +513,14 @@ TEST_CLASS(TestParentQuery) {
507513
setUpTests.l16,
508514
setUpTests.l24,
509515
setUpTests.l24,
510-
}));
516+
})));
511517
} // namespace UnitTesting
512518

513519
TEST_METHOD(ParentStarStmtAndStmt) {
514520
Assert::IsTrue(
515-
pkb.getQueryInterface()->parentStar(setUpTests.stmt, setUpTests.stmt) ==
516-
LINE_LINE_PAIRS(
521+
convertToOrderedList(pkb.getQueryInterface()->parentStar(
522+
setUpTests.stmt, setUpTests.stmt)) ==
523+
convertToOrderedList(LINE_LINE_PAIRS(
517524
LINE_VECTOR{
518525
setUpTests.l19, setUpTests.l19, setUpTests.l3, setUpTests.l3,
519526
setUpTests.l14, setUpTests.l14, setUpTests.l14, setUpTests.l14,
@@ -529,7 +536,7 @@ TEST_CLASS(TestParentQuery) {
529536
setUpTests.l21, setUpTests.l24, setUpTests.l24, setUpTests.l16,
530537
setUpTests.l17, setUpTests.l19, setUpTests.l22, setUpTests.l18,
531538
setUpTests.l20, setUpTests.l21, setUpTests.l18,
532-
}));
539+
})));
533540
} // namespace UnitTesting
534541

535542
TEST_METHOD(ParentStarStmtAndUnderscore) {

0 commit comments

Comments
 (0)