From d3bba71a13ef2d9b43bf02902d6e60a987efeae6 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Thu, 22 Jul 2010 19:26:50 +0000 Subject: [PATCH] NIHVIVO-927 Merge 5404 from the branch. --- .../webapp/filestorage/backend/FileStorageSetupTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetupTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetupTest.java index 431a7432e..83552f0ec 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetupTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetupTest.java @@ -16,6 +16,7 @@ import javax.naming.InitialContext; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; +import org.apache.log4j.Level; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -80,6 +81,7 @@ public class FileStorageSetupTest extends AbstractTestClass { @Test public void baseDirectoryNotSpecified() { + setLoggerLevel(FileStorageSetup.class, Level.OFF); setConfigurationProperties(null, "http://vivo.myDomain.edu/individual/"); fss.contextInitialized(sce); assertNull("no base directory", @@ -88,6 +90,7 @@ public class FileStorageSetupTest extends AbstractTestClass { @Test public void baseDirectoryDoesntExist() throws IOException { + setLoggerLevel(FileStorageSetup.class, Level.OFF); setConfigurationProperties("/bogus/Directory", "http://vivo.myDomain.edu/individual/"); fss.contextInitialized(sce); @@ -97,6 +100,7 @@ public class FileStorageSetupTest extends AbstractTestClass { @Test public void defaultNamespaceNotSpecified() { + setLoggerLevel(FileStorageSetup.class, Level.OFF); setConfigurationProperties(tempDir.getPath(), null); fss.contextInitialized(sce); assertNull("no default namespace", @@ -105,6 +109,7 @@ public class FileStorageSetupTest extends AbstractTestClass { @Test public void defaultNamespaceIsBogus() throws IOException { + setLoggerLevel(FileStorageSetup.class, Level.OFF); setConfigurationProperties(tempDir.getPath(), "namespace"); fss.contextInitialized(sce); assertNull("default namespace is bogus",