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

Remove the requirement for a namespace ending in "/individual/" - print a warning, but go on.

Browse source
This commit is contained in:
jeb228 2010-07-29 16:28:07 +00:00
parent 34799b02ed
commit 677dfb18d0
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetupTest.java
View file

@ -17,6 +17,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -38,6 +39,7 @@ public class FileStorageSetupTest extends AbstractTestClass {
private static final String configProperties = "#mock config properties file\n"; private static final String configProperties = "#mock config properties file\n";
private static File tempDir; private static File tempDir;
private static File fsBaseDir;
private FileStorageSetup fss; private FileStorageSetup fss;
private ServletContextEvent sce; private ServletContextEvent sce;
@ -70,6 +72,17 @@ public class FileStorageSetupTest extends AbstractTestClass {
sce = new ServletContextEvent(sc); sce = new ServletContextEvent(sc);
} }
@Before
public void createBaseDirectory() {
fsBaseDir = new File(tempDir, "fsBaseDirectory");
fsBaseDir.mkdir();
}
@After
public void cleanupBaseDirectory() {
purgeDirectoryRecursively(fsBaseDir);
}
@AfterClass @AfterClass
public static void cleanup() { public static void cleanup() {
purgeDirectoryRecursively(tempDir); purgeDirectoryRecursively(tempDir);
@ -101,24 +114,29 @@ public class FileStorageSetupTest extends AbstractTestClass {
@Test @Test
public void defaultNamespaceNotSpecified() { public void defaultNamespaceNotSpecified() {
setLoggerLevel(FileStorageSetup.class, Level.OFF); setLoggerLevel(FileStorageSetup.class, Level.OFF);
setConfigurationProperties(tempDir.getPath(), null); setConfigurationProperties(fsBaseDir.getPath(), null);
fss.contextInitialized(sce); fss.contextInitialized(sce);
assertNull("no default namespace", assertNull("no default namespace",
sc.getAttribute(FileStorageSetup.ATTRIBUTE_NAME)); sc.getAttribute(FileStorageSetup.ATTRIBUTE_NAME));
} }
// This no longer throws an exception - it should be a success.
@Test @Test
public void defaultNamespaceIsBogus() throws IOException { public void defaultNamespaceIsBogus() throws IOException {
setLoggerLevel(FileStorageSetup.class, Level.OFF); setLoggerLevel(FileStorageSetup.class, Level.ERROR);
setConfigurationProperties(tempDir.getPath(), "namespace"); setConfigurationProperties(fsBaseDir.getPath(), "namespace");
fss.contextInitialized(sce); fss.contextInitialized(sce);
assertNull("default namespace is bogus",
sc.getAttribute(FileStorageSetup.ATTRIBUTE_NAME)); Object o = sc.getAttribute(FileStorageSetup.ATTRIBUTE_NAME);
FileStorage fs = (FileStorage) o;
assertEquals("implementation class", FileStorageImpl.class,
fs.getClass());
} }
@Test @Test
public void success() throws IOException { public void success() throws IOException {
setConfigurationProperties(tempDir.getPath(), setConfigurationProperties(fsBaseDir.getPath(),
"http://vivo.myDomain.edu/individual/"); "http://vivo.myDomain.edu/individual/");
fss.contextInitialized(sce); fss.contextInitialized(sce);