Merge to trunk. Fixing tab flag 1 filtering when there is only one portal. NIHVIVO-987

This commit is contained in:
bdc34 2010-07-23 21:04:08 +00:00
parent ef3222d0d1
commit 5671656d5d
6 changed files with 24 additions and 14 deletions

View file

@ -59,7 +59,7 @@ public class FiltersForTabsTest {
tab.setPortalId(7);
UnaryFunctor<Individual,Boolean> testFn =
FiltersForTabs.getFilterForTab(tab, new Portal());
FiltersForTabs.getFilterForTab(tab, new Portal(), false);
Assert.assertTrue ( testFn!=null);
@ -75,7 +75,7 @@ public class FiltersForTabsTest {
Assert.assertTrue( testFn.fn( ind));
tab.setFlag2Mode("OMIT");
testFn = FiltersForTabs.getFilterForTab(tab, new Portal());
testFn = FiltersForTabs.getFilterForTab(tab, new Portal(), false);
Assert.assertFalse( testFn.fn(ind));