Index: lams_common/db/sql/insert_test_data.sql =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -re8dae3d7178a12d09282f26c1c2257728f2fc65a --- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -1,14 +1,17 @@ SET FOREIGN_KEY_CHECKS=0; -insert into lams_workspace values(1,null,'Lams Workspace'); -insert into lams_workspace values(2,null,'Manpreet Minhas'); -insert into lams_workspace values(3,null,'Test Workspace'); +insert into lams_workspace values(1,null,'ROOT'); +insert into lams_workspace values(2,null,'MACQUIRE UNIVERSITY'); +insert into lams_workspace values(3,null,'MELCOE'); +insert into lams_workspace values(4,null,'LAMS'); +insert into lams_workspace values(5,null,'MAMS'); +insert into lams_workspace values(6,null,'Manpreet Minhas'); -INSERT INTO lams_organisation VALUES (1, 'Root', 'Root Organisation',null,1,NOW(),null); -INSERT INTO lams_organisation VALUES (2, 'Maquarie Uni', 'Macquarie University',1,2,NOW(),null); -INSERT INTO lams_organisation VALUES (3, 'MELCOE', 'Macquarie E-learning Center',2,3,NOW(),null); -INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),1); -INSERT INTO lams_organisation VALUES (5, 'MAMS', 'Mams Project Team',3,3,NOW(),null); +INSERT INTO lams_organisation VALUES (1, 'Root', 'Root Organisation',null,1,NOW(),1); +INSERT INTO lams_organisation VALUES (2, 'Maquarie Uni', 'Macquarie University',1,2,NOW(),2); +INSERT INTO lams_organisation VALUES (3, 'MELCOE', 'Macquarie E-learning Center',2,3,NOW(),3); +INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),4); +INSERT INTO lams_organisation VALUES (5, 'MAMS', 'Mams Project Team',3,3,NOW(),5); INSERT INTO lams_user_organisation VALUES (1, 1, 1); @@ -17,8 +20,14 @@ INSERT INTO lams_user_organisation VALUES (4, 4, 2); INSERT INTO lams_user_organisation VALUES (5, 2, 3); INSERT INTO lams_user_organisation VALUES (6, 3, 3); + INSERT INTO lams_user_organisation VALUES (7, 4, 4); +INSERT INTO lams_user_organisation VALUES (8, 2, 4); +INSERT INTO lams_user_organisation VALUES (9, 3, 4); +INSERT INTO lams_user_organisation VALUES (10,5, 4); + + INSERT INTO lams_user_organisation_role VALUES (1, 1, 1); INSERT INTO lams_user_organisation_role VALUES (2, 2, 2); INSERT INTO lams_user_organisation_role VALUES (3, 2, 3); @@ -33,7 +42,11 @@ INSERT INTO lams_user_organisation_role VALUES (12, 5, 4); INSERT INTO lams_user_organisation_role VALUES (13, 5, 5); INSERT INTO lams_user_organisation_role VALUES (14, 6, 3); + INSERT INTO lams_user_organisation_role VALUES (15, 7, 3); +INSERT INTO lams_user_organisation_role VALUES (16, 8, 3); +INSERT INTO lams_user_organisation_role VALUES (17, 9, 3); +INSERT INTO lams_user_organisation_role VALUES (18, 10,3); INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,1); INSERT INTO lams_user VALUES(2, 'test','test','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'khan@melcoe.mq.edu.au',0,NOW(),3,null,2); @@ -48,85 +61,54 @@ (4,'mminhas','mminhas','Ms','Manpreet','Minhas','170-22','Great Western Highway',null, 'Parramatta','NSW','Australia','029509061','0298938052','0405651097', '0209509062','mminhas@melcoe.mq.edu.au', -0,'20041223',1,2, +0,'20041223',1,6, 4); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(1,null,'Lams Workspace',1, -1,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(1,null,'ROOT',1,1,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(2,1,'Manpreet Minhas Workspace',2, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(2,1,'MACQUAIRE UNIVERSITY',2,1,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(3,2,'Manpreet Minhas Run Sequences Folder',2, -4,'20041223','20041223', -2); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(3,1,'MELCOE',3,1,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(4,2,'MMinhas1',2, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(4,1,'LAMS',4,1,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(5,2,'MMinhas2',2, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(5,1,'MAMS',5,1,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(6,5,'Monu1',2, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(6,4,'Manpreet Minhas Workspace',6,4,'20041223','20041223',1); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(7,5,'Monu2',2, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(7,6,'Manpreet Minhas Run Sequences Folder',6,4,'20041223','20041223',2); -insert into lams_workspace_folder -(workspace_folder_id,parent_folder_id,name,workspace_id, -user_id,create_date_time,last_modified_date_time, -lams_workspace_folder_type_id) - values -(8,1,'Test Workspace',3, -4,'20041223','20041223', -1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(8,6,'Documents',6,4,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(9,6,'Pictures',6,4,'20041223','20041223',1); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(10,6,'Media',6,4,'20041223','20041223',1); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(11,10,'Songs',6,4,'20041223','20041223',1); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(12,10,'Movies',6,4,'20041223','20041223',1); + + update lams_workspace set root_folder_id = 1 where workspace_id = 1; update lams_workspace set root_folder_id = 2 where workspace_id = 2; -update lams_workspace set root_folder_id = 8 where workspace_id = 3; +update lams_workspace set root_folder_id = 3 where workspace_id = 3; +update lams_workspace set root_folder_id = 4 where workspace_id = 4; +update lams_workspace set root_folder_id = 5 where workspace_id = 5; +update lams_workspace set root_folder_id = 6 where workspace_id = 6; + -- Populates the lams_learning_library table with default libraries insert into lams_learning_library (learning_library_id,description,title,create_date_time) values (1,'Notebook','Notebook','20050207'); @@ -923,6 +905,11 @@ INSERT INTO lams_cr_workspace_credential (wc_id, workspace_id, credential_id) VALUES (2, 2,1); INSERT INTO lams_cr_workspace_credential (wc_id, workspace_id, credential_id) VALUES (3, 3,2); +-- SubmitFiles Tool related information +INSERT INTO lams_cr_credential (credential_id, name, password) VALUES (3, 'SubmitFilesLogin','SubmitFilesPassword'); +INSERT INTO lams_cr_workspace (workspace_id, name) VALUES (4, 'SubmitFilesWorkspace'); +INSERT INTO lams_cr_workspace_credential (wc_id, workspace_id, credential_id) VALUES (4,4,3); + INSERT INTO lams_cr_node (node_id, workspace_id, type, created_date_time, path, next_version_id) VALUES (1, 1, 'DATANODE', 20050106103100, "/test",3); INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time) VALUES (1, 1, 1, 20050106103100); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -re8dae3d7178a12d09282f26c1c2257728f2fc65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -22,8 +22,27 @@ public static final String AUTHOR = "AUTHOR"; + public static final String TEACHER = "TEACHER"; + public static final String SYSADMIN = "SYSADMIN";//for future use + /** + * Added by Manpreet Minhas + * *********************** + * final static variables indicating the various + * roles available for a given user ar per the + * database. New roles may be added/deleted in the + * near future + * + ************************************************************/ + public static final Integer ROLE_SYSADMIN =new Integer(1); + public static final Integer ROLE_ADMIN =new Integer(2); + public static final Integer ROLE_AUTHOR =new Integer(3); + public static final Integer ROLE_STAFF =new Integer(4); + public static final Integer ROLE_LEARNER =new Integer(5); + public static final Integer ROLE_TEACHER =new Integer(6); + /***********************************************************/ + /** identifier field */ private Integer roleId; @@ -139,5 +158,14 @@ .append(getRoleId()) .toHashCode(); } + public boolean isAuthor(){ + return this.roleId.equals(ROLE_AUTHOR)?true:false; + } + public boolean isTeacher(){ + return this.roleId.equals(ROLE_TEACHER)?true:false; + } + public boolean isStaff(){ + return this.roleId.equals(ROLE_STAFF)?true:false ; + } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -re8dae3d7178a12d09282f26c1c2257728f2fc65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -32,6 +32,12 @@ this.organisation = organisation; this.userOrganisationRoles = userOrganisationRoles; } + + /**minimal constructor */ + public UserOrganisation(User user, Organisation organisation){ + this.user = user; + this.organisation = organisation; + } /** default constructor */ public UserOrganisation() { Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java =================================================================== diff -u -r79758294f0dfdfd6f805b9232fe3886b1a5b84ae -re8dae3d7178a12d09282f26c1c2257728f2fc65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java (.../WorkspaceFolderDAO.java) (revision 79758294f0dfdfd6f805b9232fe3886b1a5b84ae) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java (.../WorkspaceFolderDAO.java) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -33,7 +33,7 @@ return (WorkspaceFolder) super.find(WorkspaceFolder.class,workspaceFolderID); } public WorkspaceFolder getRunSequencesFolderForUser(Integer userID){ - String query = "from lams_workspace_folder wf where wf.user_id=? AND wf.lams_workspace_folder_type_id=2"; + String query = "from WorkspaceFolder wf where wf.userID=? AND wf.workspaceFolderType=2"; List list = this.getHibernateTemplate().find(query,userID); if(list.size()!=0) return (WorkspaceFolder)list.get(0); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserAccessFoldersDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserAccessFoldersDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserAccessFoldersDTO.java (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -0,0 +1,86 @@ +/* + * Created on Mar 24, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.usermanagement.dto; + +import java.util.Date; + +import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; + +/** + * @author Manpreet Minhas + */ +public class UserAccessFoldersDTO { + + private Integer workspaceFolderID; + private String name; + private Date createDateTime; + private Integer parentFolderID; + + + public UserAccessFoldersDTO(Integer workspaceFolderID, String name, + Date createDateTime, Integer parentFolderID) { + super(); + this.workspaceFolderID = workspaceFolderID; + this.name = name; + this.createDateTime = createDateTime; + this.parentFolderID = parentFolderID; + } + public UserAccessFoldersDTO(WorkspaceFolder folder){ + this.workspaceFolderID = folder.getWorkspaceFolderId(); + this.name = folder.getName(); + this.createDateTime = folder.getCreationDate(); + this.parentFolderID = folder.getParentWorkspaceFolder().getWorkspaceFolderId(); + } + /** + * @return Returns the createDateTime. + */ + public Date getCreateDateTime() { + return createDateTime; + } + /** + * @param createDateTime The createDateTime to set. + */ + public void setCreateDateTime(Date createDateTime) { + this.createDateTime = createDateTime; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } + /** + * @return Returns the parentFolderID. + */ + public Integer getParentFolderID() { + return parentFolderID; + } + /** + * @param parentFolderID The parentFolderID to set. + */ + public void setParentFolderID(Integer parentFolderID) { + this.parentFolderID = parentFolderID; + } + /** + * @return Returns the workspaceFolderID. + */ + public Integer getWorkspaceFolderID() { + return workspaceFolderID; + } + /** + * @param workspaceFolderID The workspaceFolderID to set. + */ + public void setWorkspaceFolderID(Integer workspaceFolderID) { + this.workspaceFolderID = workspaceFolderID; + } +} Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java =================================================================== diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -re8dae3d7178a12d09282f26c1c2257728f2fc65a --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -14,6 +14,7 @@ import org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO; import org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO; import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO; +import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; /** @@ -30,6 +31,7 @@ protected OrganisationTypeDAO organisationTypeDAO; protected UserManagementService userManagementService; protected AuthenticationMethodDAO authenticationMethodDAO; + protected UserOrganisationRoleDAO userOrganisationRoleDAO; public TestUserManagementService(String name){ super(name); @@ -41,10 +43,12 @@ organisationTypeDAO =(OrganisationTypeDAO)context.getBean("organisationTypeDAO"); userManagementService = (UserManagementService)context.getBean("userManagementService"); authenticationMethodDAO =(AuthenticationMethodDAO)context.getBean("authenticationMethodDAO"); - roleDAO = (RoleDAO)context.getBean("roleDAO"); + roleDAO = (RoleDAO)context.getBean("roleDAO"); + userOrganisationRoleDAO = (UserOrganisationRoleDAO)context.getBean("userOrganisationRoleDAO"); } - /* (non-Javadoc) + /** + * (non-Javadoc) * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */ protected String[] getContextConfigLocation() { @@ -59,16 +63,15 @@ Integer organisationID = userManagementService.saveOrganisation(organisation,new Integer(1)); assertNotNull(organisationID); } - public void saveUser(){ + public void testSaveUser(){ User user = new User(); user.setLogin("Monu"); user.setPassword("Monu"); user.setDisabledFlag(new Boolean(false)); user.setCreateDate(new Date()); user.setAuthenticationMethod(authenticationMethodDAO.getAuthenticationMethodById(new Integer(2))); user.setBaseOrganisation(organisationDAO.getOrganisationById(new Integer(1))); - assertNotNull(userManagementService.saveUser(user, new Integer(4))); - + assertNotNull(userManagementService.saveUser(user, new Integer(3))); } public void testMoveLearningDesign()throws IOException{ String packet = userManagementService.moveLearningDesign(new Long(1),new Integer(4),new Integer(1)); @@ -85,13 +88,16 @@ /* (non-Javadoc) * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() */ - protected String getHibernateSessionFactoryName() { - + protected String getHibernateSessionFactoryName() { return "coreSessionFactory"; } public void testGetWorkspace()throws IOException{ String str = userManagementService.getWorkspace(new Integer(4)); System.out.println(str); + } + public void testGetAccessibleWorkspaceFolders()throws IOException{ + String packet = userManagementService.getAccessibleWorkspaceFolders(new Integer(4)); + System.out.println("User Accessible folders: " + packet); } } Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java =================================================================== diff -u --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java (revision 0) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -0,0 +1,50 @@ +/* + * Created on May 28, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.usermanagement.dao.hibernate; + +import java.util.List; + +import org.lamsfoundation.lams.AbstractLamsTestCase; + +/** + * @author Manpreet Minhas + */ +public class TestUserOrganisationDAO extends AbstractLamsTestCase { + + protected UserOrganisationDAO userOrganisationDAO; + protected UserDAO userDAO; + + public TestUserOrganisationDAO(String name){ + super(name); + } + protected void setUp()throws Exception{ + super.setUp(); + userOrganisationDAO = (UserOrganisationDAO)context.getBean("userOrganisationDAO"); + userDAO =(UserDAO)context.getBean("userDAO"); + } + + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; + } + + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() { + return "coreSessionFactory"; + } + public void testGetUserOrganisationsByUser(){ + List memberships = userOrganisationDAO.getUserOrganisationsByUser(userDAO.getUserById(new Integer(4))); + assertEquals(memberships.size(),4); + } + +} Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java =================================================================== diff -u --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java (revision 0) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) @@ -0,0 +1,47 @@ +/* + * Created on May 28, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.usermanagement.dao.hibernate; + +import org.lamsfoundation.lams.AbstractLamsTestCase; +import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; + +/** + * @author Manpreet Minhas + */ +public class TestWorkspaceFolderDAO extends AbstractLamsTestCase { + + protected WorkspaceFolderDAO workspaceFolderDAO; + + public TestWorkspaceFolderDAO(String name){ + super(name); + } + protected void setUp()throws Exception{ + super.setUp(); + workspaceFolderDAO = (WorkspaceFolderDAO)context.getBean("workspaceFolderDAO"); + } + + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; + } + + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() { + return "coreSessionFactory"; + } + public void testGetRunSequencesFolderForUser(){ + WorkspaceFolder folder = workspaceFolderDAO.getRunSequencesFolderForUser(new Integer(4)); + assertEquals(folder.getWorkspaceFolderId(),new Integer(7)); + } + +}