litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-336 Improve the function of StartupManager and StartupStatus

Browse source
This commit is contained in:
j2blake 2011-09-23 18:51:38 +00:00
parent 0726b3280e
commit e6b4238019
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java
View file

@ -120,6 +120,7 @@ public class StartupManagerTest extends AbstractTestClass {
@Test @Test
public void listenerThrowsException() { public void listenerThrowsException() {
setLoggerLevel(StartupManager.class, Level.OFF);
assertStartupFails(InitThrowsException.class); assertStartupFails(InitThrowsException.class);
} }
@ -138,16 +139,16 @@ public class StartupManagerTest extends AbstractTestClass {
// Did they initialize in the correct order? // Did they initialize in the correct order?
List<StatusItem> items = ss.getStatusItems(); List<StatusItem> items = ss.getStatusItems();
assertEquals("how many", 2, items.size()); assertEquals("how many", 2, items.size());
assertEquals("init order 1", listener1Name, items.get(0).sourceName); assertEquals("init order 1", listener1Name, items.get(0).getSourceName());
assertEquals("init order 2", listener2Name, items.get(1).sourceName); assertEquals("init order 2", listener2Name, items.get(1).getSourceName());
sm.contextDestroyed(sce); sm.contextDestroyed(sce);
// Did they destroy in reverse order? // Did they destroy in reverse order?
items = ss.getStatusItems(); items = ss.getStatusItems();
assertEquals("how many", 4, items.size()); assertEquals("how many", 4, items.size());
assertEquals("destroy order 1", listener2Name, items.get(2).sourceName); assertEquals("destroy order 1", listener2Name, items.get(2).getSourceName());
assertEquals("destroy order 2", listener1Name, items.get(3).sourceName); assertEquals("destroy order 2", listener1Name, items.get(3).getSourceName());
} }
@Test @Test
@ -159,11 +160,12 @@ public class StartupManagerTest extends AbstractTestClass {
@Test @Test
public void dontExecuteAfterFailure() { public void dontExecuteAfterFailure() {
setLoggerLevel(StartupManager.class, Level.OFF);
assertStartupFails(InitThrowsException.class, SucceedsWithInfo.class); assertStartupFails(InitThrowsException.class, SucceedsWithInfo.class);
for (StatusItem item : ss.getStatusItems()) { for (StatusItem item : ss.getStatusItems()) {
if (item.sourceName.equals(SucceedsWithInfo.class.getName()) if (item.getSourceName().equals(SucceedsWithInfo.class.getName())
&& (item.level == StatusItem.Level.NOT_EXECUTED)) { && (item.getLevel() == StatusItem.Level.NOT_EXECUTED)) {
return; return;
} }
} }
@ -315,8 +317,8 @@ public class StartupManagerTest extends AbstractTestClass {
List<StatusItem> items = ss.getStatusItems(); List<StatusItem> items = ss.getStatusItems();
log.debug("-------------- " + items.size() + " items"); log.debug("-------------- " + items.size() + " items");
for (StatusItem item : items) { for (StatusItem item : items) {
log.debug(String.format("%8s %s \n %s \n %s", item.level, log.debug(String.format("%8s %s \n %s \n %s", item.getLevel(),
item.sourceName, item.message, item.cause)); item.getSourceName(), item.getMessage(), item.getCause()));
} }
} }
} }