ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LocationSolver: long explicit path test cases

Browse source 
...and here a bug was hiding. gotcha
This commit is contained in:
Fischlurch 2018-02-13 02:46:43 +01:00
parent 9fe314ad04
commit 92bf317d29
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/interact/ui-location-solver.hpp
View file

@ -233,7 +233,12 @@ namespace interact {
if (clause.createParents and clause.pattern.isExplicit())
// allow creation of a totally new path from scratch
// as long as it is complete and explicitly given
return clause.pattern;
{
if (depth == clause.pattern.size())
return clause.pattern.append (elementTypeID);
else
return clause.pattern;
}
}
//all clauses tried without success...
return UICoord();

18
tests/gui/interact/ui-location-solver-test.cpp
View file

@ -246,16 +246,34 @@ namespace test {
/* === query on deep path covered === */
LocationRule r51{UICoord("firstWindow","A","thePanel","theView","#5","down","the","kitchen")};
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/kitchen" == string{solver.solve (r51, UIC_PATH+2, "drain")});
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/kitchen/drain" == string{solver.solve (r51, UIC_PATH+3, "drain")});
/* === query on deep path covered with create clause === */
LocationRule r52{UICoord::firstWindow().append("A/thePanel/theView/#5/down/the/kitchen").create()};
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/kitchen" == string{solver.solve (r52, UIC_PATH+2, "drain")});
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/kitchen/drain" == string{solver.solve (r52, UIC_PATH+3, "drain")});
/* === query on deep path partially covered === */
LocationRule r53{UICoord::firstWindow().append("A/thePanel/theView/#5/down/the/drain")};
CHECK (isnil (solver.solve (r53, UIC_PATH+2, "drain")));
CHECK (isnil (solver.solve (r53, UIC_PATH+3, "drain")));
/* === query on deep path partially covered with create clause === */
LocationRule r54{UICoord::firstWindow().append("A/thePanel/theView/#5/down/the/drain").create()};
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/drain" == string{solver.solve (r54, UIC_PATH+2, "drain")});
CHECK ("UI:win[A]-thePanel.theView.#5/down/the/drain/drain" == string{solver.solve (r54, UIC_PATH+3, "drain")});
/* === query on deep path uncovered === */
LocationRule r55{UICoord("rearWindow","A","thePanel","theView","#5","down","the","kitchen")};
CHECK (isnil (solver.solve (r55, UIC_PATH+2, "floor")));
CHECK (isnil (solver.solve (r55, UIC_PATH+3, "floor")));
/* === query on deep path uncovered with create clause === */
LocationRule r56{UICoord("rearWindow","A","thePanel","theView","#5","down","the","kitchen").rebuild().create()};
CHECK ("UI:rearWindow[A]-thePanel.theView.#5/down/the/kitchen" == string{solver.solve (r56, UIC_PATH+2, "floor")});
CHECK ("UI:rearWindow[A]-thePanel.theView.#5/down/the/kitchen/floor" == string{solver.solve (r56, UIC_PATH+3, "floor")});
/* === clause with wildcard covered === */