Changeset 17253

Timestamp:

04/17/08 11:06:54 (9 months ago)

Author:

uroslates

Message:

Correction for failing test. Test related to reassigning assignable form.

Files:

• trunk/core/web/jsp/roster/xsl/roster.xsl (modified) (2 diffs)
• trunk/test/acceptance/src/net/project/test/acceptance/forms/ChangeAssignmentsForAssignableFormObjectTest.java (modified) (11 diffs)

trunk/core/web/jsp/roster/xsl/roster.xsl

@@ -63 +63 @@
-                        <xsl:choose>    
-                        <xsl:when test="$invitee_status_id != 'Deleted'">
-
+name="projectMember" 
-
-                        </xsl:when>
@@ -83 +83 @@
-                        <xsl:choose>    
-                        <xsl:when test="$invitee_status_id != 'Deleted'">
-
+name="projectMemberMail" value="{email_address}" 
-                        </xsl:when>
-                        <xsl:otherwise>

trunk/test/acceptance/src/net/project/test/acceptance/forms/ChangeAssignmentsForAssignableFormObjectTest.java

@@ -1 +1 @@
-package net.project.test.acceptance.forms;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
-
-import net.project.test.acceptance.engine.PnetTestEngine;
@@ -5 +9 @@
-/**
- * <b>Test Case 5.1.4</b> Change assignments for assignable form object.<br><br>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- * so if you think to run it few more times, first change values of properties <i>assigneTo</i> and 
- * <i>assignedTo</i> so the test would succeed (because there is a possibility that element you have just 
- * reassinged may be first in the form list again, and you'll then try to assigne that element to user
-
+
+
- * Change properties <b>newWork</b> and <b>newWorkingUnits</b> to values that you would like to assigning to new user 
- * when assigning him form list element. (how much working units and work will he be spending while working with new assigned form). 
@@ -26 +37 @@
-        
-        //project name to select (whose from object assignment we will change)
-
+ = null
-        //form object name which we want to reassigne
-
+ = null
-        
-        //variables to hold new Working details for user we are reasigning form to
@@ -34 +45 @@
-        String newWorkingUnits = "hours";
-        //user to whome this form is currently assigned, in form "Name Lastname"
-V M
+Application Administrator
-        //user to whome this form will be assigned, in form "Name Lastname"
-
+
+
+
+
-//////////////////////////////////////////////////////////////////////////////
-
@@ -56 +70 @@
-        private String historyEndDate = null;
-        
+        //data necesarry for adding new user to project if it isn't added already
+        private String[] usersNames = null;
+        private String nameOfUser = null;
+        private String lastnameOfUser = null;
+        
-        public void testChangeAssignmentsForAssignableForm() {
+
-                projectName = _framework.createNewProject();
-                _framework.goToPersonal();
-                
-                formName = "testForm" + _framework.createNewAssignableForm(projectName, true);
+                
+                initUsersNameAndLastname();
+                isUserAddedToProject(nameOfUser, lastnameOfUser, emailOfUserToAssigneProjectTo, projectName);   //, "Lates", emailOfUserToAssigneProjectTo, projectName);
+                
-                _framework.goToPersonal();
-                
@@ -69 +93 @@
-                //(3) select new user to whome you'll assigne the form
-                assigneFormObjectToNewUser(assigneToUser);
-               
+
-                //(4) enter new work for this assignment and save
-                enterNewWorkAndSave();
@@ -213 +237 @@
-         */
-        public void assigneFormObjectToNewUser(String newUserName) {
-                
-                System.out.println(getPageSource());
-                
-                
-                //option for user to whome we will assigne this form is present in select element
@@ -285 +306 @@
-        public void collectWorkingValues() {
-                historyWork = getElementAttributByXPath( getElementsXPathWithNameValue("input", "work"), "value");
+                historyWork = historyWork.equals("")? "0" : historyWork;
-                System.out.println("Previous user work was: " + historyWork);
-
@@ -291 +313 @@
-                
-                historyWorkComplete = getElementTextByXPath( getElementsXPathWithIdValue("td", "workComplete")).trim();
+                historyWorkComplete = historyWorkComplete.equals("")? "0 hrs" : historyWorkComplete;
-                System.out.println("Previous user work complete was: " + historyWorkComplete);
-                
-                historyPercWorkComplete = getElementAttributByXPath( getElementsXPathWithIdValue("input", "work_percent_complete"), "value").trim();
+                historyPercWorkComplete = historyPercWorkComplete.equals("")? "0%" : historyPercWorkComplete; 
-                System.out.println("Previous user work % complete was: " + historyPercWorkComplete);            
-                
+                SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+                Date currentDate = new Date();
+                try {
+                        currentDate = dateFormat.parse(currentDate.toString());
+                } catch (ParseException e) {
+                        System.out.println("Error while parsing date.");
+                }
+                
-                historyStartDate = getElementTextByXPath( getElementsXPathWithIdValue("td", "startDate")).trim();
-
+
+
-                
-                historyEndDate = getElementTextByXPath( getElementsXPathWithIdValue("td", "endDate")).trim();
-
-
-
-
-
+
+
+
-                historyWork = historyWorkComplete;
-
+
+
+
+
+
+
-        }
-        
@@ -321 +357 @@
-                assertTrue( getElementTextByXPath( getElementsXPathWithIdValue("td", "exWorkPercentComplete")).trim().equals(historyPercWorkComplete) );
-                assertTrue( getElementTextByXPath( getElementsXPathWithIdValue("td", "exStartDate")).trim().equals(historyStartDate) );
-
+//
-        }
-        
@@ -333 +369 @@
-                assertTrue( newWork.equals( getElementAttributByXPath( getElementsXPathWithNameValue("input", "work"), "value" ) ) );
-        }
+        
+        /**
+         * Checks if user is added to the project. If it is, do nothing, if it's not, add it. 
+         * 
+         * @param userName
+         * @param userLastname
+         * @param userEmail
+         * @param project
+         */
+        private void isUserAddedToProject(String userName, String userLastname, String userEmail, String project) {
+                
+                _framework.goToProjects();
+                assertLinkPresentWithExactText(project);
+                clickLinkWithExactText(project);
+                assertTextPresent(project);
+                assertLinkPresentWithExactText("Setup");
+                clickLinkWithExactText("Setup");
+                
+                assertLinkPresentWithExactText("People and Roles");
+                clickLinkWithExactText("People and Roles");
+                assertTextPresent("Participants");
+                
+                boolean isUserAdded = getPageSource().contains(userEmail)? true:false ;
+                if( !isUserAdded) {
+                        //add user to the list
+                        addUserToProject(userName, userLastname, userEmail, project);
+                        System.out.println("\n*** User " + userName + " " + userLastname + " added to project " + project + ". ***\n");
+                } else {
+                        //user is already added to project list
+                        System.out.println("\n*** User " + userName + " " + userLastname + " already exists in projects " + project + " list. ***\n");
+                }
+
+        }
+        
+        /**
+         * Adds user for the first time to the specific project passed to this method.
+         * 
+         * @param user Name to add to project (e.g. Homer)
+         * @param user Lastname to add to project (e.g. Simpson)
+         * @param user email address (e.g. homer@gmail.com)
+         * @param project to which you want to add new user to
+         */
+        public void addUserToProject(String userName, String userLastname, String userEmail, String project) {
+                
+                assertTextPresent("Participants");
+                assertLinkPresentWithText("Invite Participant");
+                clickLinkWithText("Invite Participant");
+                
+                assertTextPresent("Invite By Email Address");
+                setWorkingForm("memberadd");
+                assertFormElementPresent("inviteeFirstName");
+                setFormElement("inviteeFirstName", userName);
+                assertFormElementPresent("inviteeLastName");
+                setFormElement("inviteeLastName", userLastname);
+                assertFormElementPresent("inviteeEmail");
+                setFormElement("inviteeEmail", userEmail);
+                assertLinkPresentWithText("Add to Invitee List");
+                clickLinkWithText("Add to Invitee List");
+                _framework.clickNextActionbarButton();
+                assertTextPresent("Assign Role");
+                assertLinkPresentWithText("Invite");
+                clickLinkWithText("Invite");
+                
+                
+        }
+        
+        /**
+         * Initialize variables necessary for adding new user to project
+         *
+         */
+        private void initUsersNameAndLastname() {
+                usersNames = assigneToUser.split(" ");
+                nameOfUser = usersNames[0];
+                lastnameOfUser = usersNames[1];
+        }
+        
-}