From e6b4238019cae7f9be8f5f83e48d72e574ec2118 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 23 Sep 2011 18:51:38 +0000 Subject: [PATCH] NIHVIVO-336 Improve the function of StartupManager and StartupStatus --- .../webapp/startup/StartupManagerTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java index 025f9895a..e77420c00 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java @@ -120,6 +120,7 @@ public class StartupManagerTest extends AbstractTestClass { @Test public void listenerThrowsException() { + setLoggerLevel(StartupManager.class, Level.OFF); assertStartupFails(InitThrowsException.class); } @@ -138,16 +139,16 @@ public class StartupManagerTest extends AbstractTestClass { // Did they initialize in the correct order? List items = ss.getStatusItems(); assertEquals("how many", 2, items.size()); - assertEquals("init order 1", listener1Name, items.get(0).sourceName); - assertEquals("init order 2", listener2Name, items.get(1).sourceName); + assertEquals("init order 1", listener1Name, items.get(0).getSourceName()); + assertEquals("init order 2", listener2Name, items.get(1).getSourceName()); sm.contextDestroyed(sce); // Did they destroy in reverse order? items = ss.getStatusItems(); assertEquals("how many", 4, items.size()); - assertEquals("destroy order 1", listener2Name, items.get(2).sourceName); - assertEquals("destroy order 2", listener1Name, items.get(3).sourceName); + assertEquals("destroy order 1", listener2Name, items.get(2).getSourceName()); + assertEquals("destroy order 2", listener1Name, items.get(3).getSourceName()); } @Test @@ -159,11 +160,12 @@ public class StartupManagerTest extends AbstractTestClass { @Test public void dontExecuteAfterFailure() { + setLoggerLevel(StartupManager.class, Level.OFF); assertStartupFails(InitThrowsException.class, SucceedsWithInfo.class); for (StatusItem item : ss.getStatusItems()) { - if (item.sourceName.equals(SucceedsWithInfo.class.getName()) - && (item.level == StatusItem.Level.NOT_EXECUTED)) { + if (item.getSourceName().equals(SucceedsWithInfo.class.getName()) + && (item.getLevel() == StatusItem.Level.NOT_EXECUTED)) { return; } } @@ -315,8 +317,8 @@ public class StartupManagerTest extends AbstractTestClass { List items = ss.getStatusItems(); log.debug("-------------- " + items.size() + " items"); for (StatusItem item : items) { - log.debug(String.format("%8s %s \n %s \n %s", item.level, - item.sourceName, item.message, item.cause)); + log.debug(String.format("%8s %s \n %s \n %s", item.getLevel(), + item.getSourceName(), item.getMessage(), item.getCause())); } } }