Fixed failing tests

n2cms · May 4, 2012 · d83da9d · d83da9d
1 parent b56a752
commit d83da9d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Framework/Management.Tests/FileSystem/VirtualFolderInitializerTests.cs b/src/Framework/Management.Tests/FileSystem/VirtualFolderInitializerTests.cs
@@ -30,6 +30,7 @@ public class VirtualFolderInitializerTests : ItemPersistenceMockingBase
 		ContentItem root;
 		ContentItem start;
 		FolderNodeProvider nodeProvider;
+		private Plugin.ConnectionMonitor monitor;
 
 		[SetUp]
 		public override void SetUp()
@@ -52,7 +53,7 @@ public override void SetUp()
 			var sizeCache = new ImageSizeCache(new ConfigurationManagerWrapper { Sections = new ConfigurationManagerWrapper.ContentSectionTable(null, null, null, config) });
 			injector.injectors.Add(new EntityDependencySetter<ImageSizeCache>(sizeCache));
 			nodeProvider = new FolderNodeProvider(fs, persister, injector);
-			initializer = new VirtualFolderInitializer(host, persister, fs, vnf, new Plugin.ConnectionMonitor().SetConnected(SystemStatusLevel.UpAndRunning), new UploadFolderSource(host, config), nodeProvider);
+			initializer = new VirtualFolderInitializer(host, persister, fs, vnf, monitor = new Plugin.ConnectionMonitor().SetConnected(SystemStatusLevel.UpAndRunning), new UploadFolderSource(host, config), nodeProvider);
 		}
 
 		class FakeStatus : DatabaseStatusCache
@@ -159,6 +160,8 @@ public void Get_UploadFolder2()
 		{
 			fs.CreateDirectory("/upload2/");
 			config.UploadFolders.Add("/upload2/");
+			initializer = new VirtualFolderInitializer(host, persister, fs, vnf, monitor, new UploadFolderSource(host, config), nodeProvider);
+
 			initializer.Start();
 			vnf.Register(nodeProvider);
 
@@ -173,6 +176,8 @@ public void GetChildren_Includes_UploadFolder2()
 		{
 			fs.CreateDirectory("/upload2/");
 			config.UploadFolders.Add("/upload2/");
+			initializer = new VirtualFolderInitializer(host, persister, fs, vnf, monitor, new UploadFolderSource(host, config), nodeProvider);
+
 			initializer.Start();
 			vnf.Register(nodeProvider);
 

diff --git a/src/Framework/N2/Edit/UploadFolderSource.cs b/src/Framework/N2/Edit/UploadFolderSource.cs
@@ -50,7 +50,7 @@ private static string FixPath(string path)
 
 		public static implicit operator FileSystemRoot(string path)
 		{
-			return new FileSystemRoot(path, new Site(0));
+			return new FileSystemRoot(path, null);
 		}
 
 		public int GetParentID()
@@ -90,9 +90,14 @@ public IEnumerable<FileSystemRoot> GetUploadFoldersForAllSites()
 			foreach (var folder in globalFolders)
 				yield return folder;
 			foreach (var folder in host.DefaultSite.UploadFolders)
-				yield return folder;
-			foreach (var folder in host.Sites.SelectMany(s => s.UploadFolders))
-				yield return folder;
+				yield return folder;
+			foreach (var folder in host.Sites.SelectMany(s => s.UploadFolders.Select(f => 
+			{
+				if (f.Site == null)
+					f.Site = s;
+				return f;
+			})))
+				yield return folder;
 		}
 
 		public virtual IEnumerable<FileSystemRoot> GetUploadFolders(Site site)

diff --git a/src/Framework/N2/Security/PermissionMap.cs b/src/Framework/N2/Security/PermissionMap.cs
@@ -43,9 +43,7 @@ public virtual bool MapsTo(Permission permission)
 
 		public virtual bool Authorizes(IPrincipal user, ContentItem item, Permission permission)
 		{
-			if (item == null) throw new ArgumentNullException("item");
-
-			if(permission == Permission.Read && !item.IsAuthorized(user))
+			if(item != null && permission == Permission.Read && !item.IsAuthorized(user))
 				return false;
 
 			return MapsTo(permission) && Contains(user);