Changeset 17836

Show
Ignore:
Timestamp:
08/06/08 09:05:21 (3 weeks ago)
Author:
vmalykhin
Message:

tests fixes related to new UI changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/test/acceptance/src/net/project/test/acceptance/forms/ChangeAssignmentsForAssignableFormObjectTest.java

    r17253 r17836  
    4747        private String assignedToUser = "Application Administrator"; 
    4848        //user to whome this form will be assigned, in form "Name Lastname" 
    49         private String assigneToUser = "Uros Lates"; 
     49        private String assigneToUser = "test1 test1"; 
    5050        //email of the user to which you want to assigne the form (used for searching user in project participants list) 
    51         private String emailOfUserToAssigneProjectTo = "uroslates@gmail.com"; 
     51        private String emailOfUserToAssigneProjectTo = "test1@ics.com"; 
    5252         
    5353////////////////////////////////////////////////////////////////////////////// 
     
    200200        public void clickModifyFormObjectButton() { 
    201201                 
    202                 clickLinkWithImage(_framework.TOOLBAR_BUTTON_MODIFY ); 
     202                _framework.clickActionModify(); 
    203203                 
    204204                assertTextPresent(firstFormsListElementName); 
  • trunk/test/acceptance/src/net/project/test/acceptance/framework/PnetAcceptanceTestFramework.java

    r17776 r17836  
    1313public class PnetAcceptanceTestFramework extends PnetTestEngine { 
    1414 
    15     private static final String MENU_IMG_PROJECTS = "/images/common/topnav-projects"; 
    16     private static final String MENU_IMG_BUSINESS = "images/common/topnav-business"; 
    17     private static final String MENU_IMG_PERSONAL = "/images/common/topnav-personal"; 
    18     private static final String MENU_IMG_RESOURCES = "/images/common/topnav-resource"; 
     15       private static final String MENU_PERSONAL = "Personal"; 
     16       private static final String MENU_BUSINESS = "Business"; 
     17    private static final String MENU_PROJECTS = "Projects"; 
     18    private static final String MENU_RESOURCES = "Resource"; 
    1919 
    2020        public static final String[] SEARCH_TYPES = new String[] { "All", "Calendar", "Forms", "Deliverables", "Documents", 
     
    4242 
    4343    public static final String TOOLBAR_BUTTON_CREATE = "/images/icons/toolbar-gen-create"; 
    44     public static final String TOOLBAR_BUTTON_MODIFY = "/images/icons/toolbar-gen-modify"; 
    45     public static final String TOOLBAR_BUTTON_REMOVE = "/images/icons/toolbar-gen-remove"; 
     44    public static final String TOOLBAR_BUTTON_SEARCH = "/images/icons/toolbar-gen-search"; 
    4645    public static final String TOOLBAR_BUTTON_RESET = "/images/icons/toolbar-gen-reset"; 
    47     public static final String TOOLBAR_BUTTON_PROPERTIES = "/images/icons/toolbar-gen-properties"; 
    48     public static final String TOOLBAR_BUTTON_COPY = "/images/icons/toolbar-gen-copy"; 
    49     public static final String TOOLBAR_BUTTON_LINK = "/images/icons/toolbar-gen-link"; 
    50     public static final String TOOLBAR_BUTTON_WORKFLOW = "/images/icons/toolbar-gen-workflow"; 
    51     public static final String TOOLBAR_BUTTON_SEARCH = "/images/icons/toolbar-gen-search"; 
    52     public static final String TOOLBAR_BUTTON_CAPTUREWORK = "/images/icons/toolbar-gen-capturework"; 
    53     public static final String TOOLBAR_BUTTON_NOTIFY = "/images/icons/toolbar-gen-notify"; 
    54     public static final String TOOLBAR_BUTTON_HELP = "/images/icons/toolbar-gen-help"; 
    55     public static final String TOOLBAR_BUTTON_CREATE_EXT = "/images/icons/toolbar-gen-create-ext"; 
    56     public static final String TOOLBAR_BUTTON_SHARE = "/images/icons/toolbar-gen-share"; 
    57     public static final String TOOLBAR_BUTTON_SECURITY = "/images/icons/toolbar-gen-security"; 
    58     public static final String TOOLBAR_BUTTON_CHECKOUT = "/images/icons/toolbar-pers-checkout"; 
    5946    public static final String ACTIONBAR_BUTTON_CANCEL = "/images/icons/actionbar-cancel"; 
    6047    public static final String ACTIONBAR_BUTTON_SUBMIT = "/images/icons/actionbar-submit"; 
     
    6552    public static final String NEW_ITEMS_LINK_ASSIGNMENTS_ID_PREFIX = "newItems_"; 
    6653    public static final String NEW_ITEMS_CHECKBOX_ASSIGNMENTS_ID_PREFIX = "newItemsCheckbox_"; 
    67  
    68     public static final String GIF_EXT = ".gif"; 
    69     public static final String ON_B = "_on" + GIF_EXT; 
    70     public static final String OFF_B = "_off" + GIF_EXT; 
     54     
    7155    public static final String WORKFLOWS_STEP_ROLE_SEL_ID_PREFIX = "sel_"; 
    7256    public static final String WORKFLOWS_STEP_ROLE_DESEL_ID_PREFIX = "desel_"; 
     
    119103    public void goToPersonal() { 
    120104        gotoPage("/personal/Main.jsp?module=160"); 
    121         assertLinkPresentWithImage(MENU_IMG_PERSONAL); 
    122         clickLinkWithImage(MENU_IMG_PERSONAL); 
     105        assertLinkPresentWithExactText(MENU_PERSONAL); 
     106        clickLinkWithExactText(MENU_PERSONAL); 
    123107        // assertTitleEquals(); 
    124108    } 
     
    126110    public void goToBusiness() { 
    127111        // gotoPage("/business/BusinessPortfolio.jsp?module=160&portfolio=true"); 
    128         clickLinkWithImage(MENU_IMG_BUSINESS); 
     112       clickLinkWithExactText(MENU_BUSINESS); 
    129113        assertTextPresent("Business Portfolio"); 
    130114        // assertTitleEquals(); 
     
    133117    public void goToProjects() { 
    134118        goToPersonal(); 
    135         assertLinkPresentWithImage(MENU_IMG_PROJECTS); 
     119        assertLinkPresentWithExactText(MENU_PROJECTS); 
    136120        assertTextNotPresent("Project List"); 
    137         clickLinkWithImage(MENU_IMG_PROJECTS); 
     121        clickLinkWithExactText(MENU_PROJECTS); 
    138122        assertTextPresent("Project List"); 
    139123        // assertTitleEquals(); 
     
    141125 
    142126    public void gotoResourceManagementPage() throws Exception { 
    143         clickLinkWithImage(MENU_IMG_RESOURCES); 
     127       clickLinkWithExactText(MENU_RESOURCES); 
    144128        assertTextPresent("Resource Management"); 
    145129    } 
     
    152136        assertLinkNotPresentWithExactText(newBusinessName); 
    153137         
    154         clickCreateToolbarButton(); 
     138        clickActionCreateNewBusiness(); 
    155139 
    156140        assertTextPresent("Create New Business"); 
     
    178162        }*/ 
    179163 
    180     public void testBusinessPortfolioMainPage() { 
     164    private void clickActionCreateNewBusiness() { 
     165        clickLinkWithExactText("Create Business"); 
     166        } 
     167 
     168        public void testBusinessPortfolioMainPage() { 
    181169        // 
    182170    } 
     
    204192        assertLinkNotPresentWithExactText(newProjectName); 
    205193 
    206         clickCreateToolbarButton(); 
     194        clickActionCreate(); 
    207195 
    208196        assertTextPresent("Create Project Workspace"); 
     
    266254        assertTextNotPresent(uniqueTaskName); 
    267255 
    268         clickCreateToolbarButton(); 
     256        clickActionCreateNewTask(); 
    269257 
    270258        assertTextPresent("Create Task"); 
     
    296284    } 
    297285 
    298     public void assignResource(String taskName, String projectName) { 
     286    private void clickActionCreateNewTask() { 
     287        clickLinkWithExactText("Create New Task"); 
     288        } 
     289 
     290        public void assignResource(String taskName, String projectName) { 
    299291        assignResource(taskName, projectName, null, null); 
    300292    } 
     
    357349                assertWindowPresentWithTitle("Project.net"); 
    358350 
    359                 clickToolbarRemoveButton(); 
     351                clickActionRemove(); 
    360352 
    361353                assertWindowCountEquals(2); 
     
    398390        assertWindowPresentWithTitle("Project.net"); 
    399391 
    400         clickToolbarRemoveButton(); 
     392        clickActionRemove(); 
    401393 
    402394        assertWindowCountEquals(2); 
     
    436428        } 
    437429         
    438     public void clickCreateToolbarButton() { 
    439         clickLinkWithImage(TOOLBAR_BUTTON_CREATE + ON_B); 
    440     } 
    441  
    442     public void clickModifyToolbarButton() { 
    443         clickLinkWithImage(TOOLBAR_BUTTON_MODIFY + ON_B); 
     430    public void clickActionCreate() { 
     431       clickLinkWithExactText("Create"); 
     432    } 
     433 
     434    public void clickActionModify() { 
     435       clickLinkWithExactText("Modify"); 
    444436    } 
    445437 
     
    452444    } 
    453445 
    454     public void clickToolbarHelpButton() { 
    455         clickLinkWithImage(TOOLBAR_BUTTON_HELP + ON_B); 
    456     } 
    457  
    458     public void clickToolbarCheckOutButton() { 
    459         clickLinkWithImage(TOOLBAR_BUTTON_CHECKOUT); 
    460     } 
    461  
    462     public void clickToolbarRemoveButton() { 
    463         clickLinkWithImage(TOOLBAR_BUTTON_REMOVE); 
    464     } 
    465  
    466     public void clickToolbarWorkflowButton() { 
    467         clickLinkWithImage(TOOLBAR_BUTTON_WORKFLOW); 
     446    public void clickActionHelp() { 
     447       clickLinkWithExactText("Help"); 
     448    } 
     449 
     450    public void clickActionCheckOut() { 
     451       clickLinkWithExactText("Check Out"); 
     452    } 
     453 
     454    public void clickActionRemove() { 
     455       clickLinkWithExactText("Remove"); 
     456    } 
     457 
     458    public void clickActionWorkflow() { 
     459       clickLinkWithExactText("Workflow"); 
    468460    } 
    469461 
     
    490482 
    491483    public void clickCancelActionbarButton() { 
    492         clickLinkWithImage(ACTIONBAR_BUTTON_CANCEL + OFF_B); 
     484        clickLinkWithImage(ACTIONBAR_BUTTON_CANCEL); 
    493485    } 
    494486 
    495487    public void testPersonalHomePageSmoke() { 
    496          
    497         assertElementPresent("fixedRightTop"); 
    498         assertImagePresent(TOOLBAR_BUTTON_CREATE + OFF_B, "Create"); 
    499         assertImagePresent(TOOLBAR_BUTTON_SECURITY + OFF_B, "Security"); 
    500488 
    501489        assertElementPresent("content"); 
    502490        assertElementPresent("topframe"); 
    503  
    504         assertElementPresent("leftframe"); 
    505         //assertElementPresent("menu_bar"); 
    506         //assertElementPresent("verticalActionBar"); 
     491        assertElementPresent("leftheading-person"); 
     492        assertElementPresent("actionbox-item"); 
     493        assertElementPresent("logo"); 
    507494         
    508         assertTextPresent("Dashboard"); 
    509         assertTextPresent("Configurations"); 
     495        assertLinkPresentWithExactText("Dashboard"); 
     496        assertLinkPresentWithExactText("Calendar"); 
     497        assertLinkPresentWithExactText("Assignments"); 
     498        assertLinkPresentWithExactText("Assignments (Beta)"); 
     499        assertLinkPresentWithExactText("My Blog"); 
     500        assertLinkPresentWithExactText("Documents"); 
     501        assertLinkPresentWithExactText("Forms"); 
     502        assertLinkPresentWithExactText("Templates"); 
     503        assertLinkPresentWithExactText("Setup"); 
     504        assertLinkPresentWithExactText("Application Admin");         
     505        assertLinkPresentWithExactText("Configurations"); 
    510506 
    511507        assertTextPresent("My Businesses"); 
    512508        assertTextPresent("My Projects"); 
    513  
    514         //assertTextPresent("Personal Search"); 
    515         assertTextPresent("Help"); 
    516         assertTextPresent("Log Out"); 
     509         
     510        assertLinkPresentWithExactText("Personal"); 
     511        assertLinkPresentWithExactText("Business"); 
     512        assertLinkPresentWithExactText("Projects"); 
     513        assertLinkPresentWithExactText("Resource"); 
     514 
     515        assertLinkPresentWithExactText("Help"); 
     516        assertLinkPresentWithExactText("Log Out"); 
    517517        assertTextPresent("Application Administrator"); 
    518         assertTextPresent("Personalize this Page"); 
    519         assertTextPresent("Copyright 2000-2008 Project.net, Inc."); 
     518         
     519        assertLinkPresentWithExactText("Personalize this Page"); 
    520520    } 
    521521 
     
    578578        assertWindowPresentWithTitle("Project.net"); 
    579579 
    580         clickToolbarCheckOutButton(); 
     580        clickActionCheckOut(); 
    581581 
    582582        assertWindowCountEquals(2); 
     
    603603        assertLinkNotPresentWithExactText(uniqueDocumentName); 
    604604 
    605         clickCreateToolbarButton(); 
     605        clickActionCreate(); 
    606606        testUploadDocumentPage(); 
    607607 
     
    664664        assertLinkNotPresentWithExactText(uniqueWorkflowName); 
    665665 
    666         clickCreateToolbarButton(); 
     666        clickActionCreate(); 
    667667        testWorkflowCreateDefinitionPage(); 
    668668        setWorkingForm("workflowCreate"); 
     
    679679        assertLinkNotPresentWithExactText(uniqueWorkflowStepName); 
    680680 
    681         clickCreateToolbarButton(); 
     681        clickActionCreate(); 
    682682        testWorkflowCreateStepPage(); 
    683683        setTextField("name", uniqueWorkflowStepName); 
     
    707707        assertLinkNotPresentWithExactText(uniqueWorkflowTransitionName); 
    708708 
    709         clickCreateToolbarButton(); 
     709        clickActionCreate(); 
    710710        testWorkflowCreateTransitionPage(); 
    711711        setTextField("transitionVerb", uniqueWorkflowTransitionName); 
     
    750750        assertWindowPresentWithTitle("Project.net"); 
    751751 
    752         clickToolbarWorkflowButton(); 
     752        clickActionWorkflow(); 
    753753 
    754754        assertWindowCountEquals(2); 
     
    793793    public void clickFinishActionbarButton() { 
    794794        clickLinkWithImage(ACTIONBAR_BUTTON_FINISH); 
     795    } 
     796     
     797    public void clickActionCaptureWork() { 
     798        clickLinkWithExactText("Capture work"); 
    795799    } 
    796800