From 677dfb18d095fba551baf1a071748bdab49748d6 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 29 Jul 2010 16:28:07 +0000
Subject: [PATCH] Remove the requirement for a namespace ending in
 "/individual/" - print a warning, but go on.

---
 .../backend/FileStorageSetupTest.java         | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

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 83552f0ec..19b6e0a72 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
@@ -17,6 +17,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
 import org.apache.log4j.Level;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 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 File tempDir;
+	private static File fsBaseDir;
 
 	private FileStorageSetup fss;
 	private ServletContextEvent sce;
@@ -69,6 +71,17 @@ public class FileStorageSetupTest extends AbstractTestClass {
 		sc = new ServletContextStub();
 		sce = new ServletContextEvent(sc);
 	}
+	
+	@Before
+	public void createBaseDirectory() {
+		fsBaseDir = new File(tempDir, "fsBaseDirectory");
+		fsBaseDir.mkdir();
+	}
+	
+	@After
+	public void cleanupBaseDirectory() {
+		purgeDirectoryRecursively(fsBaseDir);
+	}
 
 	@AfterClass
 	public static void cleanup() {
@@ -101,24 +114,29 @@ public class FileStorageSetupTest extends AbstractTestClass {
 	@Test
 	public void defaultNamespaceNotSpecified() {
 		setLoggerLevel(FileStorageSetup.class, Level.OFF);
-		setConfigurationProperties(tempDir.getPath(), null);
+		setConfigurationProperties(fsBaseDir.getPath(), null);
 		fss.contextInitialized(sce);
 		assertNull("no default namespace",
 				sc.getAttribute(FileStorageSetup.ATTRIBUTE_NAME));
 	}
 
+	// This no longer throws an exception - it should be a success.
 	@Test
 	public void defaultNamespaceIsBogus() throws IOException {
-		setLoggerLevel(FileStorageSetup.class, Level.OFF);
-		setConfigurationProperties(tempDir.getPath(), "namespace");
+		setLoggerLevel(FileStorageSetup.class, Level.ERROR);
+		setConfigurationProperties(fsBaseDir.getPath(), "namespace");
 		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
 	public void success() throws IOException {
-		setConfigurationProperties(tempDir.getPath(),
+		setConfigurationProperties(fsBaseDir.getPath(),
 				"http://vivo.myDomain.edu/individual/");
 		fss.contextInitialized(sce);