Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r805 - in qa/forge/jira-extensions: developer-issues-report/src/etc/templates/developerissuesreport developer-issues-report/src/java/pl/net/mamut/jira developersinvolvement-report/src/etc/templates/developersinvolvementreport developersinvolvement-report/src/java/pl/net/mamut/jira developersperproject-report/src/etc/templates/developersperprojectreport developersperproject-report/src/java/br/ufrj/jira issuesclosed-report/src/etc/templates/issuesclosedreport issuesclosed-report/src/java/pl/net/mamut/jira junit-tests-adamw/src/java/pl/net/mamut/jira
Author: dam...@jb... Date: 2005-08-10 12:40:23 -0400 (Wed, 10 Aug 2005) New Revision: 805 Modified: qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java Log: MERGED: -r 797:803 https://svn.labs.jboss.com/trunk/forge/jira-extensions https://svn.labs.jboss.com/qa/forge/jira-extensions Modified: qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -15,7 +15,7 @@ <td bgcolor="fffff0"><h3 class="formtitle">$user</h3></td> <td> <table border="0" cellspacing="0" cellpadding="0"><tr><td width="$widths.get($user)" bgcolor="red"> - <!--<img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0">--> + <img src="/images/border/spacer.gif" height=0 width="$widths.get($user)" title="$user" border="0"> </td></tr></table> </td> <td><h3 class="formtitle">$usersIssues.get($user)</h3></td> Modified: qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -171,7 +171,6 @@ } /* Iterating over all projects */ - String temp = ""; for (int i=0; i<projects.length; i++) { /* Getting issues for the given project */ Collection projectIssues = issueSearch(remoteUser, new Long(projects[i])); @@ -259,6 +258,22 @@ widths.put(key, new Integer((int)width)); } + /* Sorting the users issues list. */ + List usersIssuesList = new ArrayList(usersIssues.entrySet()); + Collections.sort(usersIssuesList, new Comparator() { + public int compare(Object arg0, Object arg1) { + Map.Entry e0 = (Map.Entry) arg0; + Map.Entry e1 = (Map.Entry) arg1; + return -((Integer) e0.getValue()).compareTo((Integer) e1.getValue()); + } + }); + + usersIssues = new LinkedHashMap(); + for (Iterator iter = usersIssuesList.iterator(); iter.hasNext();) { + Map.Entry e = (Map.Entry) iter.next(); + usersIssues.put(e.getKey(), e.getValue()); + } + /* Preparing the map with parameters for the template */ DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); velocityParams.put("dateFormat", dateFormat); Modified: qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -36,7 +36,8 @@ <td>$barKey</td> ##$userName.getStatuses() <td height="15"><table border="0" cellspacing="0" cellpadding="0"><tr> #foreach ($row in $bar.getRows()) - <td width="$row.getStatuses()" bgcolor="$row.getColour()"><img src="/images/border/spacer.gif" height=10 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> + <td width="$row.getStatuses()" bgcolor="$row.getColour()"> + <img src="/images/border/spacer.gif" height=0 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> #end </tr></table></td> <td>$topTenSum.get($barKey)</td> @@ -59,7 +60,8 @@ #set($proNum = $sum.get($key) * $GRAPH_MULT) <tr><td>$key</td><td> <table border="0" cellspacing="0" cellpadding="0"><tr> - <td width="$proNum" bgcolor="$colours.get($colourIt)"><img src="/images/border/spacer.gif" height=10 width="$proNum" title="$key" border="0"></td> + <td width="$proNum" bgcolor="$colours.get($colourIt)"> + <img src="/images/border/spacer.gif" height=0 width="$proNum" title="$key" border="0"></td> </tr></table> </td><td>$sum.get($key)</td></tr> #end Modified: qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -304,9 +304,15 @@ } if (before != null) { + if (before.get("newvalue") == null) + continue; + user = before.get("newvalue").toString(); } - else if(after != null) { + else if (after != null) { + if (after.get("oldvalue") == null) + continue; + user = after.get("oldvalue").toString(); } Modified: qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm =================================================================== --- qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -13,8 +13,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <img src="/images/border/spacer.gif" height="10" width="$width" title="$projectNames.get($key)" border="0"> + <td bgcolor="#3c78b5" width="$width"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$projectNames.get($key)" border="0"> </td> </tr> </table> Modified: qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java =================================================================== --- qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -56,7 +56,7 @@ GenericValue changeGroup = (GenericValue)changeGroups.next(); String author = changeGroup.getString("author"); Timestamp created = changeGroup.getTimestamp("created"); - System.out.println("created: "+created.toString()); + //System.out.println("created: "+created.toString()); if(created.after(startDate) && created.before(endDate)) { //System.out.println("created = "+changeGroup.get("created")+" object type "+changeGroup.get("created").getClass().getName()); @@ -77,18 +77,18 @@ private boolean isSelectedProject(Map params, Long projectId) { - System.out.println("ProjectID: "+projectId+" is being compared!"); + //System.out.println("ProjectID: "+projectId+" is being compared!"); try { String[] projectsId = (String [])params.get("projects"); for(int i = 0; i < projectsId.length; i++ ) { Long l = new Long(projectsId[i]); - System.out.println("ProjectID: trying "+projectsId[i]); + //System.out.println("ProjectID: trying "+projectsId[i]); if(l.equals(projectId)); return true; } } catch (ClassCastException e1) { String projectsId = (String)params.get("projects"); - System.out.println("ProjectID: trying a "+projectsId); + //System.out.println("ProjectID: trying a "+projectsId); Long l = new Long(projectsId); if(l.equals(projectId)) return true; @@ -148,7 +148,7 @@ Iterator issues = project.getRelated("ChildIssue").iterator(); - System.out.println("Processing project "+project.getString("name")); + //System.out.println("Processing project "+project.getString("name")); while(issues.hasNext()) { GenericValue issue = (GenericValue)issues.next(); HashSet authors = getAuthorsClosedIssue(issue,startDate,realEndDate); Modified: qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm =================================================================== --- qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -25,8 +25,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <!-- <img src="/images/border/spacer.gif" height="10" width="$width" title="$pNames.get($key)" border="0">--> + <td width="$width" bgcolor="#3c78b5"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$pNames.get($key)" border="0"> </td> </tr> </table> Modified: qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java =================================================================== --- qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -87,7 +87,6 @@ try { projectList = projectManager.getProjects(); - Object[] pList = projectList.toArray(); for (int prNum = 0; prNum < projectList.size(); prNum++) { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -235,7 +235,7 @@ * @throws Exception */ protected void resolveIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String fixVersions[]) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Resolve Issue").click(); @@ -247,6 +247,7 @@ wr.setParameter("action", "5"); wr.setParameter("id", issueId); if (assignee != null) wr.setParameter("assignee", assignee); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); wr.setParameter("viewIssueKey", ""); wc.sendRequest(wr); @@ -261,7 +262,7 @@ * @throws Exception */ protected void closeIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String[] fixVersions) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Close Issue").click(); @@ -272,6 +273,7 @@ wr.setParameter("resolution", resolutionId); wr.setParameter("action", "2"); wr.setParameter("id", issueId); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); if (assignee != null) wr.setParameter("assignee", assignee); wr.setParameter("viewIssueKey", ""); @@ -315,7 +317,7 @@ * @throws Exception */ protected void deleteProject(String projectId) throws Exception { - WebRequest wr = new GetMethodWebRequest(host+"/DeleteProject.jspa"); + WebRequest wr = new GetMethodWebRequest(host+"/secure/project/DeleteProject.jspa"); wr.setParameter("pid", projectId); wr.setParameter("confirm", "true"); @@ -450,7 +452,7 @@ protected String getAllValue(String name) throws Exception { String page = wc.getCurrentPage().getText(); page = page.substring(page.indexOf(name), page.length()); - page = page.substring(page.indexOf(".1."), page.length()); + page = page.substring(page.indexOf("<option value=\"")+16, page.length()); int pos = 3; while (page.charAt(pos) != '"') pos++; return page.substring(0, pos); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -50,13 +50,13 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin); - closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin); - closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin); + closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin, new String[] { verIds[1] }); loginUser(); - resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin); - closeIssue(issIds[1][0], issReps[1][0], "3", userLogin); + resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][0], issReps[1][0], "3", userLogin, new String[] { verIds[1] }); } protected void tearDown() throws Exception { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -42,7 +42,7 @@ issRep2 = getIssueRepresentation(prjId, "issue2"); issRep3 = getIssueRepresentation(prjId, "issue3"); - closeIssue(issId1, issRep1, "3", null); + closeIssue(issId1, issRep1, "3", null, new String[] { verId1, verId2 }); } protected void tearDown() throws Exception { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.changelogreport:changelog"); allTypes = getAllValue("types"); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.roadmapreport:roadmap"); allTypes = getAllValue("types"); |
