Changeset 17898

Show
Ignore:
Timestamp:
08/15/08 09:57:34 (3 months ago)
Author:
vmalykhin
Message:

fixes for tests and datacleaner

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r17492 r17898  
    3232                switch (pnetObject.getType()) { 
    3333                        case PROJECT : { 
    34                                 PnetProjectObject projectObject = (PnetProjectObject) pnetObject;  
     34                                PnetProjectObject projectObject = (PnetProjectObject) pnetObject; 
    3535                                _framework.deleteProject(projectObject.getName(), projectObject.getBusinessName()); 
    3636                        };  
    …… 
    3838                         
    3939                        case BUSINESS : { 
    40                                 PnetBusinessObject businessObject = (PnetBusinessObject) pnetObject;  
     40                                PnetBusinessObject businessObject = (PnetBusinessObject) pnetObject; 
    4141                                _framework.deleteBusiness(businessObject.getName()); 
    4242                        }; 
    …… 
    4646                        break; 
    4747                         
    48                         case WORKFLOW : {}; 
     48                        case WORKFLOW : { 
     49                                PnetWorkflowObject workflowObject = (PnetWorkflowObject) pnetObject; 
     50                                _framework.deleteWorkflow(workflowObject.getName(), workflowObject.getProjectName()); 
     51                        }; 
    4952                        break; 
    5053                         

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

    r17895 r17898  
    249249        clickLinkWithExactText(existentProjectName); 
    250250 
    251         final String uniqueTaskName = createUniqueValue(namePrefix); 
    252         assertTextNotPresent(uniqueTaskName); 
     251        final String newTaskName = createUniqueValue(namePrefix); 
     252        assertTextNotPresent(newTaskName); 
    253253 
    254254        clickWorkplanMenuItem(); 
    255255        testTaskShedulingListPage(); 
    256256 
    257         assertTextNotPresent(uniqueTaskName); 
     257        assertTextNotPresent(newTaskName); 
    258258 
    259259        clickActionCreateNewTask(); 
    …… 
    264264        assertTextPresent("Name:"); 
    265265        assertFormElementPresent("name"); 
    266         setTextField("name", uniqueTaskName); 
     266        setTextField("name", newTaskName); 
    267267 
    268268        assertTextPresent("Start Date:"); 
    …… 
    282282        clickSubmitActionbarButton(); 
    283283 
    284         assertTextPresent(uniqueTaskName); 
    285  
    286         return uniqueTaskName; 
     284        assertTextPresent(newTaskName); 
     285 
     286        //_dataCleaner.registerCreatedObject(new PnetTaskObject(newTaskName)); 
     287         
     288        return newTaskName; 
    287289    } 
    288290 
    …… 
    414416                        goToBusiness();*/ 
    415417    } 
     418         
     419        public void deleteWorkflow(String name, String projectName) { 
     420                goToProjects(); 
     421                clickLinkWithExactText(projectName); 
     422                clickActionWorkflow(); 
     423                clickLinkWithExactText("Workflow Designer"); 
     424                 
     425                 
     426                 
     427        } 
    416428 
    417429    public void testDeleteProjectPage() { 
    …… 
    511523        assertLinkPresentWithExactText("Assignments"); 
    512524        assertLinkPresentWithExactText("Assignments (Beta)"); 
    513         assertLinkPresentWithExactText("My Blog"); 
     525        assertLinkPresentWithExactText("Blog"); 
    514526        assertLinkPresentWithExactText("Documents"); 
    515527        assertLinkPresentWithExactText("Forms"); 
    516         assertLinkPresentWithExactText("Templates"); 
    517528        assertLinkPresentWithExactText("Setup"); 
    518         assertLinkPresentWithExactText("Application Admin");         
    519         assertLinkPresentWithExactText("Configurations"); 
     529        assertLinkPresentWithExactText("Application Admin"); 
    520530 
    521531        assertTextPresent("My Businesses"); 
    …… 
    525535        assertLinkPresentWithExactText("Business"); 
    526536        assertLinkPresentWithExactText("Projects"); 
    527         assertLinkPresentWithExactText("Resource"); 
     537        assertLinkPresentWithExactText("Resources"); 
    528538 
    529539        assertLinkPresentWithExactText("Help"); 
    …… 
    679689        testWorkflowsListPage(); 
    680690 
    681         final String uniqueWorkflowName = createUniqueValue("testWorflow"); 
    682         assertLinkNotPresentWithExactText(uniqueWorkflowName); 
     691        final String newWorkflowName = createUniqueValue("testWorflow"); 
     692        assertLinkNotPresentWithExactText(newWorkflowName); 
    683693 
    684694        clickActionCreate(); 
    685695        testWorkflowCreateDefinitionPage(); 
    686696        setWorkingForm("workflowCreate"); 
    687         setTextField("name", uniqueWorkflowName); 
     697        setTextField("name", newWorkflowName); 
    688698        selectOption("ownerID", "Application Administrator"); 
    689699        selectOption("strictnessID", "Relaxed"); 
    …… 
    745755 
    746756        clickWorkflowMenuItem(); 
    747         assertLinkPresentWithExactText(uniqueWorkflowName); 
    748  
    749         return uniqueWorkflowName; 
     757        assertLinkPresentWithExactText(newWorkflowName); 
     758 
     759        /*_dataCleaner.registerCreatedObject( 
     760                        new PnetWorkflowObject(existentProjectName, newWorkflowName));*/ 
     761         
     762        return newWorkflowName; 
    750763    } 
    751764 

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

    r17486 r17898  
    5353} 
    5454 
     55class PnetWorkflowObject extends PnetObject { 
     56        private String _projectName = null; 
     57 
     58        public PnetWorkflowObject(String projectName, String name) { 
     59                super(name); 
     60                setType(PnetObjectType.WORKFLOW); 
     61                _projectName = projectName; 
     62        } 
     63 
     64        public String getProjectName() { 
     65                return _projectName; 
     66        } 
     67} 
     68 
    5569class PnetTaskObject extends PnetObject { 
    5670        private String _businessName = null;