Changeset 17902

Show
Ignore:
Timestamp:
08/18/08 16:11:02 (5 months ago)
Author:
vmalykhin
Message:

datacleaner task's support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/web/jsp/schedule/xsl/schedule-list-hierarchy-expanded.xsl

    r17866 r17902  
    101101        <td width="1%"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></td> 
    102102        <td> 
    103         <input type="checkbox" name="selected" onClick="toggleSelection();" value="{id}" /> 
     103        <input id="task{name}" type="checkbox" name="selected" onClick="toggleSelection();" value="{id}" /> 
    104104        </td> 
    105105    <td><xsl:value-of select="sequence"/></td> 

  • trunk/core/web/jsp/schedule/xsl/schedule-list.xsl

    r17866 r17902  
    7979                <td valign="bottom" width="1%"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></td> 
    8080                <td> 
    81             <input type="checkbox" name="selected" onClick="toggleSelection();" value="{id}" /> 
     81            <input id="task{name}" type="checkbox" name="selected" onClick="toggleSelection();" value="{id}" /> 
    8282                </td> 
    8383        <td><xsl:value-of select="sequence"/></td> 

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

    r17898 r17902  
    4343                        break; 
    4444                         
    45                         case TASK : {}; 
     45                        case TASK : { 
     46                                PnetTaskObject taskObject = (PnetTaskObject) pnetObject; 
     47                                _framework.deleteTask(taskObject.getName(), taskObject.getProjectName()); 
     48                        }; 
    4649                        break; 
    4750                         

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

    r17900 r17902  
    283283 
    284284        assertTextPresent(newTaskName); 
    285  
    286         //_dataCleaner.registerCreatedObject(new PnetTaskObject(newTaskName)); 
     285         
     286        _dataCleaner.registerCreatedObject( 
     287                        new PnetTaskObject(existentProjectName, newTaskName)); 
    287288         
    288289        return newTaskName; 
    …… 
    446447        } 
    447448 
    448         public void deleteTask(String taskName, String projectName, String businessName){ 
     449        public void deleteTask(String taskName, String projectName){ 
     450                goToProjects(); 
     451                clickLinkWithExactText(projectName); 
     452                clickWorkplanMenuItem(); 
     453                checkCheckboxWithId("task" + taskName); 
    449454                 
    450     } 
    451  
    452     public void testProjectListMainPage() { 
     455                assertWindowCountEquals(2); 
     456                try { 
     457                        assertWindowPresentWithTitle("Delete Tasks"); 
     458                        throw new RuntimeException("Must throw exception"); 
     459                } catch (AssertionFailedError e) { 
     460                } 
     461                assertWindowPresentWithTitle("Project.net"); 
     462 
     463                clickActionDeleteTask(); 
     464 
     465                assertWindowCountEquals(3); 
     466                assertWindowPresentWithTitle("Delete Tasks"); 
     467                gotoWindowByTitle("Delete Tasks"); 
     468                testDeleteTasksPage(); 
     469                clickRadioOptionWithId("deleteTaskYes"); 
     470                clickSubmitActionbarButton(); 
     471 
     472                assertLinkNotPresentWithExactText(taskName); 
     473    } 
     474 
     475    private void testDeleteTasksPage() { 
     476        } 
     477 
     478        public void clickActionDeleteTask() { 
     479        clickLinkWithExactText("Delete Task"); 
     480        } 
     481 
     482        public void testProjectListMainPage() { 
    453483        // 
    454484    } 

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

    r17898 r17902  
    6868 
    6969class PnetTaskObject extends PnetObject { 
    70         private String _businessName = null; 
    7170        private String _projectName = null; 
    7271 
    73         public PnetTaskObject(String businessName, String projectName, String name) { 
     72        public PnetTaskObject(String projectName, String name) { 
    7473                super(name); 
    7574                setType(PnetObjectType.TASK); 
    76                 _businessName = businessName; 
    7775                _projectName = projectName; 
    78         } 
    79  
    80         public String getBusinessName() { 
    81                 return _businessName; 
    8276        } 
    8377