Changeset 17859

Show
Ignore:
Timestamp:
08/08/08 06:28:32 (3 weeks ago)
Author:
vmalykhin
Message:

additional tests fixes related to new UI changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/acceptance/src/net/project/test/acceptance/PersonalHomeTest.java

    r17846 r17859  
    541541                // E4E_Pnet_UIpersonal_04 
    542542         
    543                 clickLinkWithImage(_framework.TOOLBAR_BUTTON_SEARCH); 
     543                _framework.clickActionSearch(); 
    544544         
    545545                assertTextPresent("Search"); 

  • trunk/test/acceptance/src/net/project/test/acceptance/framework/PnetAcceptanceTestFramework.java

    r17836 r17859  
    4242 
    4343    public static final String TOOLBAR_BUTTON_CREATE = "/images/icons/toolbar-gen-create"; 
    44     public static final String TOOLBAR_BUTTON_SEARCH = "/images/icons/toolbar-gen-search"; 
    4544    public static final String TOOLBAR_BUTTON_RESET = "/images/icons/toolbar-gen-reset"; 
    4645    public static final String ACTIONBAR_BUTTON_CANCEL = "/images/icons/actionbar-cancel"; 
    …… 
    428427        } 
    429428         
     429        public void clickActionSearch() { 
     430                clickLinkWithExactText("Search"); 
     431        } 
     432         
    430433    public void clickActionCreate() { 
    431434        clickLinkWithExactText("Create"); 
    …… 
    603606        assertLinkNotPresentWithExactText(uniqueDocumentName); 
    604607 
    605         clickActionCreate(); 
     608        clickActionImportDocument(); 
    606609        testUploadDocumentPage(); 
    607610 
    …… 
    623626    } 
    624627 
    625     public void clickDocumentsMenuItem() { 
     628    private void clickActionImportDocument() { 
     629        clickLinkWithExactText("Import Document"); 
     630        } 
     631 
     632        public void clickDocumentsMenuItem() { 
    626633        clickLinkWithExactText("Documents"); 
    627634        //clickMenuItem("Documents"); 
    …… 
    750757        assertWindowPresentWithTitle("Project.net"); 
    751758 
    752         clickActionWorkflow(); 
    753  
     759        clickActionAddToWorkflow(); 
    754760        assertWindowCountEquals(2); 
    755761        assertWindowPresentWithTitle("Start Workflow Wizard"); 
    …… 
    770776    } 
    771777 
    772     public String createNewAssignableForm(String existentProjectName, boolean assignable) { 
     778    private void clickActionAddToWorkflow() { 
     779        clickLinkWithExactText("Add to Workflow"); 
     780        } 
     781 
     782        public String createNewAssignableForm(String existentProjectName, boolean assignable) { 
    773783        final AssignableFormsTester assignableFormTester = new AssignableFormsTester(this); 
    774784        return assignableFormTester.createNewAssignableForm(existentProjectName, assignable);