Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java
===================================================================
diff -u -r6633f5d5c7844c27582a9b323fead87fac99dfd5 -rc3953b4508c44651200e35818132e5c215220384
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	(.../TestUserManagementService.java)	(revision 6633f5d5c7844c27582a9b323fead87fac99dfd5)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	(.../TestUserManagementService.java)	(revision c3953b4508c44651200e35818132e5c215220384)
@@ -23,20 +23,27 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.usermanagement;
 
-import java.io.IOException;
 import java.util.Date;
 
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.test.AbstractCommonTestCase;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * @author Manpreet Minhas
  */
 public class TestUserManagementService extends AbstractCommonTestCase {
 	
 	protected UserManagementService userManagementService;
+	protected static final String WORKSPACE_NAME = "Test Workspace";
+	protected static final Integer MMM_USER_ID = new Integer(4);
 	
 	private IBaseDAO baseDAO;
 	
@@ -49,6 +56,36 @@
 		userManagementService = (UserManagementService)context.getBean("userManagementService");
 	}
 
+	public void testCreateWorkspace(){
+		
+		Workspace workspace =  new Workspace(WORKSPACE_NAME);
+		userManagementService.save(workspace);
+		Integer workspaceId = workspace.getWorkspaceId();
+
+		// set up the root folder
+		WorkspaceFolder rootWorkspaceFolder = new WorkspaceFolder(workspace.getName(),workspace.getWorkspaceId(),
+				MMM_USER_ID, new Date(), new Date(), WorkspaceFolder.NORMAL);
+		userManagementService.save(rootWorkspaceFolder);
+		workspace.setRootFolder(rootWorkspaceFolder);
+		
+		// set up the default workspace folder, under the root folder
+		String sequenceFolderName = workspace.getName()+"_Sequences";
+		WorkspaceFolder defRunSequencesFolder = new WorkspaceFolder(sequenceFolderName,workspace.getWorkspaceId(),
+				MMM_USER_ID,new Date(), new Date(), WorkspaceFolder.RUN_SEQUENCES);
+		userManagementService.save(defRunSequencesFolder);
+		workspace.setDefaultRunSequencesFolder(defRunSequencesFolder);
+		userManagementService.save(workspace);
+
+		// is it all okay in the db? Not 100% test as this just checks what Hibernate has, not what the db has.
+		Workspace retrievedWorkspace = (Workspace) baseDAO.find(Workspace.class, workspaceId);
+		assertNotNull("Retrieved saved workspace id="+workspaceId, retrievedWorkspace);
+		assertEquals("Workspace name as expected "+WORKSPACE_NAME, WORKSPACE_NAME, retrievedWorkspace.getName());
+		assertNotNull("Root folder exists",retrievedWorkspace.getRootFolder());
+		assertEquals("Root folder has expected id "+rootWorkspaceFolder.getWorkspaceFolderId(), rootWorkspaceFolder.getWorkspaceFolderId(), retrievedWorkspace.getRootFolder().getWorkspaceFolderId());
+		assertNotNull("Default run sequences folder exists", retrievedWorkspace.getDefaultRunSequencesFolder());
+		assertEquals("Default run sequences folder has expected id "+defRunSequencesFolder.getWorkspaceFolderId(), defRunSequencesFolder.getWorkspaceFolderId(), retrievedWorkspace.getDefaultRunSequencesFolder().getWorkspaceFolderId());
+	}
+
 /*	public void testSaveOrganisation(){
 		Organisation organisation = new Organisation("Test Organisation",
 													 "Test Organisation Description",