diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java index 949ad8862..2c36c99ba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java @@ -107,8 +107,8 @@ public class MenuDaoJena extends JenaBaseDao implements MenuDao { protected boolean isActive(String url, String link){ - if( "/".equals(url) ) - return "/".equals(link); + if( "/".equals(link) ) + return "/".equals(url); else return url.startsWith(link); } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java index c398c2d7b..d515c3e86 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java @@ -88,4 +88,20 @@ public class MenuDaoJenaTest extends AbstractTestClass { Assert.assertEquals("Organizations",item.getLinkText()); Assert.assertEquals("bogusUrlContextPath/organizations",item.getUrl()); } + + + @Test + public void isActiveTest(){ + SimpleOntModelSelector sos = new SimpleOntModelSelector( ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM)); + sos.setDisplayModel(displayModel); + MenuDaoJena menuDaoJena = new MenuDaoJena(new WebappDaoFactoryJena(sos)); + + //First arg is the page the user is on. Second arg is the urlmapping of the menu item. + Assert.assertTrue( menuDaoJena.isActive("/", "/") ); + Assert.assertTrue( menuDaoJena.isActive("/people", "/people") ); + + Assert.assertFalse( menuDaoJena.isActive("/people", "/") ); + Assert.assertFalse( menuDaoJena.isActive("/", "/people") ); + + } }