Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r849 - in trunk/forge/jira-extensions: developersinvolvement-report/src/java/pl/net/mamut/jira junit-tests-adamw junit-tests-adamw/src/etc/pl/net/mamut/jira junit-tests-adamw/src/java/pl/net/mamut/jira voting/src/java/com/atlassian/jira/web/action/admin/voting
|
From: <jbo...@li...> - 2005-08-14 23:52:41
|
Author: adamw
Date: 2005-08-14 19:51:06 -0400 (Sun, 14 Aug 2005)
New Revision: 849
Modified:
trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
trunk/forge/jira-extensions/junit-tests-adamw/.classpath
trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties
trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java
trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java
trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java
Log:
Tests & colours
Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
===================================================================
--- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -39,7 +39,7 @@
private ProjectManager projectManager;
private IssueManager issueManager;
private ActionManager actionManager;
- private String[] colours = {"green", "red", "blue", "yellow", "brown", "orange", "violet"};
+ private String[] colours = {"#cc0000", "#00cc00", "#0000cc", "#C0C030", "#663300", "#bbbbbb", "#003366"};
private int COL_NUM = 7;
private int GRAPH_MULT = 40; //width of one unit in drawing graphs
private int TOP_TEN_SHOW = 10;
Modified: trunk/forge/jira-extensions/junit-tests-adamw/.classpath
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/.classpath 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/.classpath 2005-08-14 23:51:06 UTC (rev 849)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry output="target/test-classes" kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/etc"/>
<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="MAVEN_REPO/httpunit/jars/httpunit-1.6.jar"/>
Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-14 23:51:06 UTC (rev 849)
@@ -1,5 +1,6 @@
# Name of the host on which jira is running (URL of the JIRA main page)
-host=http://localhost:8080/jira
+#host=http://localhost:8080/jira
+host=http://dev03.atl.jboss.com/jira/
# Login and password of JIRA administrator
#adminLogin=adamw
#adminPassword=adamw
Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -49,7 +49,12 @@
userPassword = properties.getProperty("userPassword");
host = properties.getProperty("host");
- /*adminLogin = "adamw";
+ /*adminLogin = "00testuser1";
+ adminPassword = "00TesTUseR1";
+ userLogin = "00testuser2";
+ userPassword = "00TesTUseR2";
+ host = "http://dev03.atl.jboss.com/jira/";
+ adminLogin = "";
adminPassword = "adamw";
userLogin = "user1";
userPassword = "user1";
@@ -88,7 +93,7 @@
link = wc.getCurrentPage().getLinkWith("Log in again");
link.click();
}
-
+
WebForm form = wc.getCurrentPage().getFormWithName("loginform");
form.setParameter("os_username", username);
form.setParameter("os_password", password);
@@ -221,6 +226,7 @@
wr.setParameter("fixVersions", fixVersions);
wr.setParameter("assignee", assignToAdmin ? adminLogin : userLogin);
wr.setParameter("reporter", adminLogin);
+ wr.setParameter("duedate", "");
wc.sendRequest(wr);
@@ -298,7 +304,7 @@
* @throws Exception
*/
protected String addProject(String name, String key, boolean leadIsAdmin) throws Exception {
- goToAdministration();
+ /*goToAdministration();
goToLink("Projects");
goToLink("Add Project");
@@ -306,7 +312,19 @@
form.setParameter("name", name);
form.setParameter("key", key);
form.setParameter("lead", leadIsAdmin ? adminLogin : userLogin);
- form.submit();
+ form.submit();*/
+
+ WebRequest wr = new GetMethodWebRequest(host+"/secure/admin/AddProject.jspa");
+ wr.setParameter("key", key);
+ wr.setParameter("name", name);
+ wr.setParameter("url", "");
+ wr.setParameter("lead", leadIsAdmin ? adminLogin : userLogin);
+ wr.setParameter("assigneeType", "2");
+ wr.setParameter("notificationScheme", "-1");
+ wr.setParameter("permissionScheme", "0");
+ wr.setParameter("issueSecurityScheme", "-1");
+
+ wc.sendRequest(wr);
return getProjectId(name);
}
@@ -339,6 +357,7 @@
wr.setParameter("pid", projectId);
wr.setParameter("name", name);
wr.setParameter("releaseDate", releaseDate);
+ wr.setParameter("scheduleAfterVersion", "-1");
wc.sendRequest(wr);
@@ -348,6 +367,8 @@
wr = new GetMethodWebRequest(host+"/secure/project/EditVersionReleases!release.jspa");
wr.setParameter("versionId", versionId);
wr.setParameter("pid", projectId);
+ wr.setParameter("commit", "true");
+ wr.setParameter("affectsAction", "ignore");
wc.sendRequest(wr);
}
@@ -451,8 +472,8 @@
*/
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("<option value=\"")+16, page.length());
+ page = page.substring(page.indexOf("<select multiple name=\""+name), page.length());
+ page = page.substring(page.indexOf("<option value=\"")+15, page.length());
int pos = 3;
while (page.charAt(pos) != '"') pos++;
return page.substring(0, pos);
Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -42,7 +42,7 @@
issRep2 = getIssueRepresentation(prjId, "issue2");
issRep3 = getIssueRepresentation(prjId, "issue3");
- closeIssue(issId1, issRep1, "3", null, new String[] { verId1, verId2 });
+ closeIssue(issId1, issRep1, "3", adminLogin, new String[] { verId1, verId2 });
}
protected void tearDown() throws Exception {
@@ -52,7 +52,7 @@
}
public void testMultipleVersionsAllTypes() throws Exception {
- goToReportConf(prjId, "pl.net.mamut:releasenotes");
+ goToReportConf(prjId, "pl.net.mamut:releasenotes");
String allSections = getAllValue("sections");
WebRequest wr = getReportRequest(prjId, "pl.net.mamut:releasenotes");
Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -71,6 +71,7 @@
public void testMultipleProjectsAllTypesAllPrioritiesOneMonth() throws Exception {
WebRequest wr = getGlobalReportRequest("pl.net.mamut.jira.roadmapreport:roadmap");
+
wr.setParameter("projects", new String [] { prjIds[0], prjIds[1] });
wr.setParameter("types", allTypes);
wr.setParameter("priorities", allPriorities);
Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java
===================================================================
--- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -105,12 +105,12 @@
vsIds = new String[2];
for (int i=0; i<2; i++) vsIds[i] = addVotingScheme("WS"+i, "WS"+i+"desc");
- addVotesAssigment(vsIds[0], "21", "Single_User", "user1", "");
- addVotesAssigment(vsIds[0], "88", "Single_User", "adamw", "");
+ addVotesAssigment(vsIds[0], "21", "Single_User", userLogin, "");
+ addVotesAssigment(vsIds[0], "88", "Single_User", adminLogin, "");
addVotesAssigment(vsIds[0], "65", "Group_Dropdown", "jira-administrators", "");
addVotesAssigment(vsIds[1], "12", "Project_Lead", "", "");
- addVotesAssigment(vsIds[1], "7", "Single_User", "adamw", "");
+ addVotesAssigment(vsIds[1], "7", "Single_User", adminLogin, "");
goToMainPage();
loginUser();
Modified: trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java
===================================================================
--- trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java 2005-08-14 13:09:52 UTC (rev 848)
+++ trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java 2005-08-14 23:51:06 UTC (rev 849)
@@ -28,7 +28,8 @@
try
{
try {
- Long.parseLong(getVotesnum());
+ if (Long.parseLong(getVotesnum()) < 0)
+ throw new NumberFormatException();
} catch (NumberFormatException e) {
addErrorMessage("Number of votes must be a positive integer.");
}
|
